diff options
author | Tom Rini <trini@konsulko.com> | 2017-04-13 10:17:06 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-04-13 11:19:00 -0400 |
commit | 1622559066d890f1b7622be0ede8a5d64de66ef3 (patch) | |
tree | 3d7a01ff07bff410c6650eae19b704cd0419c254 /configs/mx6slevk_spl_defconfig | |
parent | 0342e335ba887817ed401e77be324e064ea7031e (diff) | |
parent | f479cec3b623778c26b23f66dc28cf33100ce089 (diff) | |
download | u-boot-1622559066d890f1b7622be0ede8a5d64de66ef3.tar.gz |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Drop CONFIG_STACKSIZE from include/configs/imx6_logic.h
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs/mx6slevk_spl_defconfig')
-rw-r--r-- | configs/mx6slevk_spl_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/mx6slevk_spl_defconfig b/configs/mx6slevk_spl_defconfig index dcdc747f2e..7d3de1f943 100644 --- a/configs/mx6slevk_spl_defconfig +++ b/configs/mx6slevk_spl_defconfig @@ -8,7 +8,7 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6SL" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6SL,SYS_I2C" CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL=y |