From: Tom Rini Date: Sun, 15 Apr 2018 12:43:50 +0000 (-0400) Subject: Merge git://git.denx.de/u-boot-imx X-Git-Tag: v2018.05-rc2~9 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebca902aeb3af3eaedd2787928184ad84a86b98f;p=pandora-u-boot.git Merge git://git.denx.de/u-boot-imx Signed-off-by: Tom Rini --- ebca902aeb3af3eaedd2787928184ad84a86b98f diff --cc configs/dms-ba16-1g_defconfig index af2359758f0,80089162348..8c1a55f3255 --- a/configs/dms-ba16-1g_defconfig +++ b/configs/dms-ba16-1g_defconfig @@@ -30,9 -30,9 +30,10 @@@ CONFIG_CMD_FAT= CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DWC_AHSATA=y +CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y + CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y CONFIG_MXC_SPI=y CONFIG_USB=y diff --cc configs/dms-ba16_defconfig index 33d44b41c7d,78030526428..578cd691ab2 --- a/configs/dms-ba16_defconfig +++ b/configs/dms-ba16_defconfig @@@ -29,9 -29,9 +29,10 @@@ CONFIG_CMD_FAT= CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DWC_AHSATA=y +CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y + CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y CONFIG_MXC_SPI=y CONFIG_USB=y diff --cc configs/pico-imx7d_defconfig index 012494162d3,b85486db4ea..c355f06508a --- a/configs/pico-imx7d_defconfig +++ b/configs/pico-imx7d_defconfig @@@ -22,7 -22,7 +22,8 @@@ CONFIG_CMD_EXT2= CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y +CONFIG_FSL_ESDHC=y + CONFIG_CMD_FS_GENERIC=y CONFIG_PHYLIB=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --cc include/configs/ls1012a_common.h index 91e6da03b11,73cd049f28d..35ecb3ce563 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@@ -75,10 -77,8 +75,7 @@@ /* I2C */ #define CONFIG_SYS_I2C - #define CONFIG_SYS_I2C_MXC - #define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ - #define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_serial_clock()) diff --cc include/configs/ls1088a_common.h index 211059a6010,393ce4ff9da..814760ebe9f --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@@ -67,13 -67,9 +67,8 @@@ /* I2C */ #define CONFIG_SYS_I2C - #define CONFIG_SYS_I2C_MXC - #define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ - #define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ - #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ - #define CONFIG_SYS_I2C_MXC_I2C4 /* enable I2C bus 4 */ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0) / 2) diff --cc include/configs/ls2080a_common.h index 4e6a26cc72d,3e05b2788a1..258a6f1a042 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@@ -77,13 -77,9 +77,8 @@@ /* I2C */ #define CONFIG_SYS_I2C - #define CONFIG_SYS_I2C_MXC - #define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ - #define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ - #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ - #define CONFIG_SYS_I2C_MXC_I2C4 /* enable I2C bus 4 */ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_serial_clock())