The defconfig/config.h file were merged but were already out of sync with mainline. This brings them further into line now.

Cc: Richard Hu richard.hu@technexion.com Cc: Fabio Estevam fabio.estevam@nxp.com Signed-off-by: Tom Rini trini@konsulko.com --- As the board doesn't compile currently I'm going to apply this.

configs/pico-imx6ul_defconfig | 19 ++++++++++++++++++- include/configs/pico-imx6ul.h | 8 -------- 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/configs/pico-imx6ul_defconfig b/configs/pico-imx6ul_defconfig index 9157faa..cc49dc9 100644 --- a/configs/pico-imx6ul_defconfig +++ b/configs/pico-imx6ul_defconfig @@ -1,5 +1,22 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/technexion/pico-imx6ul/imximage.cfg" CONFIG_TARGET_PICO_IMX6UL=y +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/technexion/pico-imx6ul/imximage.cfg" +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_IMLS is not set +CONFIG_CMD_MEMTEST=y +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y +CONFIG_CMD_USB_MASS_STORAGE=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y CONFIG_OF_LIBFDT=y diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 3e37815..d848ead 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -31,14 +31,11 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR

#define CONFIG_MMC -#define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC -#define CONFIG_CMD_FAT #define CONFIG_DOS_PARTITION #define CONFIG_SUPPORT_EMMC_BOOT

/* USB Configs */ -#define CONFIG_CMD_USB #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_STORAGE @@ -52,7 +49,6 @@ #define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET

-#define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE #define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_USB_GADGET_VBUS_DRAW 2 @@ -100,7 +96,6 @@ "fi; " \ "else run netboot; fi"

-#define CONFIG_CMD_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END CONFIG_SYS_MEMTEST_START + SZ_128M

@@ -134,7 +129,4 @@ #define CONFIG_SYS_MMC_ENV_PART 0 #define CONFIG_MMCROOT "/dev/mmcblk0p2"

-#define CONFIG_CMD_BOOTZ -#define CONFIG_CMD_CACHE - #endif /* __PICO_IMX6UL_CONFIG_H */