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

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

diff --git a/configs/h2200_defconfig b/configs/h2200_defconfig
index cdc059a156869b571d031127518a5d761b72fd6f..8b4deaead6a0ff09cd81df4f8b9a4236d6ec47f5 100644 (file)
--- a/configs/h2200_defconfig
+++ b/configs/h2200_defconfig
@@ -2,7 +2,8 @@ CONFIG_ARM=y
 CONFIG_TARGET_H2200=y
 CONFIG_FIT=y
 # CONFIG_FIT_ENABLE_SHA256_SUPPORT is not set
-CONFIG_ENV_IS_NOWHERE=y
+CONFIG_USE_BOOTARGS=y
+CONFIG_BOOTARGS="root=/dev/ram0 ro console=ttyS0,115200n8"
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
@@ -17,9 +18,9 @@ CONFIG_SYS_PROMPT="> "
 # CONFIG_CMD_SAVEENV is not set
 # CONFIG_CMD_ENV_EXISTS is not set
 # CONFIG_CMD_MEMORY is not set
-# CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_ECHO is not set
 # CONFIG_CMD_ITEST is not set
 # CONFIG_CMD_SETEXPR is not set
@@ -28,3 +29,6 @@ CONFIG_CMD_PING=y
 # CONFIG_CMD_MISC is not set
 # CONFIG_MMC is not set
 CONFIG_PXA_SERIAL=y
+CONFIG_USB=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_ETHER=y