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

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

diff --git a/configs/caddy2_defconfig b/configs/caddy2_defconfig
index bdce6aa164f6de21ea4575951b5b5e97d17d4ed7..32496e4d775d0838c001666164cd6f9499443542 100644 (file)
--- a/configs/caddy2_defconfig
+++ b/configs/caddy2_defconfig
@@ -1,4 +1,22 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_VME8349=y
+CONFIG_OF_BOARD_SETUP=y
+CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="CADDY2"
+CONFIG_BOOTDELAY=6
+CONFIG_HUSH_PARSER=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_PCI=y
+CONFIG_CMD_TSI148=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_MII=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_DATE=y
+# CONFIG_MMC is not set
+CONFIG_MTD_NOR_FLASH=y
+CONFIG_NETDEVICES=y
+CONFIG_E1000=y
+CONFIG_BAUDRATE=9600
+CONFIG_SYS_NS16550=y
+CONFIG_OF_LIBFDT=y