Patchwork [U-Boot,2/6] ARM: m28evk: Adjust mtdparts

login
register
mail settings
Submitter Marek Vasut
Date June 26, 2014, 9:01 a.m.
Message ID <1403773292-5240-2-git-send-email-marex@denx.de>
Download mbox | patch
Permalink /patch/364309/
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show

Comments

Marek Vasut - June 26, 2014, 9:01 a.m.
Adjust the mtdparts to also consider factory-programmed config block.

Signed-off-by: Marek Vasut <marex@denx.de>
---
 include/configs/m28evk.h | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

Patch

diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index c3bdd4b..89f9785 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -64,8 +64,8 @@ 
 #if defined(CONFIG_CMD_NAND) && defined(CONFIG_ENV_IS_IN_NAND)
 #define CONFIG_ENV_SIZE_REDUND		CONFIG_ENV_SIZE
 #define CONFIG_ENV_SECT_SIZE		(128 * 1024)
-#define CONFIG_ENV_RANGE		(512 * 1024)
-#define CONFIG_ENV_OFFSET		0x300000
+#define CONFIG_ENV_RANGE		(4 * CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_OFFSET		(24 * CONFIG_ENV_SECT_SIZE) /* 3 MiB */
 #define CONFIG_ENV_OFFSET_REDUND	\
 		(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)
 
@@ -79,13 +79,12 @@ 
 #define MTDIDS_DEFAULT			"nand0=gpmi-nand"
 #define MTDPARTS_DEFAULT			\
 	"mtdparts=gpmi-nand:"			\
-		"3m(bootloader)ro,"		\
-		"512k(environment),"		\
-		"512k(redundant-environment),"	\
-		"4m(kernel),"			\
-		"128k(fdt),"			\
-		"8m(ramdisk),"			\
-		"-(filesystem)"
+		"3m(u-boot),"			\
+		"512k(env1),"			\
+		"512k(env2),"			\
+		"14m(boot),"			\
+		"238m(data),"			\
+		"-@4096k(UBI)"
 #else
 #define CONFIG_ENV_IS_NOWHERE
 #endif