Merge git://git.denx.de/u-boot-dm

[people/ms/u-boot.git] / configs / ms7722se_defconfig

diff --git a/configs/ms7722se_defconfig b/configs/ms7722se_defconfig
index 633a087616d8c350447d9f7a24b0a36ab77fade5..cb6f3bb756bc37014c41c17857d3f6de5fe5f6ee 100644 (file)
--- a/configs/ms7722se_defconfig
+++ b/configs/ms7722se_defconfig
@@ -1,7 +1,8 @@
 CONFIG_SH=y
 CONFIG_TARGET_MS7722SE=y
-CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_BOOTDELAY=3
+CONFIG_USE_BOOTARGS=y
+CONFIG_BOOTARGS="console=ttySC0,115200 root=1f01"
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
@@ -12,9 +13,10 @@ CONFIG_VERSION_VARIABLE=y
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_EDITENV is not set
 # CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
-# CONFIG_CMD_FPGA is not set
+CONFIG_CMD_SDRAM=y
 # CONFIG_CMD_ECHO is not set
 # CONFIG_CMD_ITEST is not set
 # CONFIG_CMD_SOURCE is not set
@@ -22,5 +24,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_MISC is not set
 CONFIG_CMD_JFFS2=y
+CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y