summaryrefslogtreecommitdiff
path: root/configs/integratorcp_cm926ejs_defconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-10-09 18:10:24 -0400
committerTom Rini <trini@konsulko.com>2020-10-09 18:10:24 -0400
commit0437cc415517c06c864bee5dbce3001d70b2c2cb (patch)
tree760afc39c86954919d0a3abe3b9edba4a49dbe36 /configs/integratorcp_cm926ejs_defconfig
parent0570938e3c1835a6bcd0ce5b47a501ad5a09a9b3 (diff)
parent0817daa7606ec55ba551acb0208eaba33a548804 (diff)
downloadu-boot-0437cc415517c06c864bee5dbce3001d70b2c2cb.tar.gz
Merge branch '2020-10-09-kconfig-reorg'
- Re-organize a number of Kconfig related entries to be better organized for long term maintenance.
Diffstat (limited to 'configs/integratorcp_cm926ejs_defconfig')
-rw-r--r--configs/integratorcp_cm926ejs_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/integratorcp_cm926ejs_defconfig b/configs/integratorcp_cm926ejs_defconfig
index 8bd46cf39c..5ee90cd27e 100644
--- a/configs/integratorcp_cm926ejs_defconfig
+++ b/configs/integratorcp_cm926ejs_defconfig
@@ -8,9 +8,9 @@ CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_SECT_SIZE=0x40000
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAMA0 console=tty ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0"
-CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_MISC_INIT_R=y
CONFIG_HUSH_PARSER=y
# CONFIG_CMDLINE_EDITING is not set
# CONFIG_AUTO_COMPLETE is not set