s5pc110: aquila: fix mtd partition and remove csa migration

 #: name		size		offset		mask_flags
0: bootloader          0x00040000	0x00000000	0
1: params              0x00040000	0x00040000	0
2: config              0x00380000	0x00080000	0
3: csa                 0x00800000	0x00400000	0
4: kernel              0x00600000	0x00c00000	0
5: log                 0x00100000	0x01200000	0
6: modem               0x00c00000	0x01300000	0
7: qboot               0x01e00000	0x01f00000	0
8: UBI                 0x1c300000	0x03d00000	0

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/board/samsung/universal/universal.c b/board/samsung/universal/universal.c
index f054609..01f943b 100644 (file)
--- a/board/samsung/universal/universal.c
+++ b/board/samsung/universal/universal.c
@@ -1804,27 +1804,6 @@ static void setup_meminfo(void)
        setenv("meminfo", meminfo);
 }
 
-/*
- * CSA partition Migration
- * It will be deleted
- */
-static void csa_migration(void)
-{
-       unsigned int *ubi_id;
-       int i;
-
-       run_command("onenand read 0x40000000 0x400000 0x400000", 0);
-
-       for (i = 0; i < 10; i++) {
-               ubi_id = (void *) (0x40000000 + 0x40000 * i);
-               if (*ubi_id == 0x23494255) /* 0x23494255 = UBI */ {
-                       printf("CSA Migration is already done....\n");
-                       return;
-               }
-       }
-       run_command("onenand erase 0x400000 0x800000", 0);
-}
-
 int misc_init_r(void)
 {
 #ifdef CONFIG_LCD
@@ -1884,9 +1863,6 @@ int misc_init_r(void)
        /* check fsa9480 */
        check_micro_usb(0);
 
-       /* csa migration (temporary) */
-       csa_migration();
-
        return 0;
 }
 #endif

diff --git a/include/configs/s5pc1xx_universal.h b/include/configs/s5pc1xx_universal.h
index 8b977c4..8e60d10 100644 (file)
--- a/include/configs/s5pc1xx_universal.h
+++ b/include/configs/s5pc1xx_universal.h
@@ -142,21 +142,21 @@
 #define MTDPARTS_DEFAULT       "mtdparts=samsung-onenand:256k(bootloader)"\
                                ",128k(params)"\
                                ",3584k(config)"\
-                               ",8m(csa_new)"\
-                               ",5376k(kernel)"\
-                               ",1m(log)"\
-                               ",10496k(modem)"\
                                ",8m(csa)"\
+                               ",6m(kernel)"\
+                               ",1m(log)"\
+                               ",12m(modem)"\
+                               ",30m(qboot)"\
                                ",-(UBI)\0"
 
 #define MTDPARTS_DEFAULT_4KB   "mtdparts=samsung-onenand:256k(bootloader)"\
                                ",256k(params)"\
                                ",3584k(config)"\
-                               ",8m(csa_new)"\
-                               ",5376k(kernel)"\
-                               ",1m(log)"\
-                               ",10496k(modem)"\
                                ",8m(csa)"\
+                               ",6m(kernel)"\
+                               ",1m(log)"\
+                               ",12m(modem)"\
+                               ",30m(qboot)"\
                                ",-(UBI)\0"
 
 #define NORMAL_MTDPARTS_DEFAULT MTDPARTS_DEFAULT
@@ -170,13 +170,13 @@
 
 #define CONFIG_COMMON_BOOT     "${console} ${meminfo} ${mtdparts}"
 
-#define CONFIG_BOOTARGS        "root=/dev/mtdblock8 ubi.mtd=8 ubi.mtd=7 ubi.mtd=3" \
+#define CONFIG_BOOTARGS        "root=/dev/mtdblock8 ubi.mtd=8 ubi.mtd=3" \
                " 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=7 ubi.mtd=3"
+#define CONFIG_UBI_MTD " ubi.mtd=${ubiblock} ubi.mtd=3"
 
 #define CONFIG_UBIFS_OPTION    "rootflags=bulk_read,no_chk_data_crc"