From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Wed, 4 Jun 2014 14:49:55 +0000 (+0200)
Subject: karo: unify mtd partitioning across all TX modules and increase linux partition size... 
X-Git-Tag: KARO-TX-2014-06-04
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=1f73600ac192a4d1bc4caa8f374d07e427ebd6d0

karo: unify mtd partitioning across all TX modules and increase linux partition size to 6MiB and rootfs to 32MiB
---

diff --git a/board/karo/tx6/config.mk b/board/karo/tx6/config.mk
index c1e542c264..4c374f3b04 100644
--- 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 72b809ca8e..78f1c3d1cb 100644
--- 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 2423810ec5..b14f507d92 100644
--- 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 a31d7cca53..633bef392b 100644
--- 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 4140cc06fc..4118062d37 100644
--- 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 9eff81d3f4..2fd97d45c2 100644
--- 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)					\