summaryrefslogtreecommitdiff
path: root/configs/MCR3000_defconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-08-14 19:58:53 -0400
committerTom Rini <trini@konsulko.com>2017-08-14 20:00:40 -0400
commit88663126a009d0c354d832e005a5b3b511e5c7fb (patch)
tree54714eeb75586853c3b230820148f95bdb2ff4e6 /configs/MCR3000_defconfig
parent248a3f6c7ce01965f0303416645c8884013acabb (diff)
configs: Resync with savedefconfig
Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs/MCR3000_defconfig')
-rw-r--r--configs/MCR3000_defconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/configs/MCR3000_defconfig b/configs/MCR3000_defconfig
index b75dd576e0..943a6b9086 100644
--- a/configs/MCR3000_defconfig
+++ b/configs/MCR3000_defconfig
@@ -39,6 +39,8 @@ CONFIG_SYS_IMMR=0xFF000000
CONFIG_OF_BOARD_SETUP=y
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_BOOTDELAY=5
+CONFIG_USE_BOOTARGS=y
+CONFIG_BOOTARGS="ubi.mtd=4 root=ubi0:rootfs rw rootfstype=ubifs rootflags=sync console=ttyCPM0,115200N8 ip=${ipaddr}:::${netmask}:mcr3k:eth0:off"
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="S3K> "
CONFIG_AUTOBOOT_KEYED=y
@@ -49,10 +51,10 @@ CONFIG_AUTOBOOT_DELAY_STR="root"
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_IMLS is not set
CONFIG_CMD_ASKENV=y
+# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_LOADB is not set
# CONFIG_CMD_LOADS is not set
CONFIG_CMD_NAND=y
-# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_ECHO is not set
# CONFIG_CMD_ITEST is not set
# CONFIG_CMD_SOURCE is not set
@@ -69,5 +71,3 @@ CONFIG_MPC8XX_FEC=y
CONFIG_SHA256=y
CONFIG_LZMA=y
CONFIG_OF_LIBFDT=y
-CONFIG_USE_BOOTARGS=y
-CONFIG_BOOTARGS="ubi.mtd=4 root=ubi0:rootfs rw rootfstype=ubifs rootflags=sync console=ttyCPM0,115200N8 ip=${ipaddr}:::${netmask}:mcr3k:eth0:off"