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

[u-boot] / configs / smdkc100_defconfig

diff --git a/configs/smdkc100_defconfig b/configs/smdkc100_defconfig
index eef4aee919699c729b3fbc4467e621e6a6391c0b..f4ffd531483e674c0b9338aa22031d6a2c452213 100644 (file)
--- a/configs/smdkc100_defconfig
+++ b/configs/smdkc100_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_S5PC1XX=y
+CONFIG_SYS_TEXT_BASE=0x34800000
 CONFIG_TARGET_SMDKC100=y
 CONFIG_IDENT_STRING=" for SMDKC100"
 CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-smdkc100"
@@ -7,6 +8,7 @@ CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="root=/dev/mtdblock5 ubi.mtd=4 rootfstype=cramfs console=ttySAC0,115200n8 mem=128M  mtdparts=s3c-onenand:256k(bootloader),128k@0x40000(params),3m@0x60000(kernel),16m@0x360000(test),-(UBI)"
 CONFIG_HUSH_PARSER=y
+# CONFIG_AUTO_COMPLETE is not set
 CONFIG_SYS_PROMPT="SMDKC100 # "
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_ONENAND=y
@@ -14,5 +16,10 @@ CONFIG_CMD_ONENAND=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="onenand0=s3c-onenand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=s3c-onenand:256k(bootloader),128k@0x40000(params),3m@0x60000(kernel),16m@0x360000(test),-(UBI)"
 CONFIG_ENV_IS_IN_ONENAND=y
 # CONFIG_MMC is not set
+CONFIG_NETDEVICES=y
+CONFIG_SMC911X=y
+CONFIG_SMC911X_BASE=0x98800300