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

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

diff --git a/configs/smdkc100_defconfig b/configs/smdkc100_defconfig
index 82ba51c00da5040dfb14155f693c78a6a0690d8a..45b854a6ca12bb801293592d84b6b474e95c8a36 100644 (file)
--- a/configs/smdkc100_defconfig
+++ b/configs/smdkc100_defconfig
@@ -3,8 +3,9 @@ CONFIG_ARCH_S5PC1XX=y
 CONFIG_TARGET_SMDKC100=y
 CONFIG_IDENT_STRING=" for SMDKC100"
 CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-smdkc100"
-CONFIG_ENV_IS_IN_ONENAND=y
 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_SYS_PROMPT="SMDKC100 # "
 # CONFIG_CMD_IMLS is not set
@@ -14,4 +15,5 @@ CONFIG_CMD_ONENAND=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_ENV_IS_IN_ONENAND=y
 # CONFIG_MMC is not set