Merge branch 'next'

[u-boot] / configs / bcm958300k_defconfig

diff --git a/configs/bcm958300k_defconfig b/configs/bcm958300k_defconfig
index 066739db8bf0781be5745ee2c3f4f1fc702f1f27..8fcde6c0ad6cfc62f919d4b5a9504867263c6027 100644 (file)
--- a/configs/bcm958300k_defconfig
+++ b/configs/bcm958300k_defconfig
@@ -1,3 +1,8 @@
-CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x20000000"
 CONFIG_ARM=y
-CONFIG_TARGET_BCM958300K=y
+CONFIG_TARGET_BCMCYGNUS=y
+CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000"
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_NS16550=y
+CONFIG_OF_LIBFDT=y