diff options
| author | Ye Li <ye.li@nxp.com> | 2018-08-07 23:01:46 -0700 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2018-08-08 01:58:06 -0700 |
| commit | 42d21af47e86aa821f50f44ace26a15a93fad73a (patch) | |
| tree | 9b024b06b3c5d8cc471cde162896cfa19e326a18 | |
| parent | 7212602a72ea4b9628e96f1b735abd593e9bf625 (diff) | |
MLK-19159 imx8mm_evk: Fix build break for flexspi defconfig
The flexspi defconfig uses CONFIG_ENV_IS_IN_SPI_FLASH not CONFIG_ENV_IS_IN_MMC.
So when fastboot is enabled for flexspi, the build break happens.
drivers/usb/gadget/built-in.o: In function `board_fastboot_setup':
/home/leyoen/Workspace/uboot-imx/drivers/usb/gadget/f_fastboot.c:1539: undefined reference to `mmc_get_env_dev'
drivers/usb/gadget/built-in.o: In function `_fastboot_setup_dev':
/home/leyoen/Workspace/uboot-imx/drivers/usb/gadget/f_fastboot.c:1260: undefined reference to `mmc_get_env_dev'
drivers/usb/gadget/built-in.o: In function `get_single_var':
/home/leyoen/Workspace/uboot-imx/drivers/usb/gadget/f_fastboot.c:2935: undefined reference to `mmc_get_env_dev'
drivers/usb/gadget/built-in.o: In function `bcb_rw_block':
/home/leyoen/Workspace/uboot-imx/drivers/usb/gadget/bcb.c:120: undefined reference to `mmc_get_env_dev'
Fix the issue by decoupling mmc_get_env_dev function with CONFIG_ENV_IS_IN_MMC
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 2716f9a325681737593b3a6e79f94576a35067c2)
| -rw-r--r-- | arch/arm/cpu/armv8/imx8m/soc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv8/imx8m/soc.c b/arch/arm/cpu/armv8/imx8m/soc.c index e65f311704..9bb9fe37a3 100644 --- a/arch/arm/cpu/armv8/imx8m/soc.c +++ b/arch/arm/cpu/armv8/imx8m/soc.c @@ -373,7 +373,6 @@ bool is_usb_boot(void) return get_boot_device() == USB_BOOT; } -#ifdef CONFIG_ENV_IS_IN_MMC __weak int board_mmc_get_env_dev(int devno) { return CONFIG_SYS_MMC_ENV_DEV; @@ -393,7 +392,6 @@ int mmc_get_env_dev(void) return board_mmc_get_env_dev(devno); } -#endif #ifdef CONFIG_SERIAL_TAG void get_board_serial(struct tag_serialnr *serialnr) |