Patchwork [U-Boot,2/2,NEXT] mpc52xx, charon: change mtd default partitions

login
register
mail settings
Submitter Heiko Schocher
Date Dec. 17, 2010, 9:11 a.m.
Message ID <1292577087-13517-1-git-send-email-hs@denx.de>
Download mbox | patch
Permalink /patch/75848/
State Accepted
Commit 5624d66a4e191677bb58244a4a291117cc726152
Headers show

Comments

Heiko Schocher - Dec. 17, 2010, 9:11 a.m.
new default partittions on nor flash:

640k   (firmware)
1408k  (kernel)
2m     (initrd)
4m     (small-fs)
24320k (big-fs)
256k   (dts)

Signed-off-by: Heiko Schocher <hs@denx.de>
---
 include/configs/TQM5200.h |   14 +++++++++++++-
 include/configs/charon.h  |    1 +
 2 files changed, 14 insertions(+), 1 deletions(-)
Wolfgang Denk - Dec. 17, 2010, 7:15 p.m.
Dear Heiko Schocher,

In message <1292577087-13517-1-git-send-email-hs@denx.de> you wrote:
> new default partittions on nor flash:
> 
> 640k   (firmware)
> 1408k  (kernel)
> 2m     (initrd)
> 4m     (small-fs)
> 24320k (big-fs)
> 256k   (dts)
> 
> Signed-off-by: Heiko Schocher <hs@denx.de>
> ---
>  include/configs/TQM5200.h |   14 +++++++++++++-
>  include/configs/charon.h  |    1 +
>  2 files changed, 14 insertions(+), 1 deletions(-)

Aplied to "next", thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 58774ff..3154e13 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -273,6 +273,11 @@ 
 	"fdt_addr=FC100000\0"						\
 	"kernel_addr=FC140000\0"					\
 	"ramdisk_addr=FC600000\0"
+#elif defined(CONFIG_CHARON)
+#define ENV_FLASH_LAYOUT						\
+	"fdt_addr=FDFC0000\0"						\
+	"kernel_addr=FC0A0000\0"					\
+	"ramdisk_addr=FC200000\0"
 #else	/* !CONFIG_TQM5200_B */
 #define ENV_FLASH_LAYOUT						\
 	"fdt_addr=FC0A0000\0"						\
@@ -426,7 +431,7 @@ 
 #define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */
 #define MTDIDS_DEFAULT		"nor0=fc000000.flash"
 
-#if defined(CONFIG_CHARON) || defined(CONFIG_STK52XX)
+#if defined(CONFIG_STK52XX)
 # if defined(CONFIG_TQM5200_B)
 #  if defined(CONFIG_SYS_LOWBOOT)
 #   define MTDPARTS_DEFAULT	"mtdparts=fc000000.flash:1m(firmware),"	\
@@ -458,6 +463,13 @@ 
 						"1792k(kernel),"	\
 						"5632k(rootfs),"	\
 						"24m(home)"
+#elif defined (CONFIG_CHARON)
+#   define MTDPARTS_DEFAULT	"mtdparts=fc000000.flash:640k(firmware),"\
+						"1408k(kernel),"	\
+						"2m(initrd),"		\
+						"4m(small-fs),"		\
+						"24320k(big-fs),"	\
+						"256k(dts)"
 #elif defined (CONFIG_FO300)
 #   define MTDPARTS_DEFAULT	"mtdparts=fc000000.flash:640k(firmware),"\
 						"1408k(kernel),"	\
diff --git a/include/configs/charon.h b/include/configs/charon.h
index 80a273c..f29ceaf 100644
--- a/include/configs/charon.h
+++ b/include/configs/charon.h
@@ -47,6 +47,7 @@ 
 	"bootfile=/tftpboot/charon/uImage\0"			\
 	"fdt_file=/tftpboot/charon/charon.dtb\0"		\
 	"u-boot=/tftpboot/charon/u-boot.bin\0"			\
+	"mtdparts=" MTDPARTS_DEFAULT "\0"			\
 	"addmtd=setenv bootargs ${bootargs} ${mtdparts}\0"