diff options
| author | Tom Rini <trini@konsulko.com> | 2016-12-18 13:54:25 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-12-18 17:43:20 -0500 |
| commit | 8ea05705a70135a94419b0d243666c1b51fe1f8d (patch) | |
| tree | 495da728ccebe411445c144fb88ba35041db2096 /configs/udoo_neo_defconfig | |
| parent | 0b4bc1b3ab1850fccbade3e6103f2036f6bdb364 (diff) | |
| parent | 854bb75be98ad792ff64c26ae38a1392ea185cd6 (diff) | |
| download | u-boot-imx-8ea05705a70135a94419b0d243666c1b51fe1f8d.zip u-boot-imx-8ea05705a70135a94419b0d243666c1b51fe1f8d.tar.gz u-boot-imx-8ea05705a70135a94419b0d243666c1b51fe1f8d.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Migrate CONFIG_ARCH_USE_MEMSET/MEMCPY with this merge.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs/udoo_neo_defconfig')
| -rw-r--r-- | configs/udoo_neo_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configs/udoo_neo_defconfig b/configs/udoo_neo_defconfig index 3304afb..5df4ef9 100644 --- a/configs/udoo_neo_defconfig +++ b/configs/udoo_neo_defconfig @@ -11,7 +11,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6SX" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set @@ -19,7 +19,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_MMC=y CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_EXT2=y |