karo: unify mtd partitioning across all TX modules and increase linux partition size...

diff --git a/board/karo/tx6/config.mk b/board/karo/tx6/config.mk
index c1e542c264436b23eb8893e129001a41ee83efaa..4c374f3b04db6ffdf9f9a5cad6ec141dede53f33 100644 (file)
--- a/board/karo/tx6/config.mk
+++ b/board/karo/tx6/config.mk
@@ -16,8 +16,8 @@ CONFIG_SYS_NAND_BLOCKS := 1024
 endif
 ifneq ($(CONFIG_SYS_NAND_BLOCK_SIZE),)
 CONFIG_U_BOOT_IMG_SIZE := $(shell echo 'e=$(CONFIG_SYS_NAND_BLOCK_SIZE);s=640*1024;s + (e - s % e) % e + 3*e' | bc)
-CONFIG_SYS_USERFS_SIZE := $(shell expr \( $(CONFIG_SYS_NAND_BLOCKS) - 12 \) \* $(CONFIG_SYS_NAND_BLOCK_SIZE) - $(CONFIG_U_BOOT_IMG_SIZE) - 36 \* 1048576)
-CONFIG_SYS_USERFS_SIZE2 := $(shell expr \( $(CONFIG_SYS_NAND_BLOCKS) - 15 \) \* $(CONFIG_SYS_NAND_BLOCK_SIZE) - $(CONFIG_U_BOOT_IMG_SIZE) - 36 \* 1048576)
+CONFIG_SYS_USERFS_SIZE := $(shell expr \( $(CONFIG_SYS_NAND_BLOCKS) - 12 \) \* $(CONFIG_SYS_NAND_BLOCK_SIZE) - $(CONFIG_U_BOOT_IMG_SIZE) - 38 \* 1048576)
+CONFIG_SYS_USERFS_SIZE2 := $(shell expr \( $(CONFIG_SYS_NAND_BLOCKS) - 15 \) \* $(CONFIG_SYS_NAND_BLOCK_SIZE) - $(CONFIG_U_BOOT_IMG_SIZE) - 38 \* 1048576)
 CONFIG_SYS_NAND_BBT_BLOCKS := 4
 CONFIG_SYS_NAND_DTB_BLOCKS := 4
 

diff --git a/include/configs/tx28.h b/include/configs/tx28.h
index 72b809ca8e4314f37025ac62f887509d120dbd76..78f1c3d1cb8fa169c1ad7c1d49bb67a31cc6c1e4 100644 (file)
--- a/include/configs/tx28.h
+++ b/include/configs/tx28.h
@@ -248,11 +248,11 @@
        "(env),"                                                        \
        xstr(CONFIG_ENV_RANGE)                                          \
        "(env2),"
-#define CONFIG_SYS_USERFS_PART_STR     "107904k(userfs)"
+#define CONFIG_SYS_USERFS_PART_STR     "89216k(userfs)"
 #else
 #define CONFIG_SYS_ENV_PART_STR                xstr(CONFIG_ENV_RANGE)          \
        "(env),"
-#define CONFIG_SYS_USERFS_PART_STR     "108288k(userfs)"
+#define CONFIG_SYS_USERFS_PART_STR     "89600k(userfs)"
 #endif /* CONFIG_ENV_OFFSET_REDUND */
 
 /*
@@ -292,8 +292,8 @@
 #define MTDPARTS_DEFAULT               "mtdparts=" MTD_NAME ":"        \
        "1m@" xstr(CONFIG_SYS_NAND_U_BOOT_OFFS) "(u-boot),"             \
        CONFIG_SYS_ENV_PART_STR                                         \
-       "4m(linux),16m(rootfs),"                                        \
-       CONFIG_SYS_USERFS_PART_STR ",256k(dtb),512k@0x7f80000(bbt)ro"
+       "6m(linux),32m(rootfs),"                                        \
+       CONFIG_SYS_USERFS_PART_STR ",512k@0x7f00000(dtb),512k@0x7f80000(bbt)ro"
 
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
 #define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \

diff --git a/include/configs/tx48.h b/include/configs/tx48.h
index 2423810ec55f445d2b5bfbb97bae54700bed1563..b14f507d923ed1f298a468edf827e715ff502461 100644 (file)
--- a/include/configs/tx48.h
+++ b/include/configs/tx48.h
@@ -279,13 +279,13 @@
        xstr(CONFIG_ENV_RANGE)                                          \
        "(env),"                                                        \
        xstr(CONFIG_ENV_RANGE)                                          \
-       "(env2),4m(linux),16m(rootfs),107904k(userfs),256k(dtb),512k@0x7f80000(bbt)ro"
+       "(env2),6m(linux),32m(rootfs),89216k(userfs),512k@0x7f00000(dtb),512k@0x7f80000(bbt)ro"
 #else
 #define MTDPARTS_DEFAULT               "mtdparts=" MTD_NAME ":"        \
        "128k(u-boot-spl),"                                             \
        "1m(u-boot),"                                                   \
        xstr(CONFIG_ENV_RANGE)                                          \
-       "(env),4m(linux),16m(rootfs),108288k(userfs),256k(dtb),512k@0x7f80000(bbt)ro"
+       "(env),6m(linux),32m(rootfs),89600k(userfs),512k@0x7f00000(dtb),512k@0x7f80000(bbt)ro"
 #endif
 
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1

diff --git a/include/configs/tx51.h b/include/configs/tx51.h
index a31d7cca5383ac61ac42b677c6eee4e661e1c29f..633bef392be6646b79f78f48713e073234e6fdcd 100644 (file)
--- a/include/configs/tx51.h
+++ b/include/configs/tx51.h
@@ -261,12 +261,12 @@
        xstr(CONFIG_ENV_RANGE)                                          \
        "(env),"                                                        \
        xstr(CONFIG_ENV_RANGE)                                          \
-       "(env2),4m(linux),16m(rootfs),108032k(userfs),256k(dtb),512k@0x7f80000(bbt)ro"
+       "(env2),6m(linux),32m(rootfs),89344k(userfs),512k@0x7f00000(dtb),512k@0x7f80000(bbt)ro"
 #else
 #define MTDPARTS_DEFAULT               "mtdparts=" MTD_NAME ":"        \
        "1m(u-boot),"                                                   \
        xstr(CONFIG_ENV_RANGE)                                          \
-       "(env),4m(linux),16m(rootfs),108416k(userfs),256k(dtb),512k@0x7f80000(bbt)ro"
+       "(env),6m(linux),32m(rootfs),89728k(userfs),512k@0x7f00000(dtb),512k@0x7f80000(bbt)ro"
 #endif
 
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1

diff --git a/include/configs/tx53.h b/include/configs/tx53.h
index 4140cc06fc1e2585df611917c48fcd81fa5db838..4118062d3729ec169101fc66545dca69b38da253 100644 (file)
--- a/include/configs/tx53.h
+++ b/include/configs/tx53.h
@@ -267,12 +267,12 @@
        xstr(CONFIG_ENV_RANGE)                                          \
        "(env),"                                                        \
        xstr(CONFIG_ENV_RANGE)                                          \
-       "(env2),4m(linux),16m(rootfs),108032k(userfs),256k(dtb),512k@0x7f80000(bbt)ro"
+       "(env2),6m(linux),32m(rootfs),89344k(userfs),512k@0x7f00000(dtb),512k@0x7f80000(bbt)ro"
 #else
 #define MTDPARTS_DEFAULT               "mtdparts=" MTD_NAME ":"        \
        "1m(u-boot),"                                                   \
        xstr(CONFIG_ENV_RANGE)                                          \
-       "(env),4m(linux),16m(rootfs),108416k(userfs),256k(dtb),512k@0x7f80000(bbt)ro"
+       "(env),6m(linux),32m(rootfs),89728k(userfs),512k@0x7f00000(dtb),512k@0x7f80000(bbt)ro"
 #endif
 
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1

diff --git a/include/configs/tx6.h b/include/configs/tx6.h
index 9eff81d3f4269b775ac27ff33c12302893f20963..2fd97d45c271f226b76364a68bba8750afa13906 100644 (file)
--- a/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@ -364,7 +364,7 @@
        "@" xstr(CONFIG_SYS_NAND_U_BOOT_OFFS)                           \
        "(u-boot),"                                                     \
        CONFIG_SYS_ENV_PART_STR                                         \
-       "4m(linux),32m(rootfs)," CONFIG_SYS_USERFS_PART_STR ","         \
+       "6m(linux),32m(rootfs)," CONFIG_SYS_USERFS_PART_STR ","         \
        xstr(CONFIG_SYS_DTB_PART_SIZE)                                  \
        "@" xstr(CONFIG_SYS_NAND_DTB_OFFSET) "(dtb),"                   \
        xstr(CONFIG_SYS_NAND_BBT_SIZE)                                  \