Merge branch 'master' of git://git.denx.de/u-boot-sh

[oweals/u-boot.git] / configs / MPC8548CDS_36BIT_defconfig

diff --git a/configs/MPC8548CDS_36BIT_defconfig b/configs/MPC8548CDS_36BIT_defconfig
index dd4b9d00b406a1623ad388770d645defbeeaadc6..672dc782119a9ace4f2aa84c9615915fb9f25c58 100644 (file)
--- a/configs/MPC8548CDS_36BIT_defconfig
+++ b/configs/MPC8548CDS_36BIT_defconfig
@@ -1,10 +1,30 @@
 CONFIG_PPC=y
+CONFIG_SYS_TEXT_BASE=0xFFF80000
 CONFIG_MPC85xx=y
+# CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_MPC8548CDS=y
+CONFIG_PHYS_64BIT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SYS_EXTRA_OPTIONS="36BIT"
-CONFIG_NETDEVICES=y
+CONFIG_BOOTDELAY=10
+# CONFIG_MISC_INIT_R is not set
+CONFIG_HUSH_PARSER=y
+CONFIG_CMD_IMLS=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_PCI=y
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_MII=y
+CONFIG_CMD_PING=y
+# CONFIG_CMD_HASH is not set
+# CONFIG_MMC is not set
+CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_CFI=y
+CONFIG_PHY_MARVELL=y
+CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
+CONFIG_MII=y
+CONFIG_TSEC_ENET=y
+CONFIG_CONS_INDEX=2
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y