s5p6442: smdk6442: Add csa partition

Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>

diff --git a/include/configs/smdk6442.h b/include/configs/smdk6442.h
index f07440e..d588e0e 100644 (file)
--- a/include/configs/smdk6442.h
+++ b/include/configs/smdk6442.h
@@ -137,7 +137,8 @@
                                ",3m(kernel)"\
                                ",18m(modem)"\
                                ",7m(fota)"\
-                               ",9m(log)"\
+                               ",8m(csa)"\
+                               ",1m(log)"\
                                ",-(UBI)\0"
 
 #define MTDPARTS_DEFAULT_4KB   "mtdparts=samsung-onenand:256k(bootloader)"\
@@ -145,7 +146,8 @@
                                ",3m(kernel)"\
                                ",18m(modem)"\
                                ",7m(fota)"\
-                               ",9m(log)"\
+                               ",8m(csa)"\
+                               ",1m(log)"\
                                ",-(UBI)\0"
 
 #define NORMAL_MTDPARTS_DEFAULT MTDPARTS_DEFAULT
@@ -160,12 +162,14 @@
                " ${meminfo}" \
                " ${mtdparts}"
 
-#define CONFIG_BOOTARGS        "root=/dev/mtdblock7 ubi.mtd=6" \
+#define CONFIG_BOOTARGS        "root=/dev/mtdblock8 ubi.mtd=7 ubi.mtd=5" \
                " rootfstype=cramfs " CONFIG_COMMON_BOOT
 
 #define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x40000;" \
                        " onenand write 0x32008000 0x0 0x40000\0"
 
+#define CONFIG_UBI_MTD " ubi.mtd=${ubiblock} ubi.mtd=5"
+
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
@@ -178,27 +182,27 @@
        " bootm 0x30007FC0\0" \
        "flashboot=set bootargs root=/dev/mtdblock${bootblock}" \
         " rootfstype=${rootfstype}" \
-        " ubi.mtd=${ubiblock} ${opts} ${lcdinfo} " CONFIG_COMMON_BOOT "; run bootk\0" \
+       CONFIG_UBI_MTD " ${opts} ${lcdinfo} " CONFIG_COMMON_BOOT "; run bootk\0" \
        "ubifsboot=set bootargs root=ubi0!rootfs rootfstype=ubifs" \
-        " ubi.mtd=${ubiblock} ${opts} ${lcdinfo} " CONFIG_COMMON_BOOT "; run bootk\0" \
+       CONFIG_UBI_MTD " ${opts} ${lcdinfo} " CONFIG_COMMON_BOOT "; run bootk\0" \
        "boottrace=setenv opts initcall_debug; run bootcmd\0" \
-       "android=set bootargs root=ubi0!ramdisk ubi.mtd=${ubiblock}" \
+       "android=set bootargs root=ubi0!ramdisk " CONFIG_UBI_MTD \
         " rootfstype=ubifs init=/init.sh " CONFIG_COMMON_BOOT "; run bootk\0" \
-       "nfsboot=set bootargs root=/dev/nfs rw ubi.mtd=${ubiblock}" \
+       "nfsboot=set bootargs root=/dev/nfs rw " CONFIG_UBI_MTD \
         " nfsroot=${nfsroot},nolock,tcp ip=${ipaddr}:${serverip}:${gatewayip}:" \
         "${netmask}:generic:usb0:off " CONFIG_COMMON_BOOT "; run bootk\0" \
        "ramboot=set bootargs " CONFIG_RAMDISK_BOOT \
         " initrd=0x33000000,8M ramdisk=8192\0" \
        "mmcboot=set bootargs root=${mmcblk} rootfstype=${rootfstype}" \
-        " ubi.mtd=${ubiblock} ${opts} ${lcdinfo} " CONFIG_COMMON_BOOT "; run bootk\0" \
+        CONFIG_UBI_MTD " ${opts} ${lcdinfo} " CONFIG_COMMON_BOOT "; run bootk\0" \
        "verify=n\0" \
        "rootfstype=cramfs\0" \
        "mtdparts=" MTDPARTS_DEFAULT \
        "meminfo=mem=80M mem=256M@0x40000000\0" \
        "nfsroot=/nfsroot/arm\0" \
        "mmcblk=/dev/mmcblk1p1\0" \
-       "bootblock=7\0" \
-       "ubiblock=6\0" \
+       "bootblock=8\0" \
+       "ubiblock=7\0" \
        "ubi=enabled"
 
 /*