diff options
| author | Ji Luo <ji.luo@nxp.com> | 2018-08-16 21:22:20 +0800 |
|---|---|---|
| committer | Ji Luo <ji.luo@nxp.com> | 2018-08-21 09:44:35 +0800 |
| commit | b918c85c45f81e4759ed45a0ff40ec9642130388 (patch) | |
| tree | e3ffb054fe9327080c6f9f1a06990d2f25867c20 /drivers | |
| parent | 5f88ae9d85614bdbc207cb275b0c6ea9cc30b674 (diff) | |
MA-12423 Fix legacy platform can't load fdt
Legacy platform (imx6/7) don't support A/B slot so the fdt
partition name should be 'dtbo' instead of 'dtbo_a/dtbo_b'.
Test: build and boot ok on imx6q_sabresd.
Change-Id: I282594289d78ffac6d7f503a0e471e050724efea
Signed-off-by: Ji Luo <ji.luo@nxp.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/gadget/f_fastboot.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index caf84779d2..745d1ea96f 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -1958,12 +1958,15 @@ const char *requested_partitions_recovery[] = {"recovery", FDT_PART_NAME, NULL}; static bool is_load_fdt_from_part(void) { -#ifdef CONFIG_ANDROID_THINGS_SUPPORT +#if defined(CONFIG_ANDROID_THINGS_SUPPORT) if (fastboot_flash_find_ptn("oem_bootloader_a") && fastboot_flash_find_ptn("oem_bootloader_b")) { -#else +#elif defined(CONFIG_ANDROID_AB_SUPPORT) if (fastboot_flash_find_ptn("dtbo_a") && fastboot_flash_find_ptn("dtbo_b")) { +#else + /* for legacy platfrom (imx6/7), we don't support A/B slot. */ + if (fastboot_flash_find_ptn("dtbo")) { #endif return true; } else { |