[U-Boot] [PATCH] siemens,am33x: adjust mtd partition
Use one mtd partition for rootfs and configuration by means of ubi volumes and get rid of configuration partition. We can use partition layout for both 256MB and 512MB flash.
Signed-off-by: Samuel Egli samuel.egli@siemens.com Cc: Heiko Schocher hs@denx.de Cc: Roger Meier r.meier@siemens.com --- include/configs/siemens-am33x-common.h | 33 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 120647f..eddb868 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -486,7 +486,7 @@
/* * Variant 2 partition layout - * chip-size = 256MiB + * chip-size = 256MiB or 512 MiB *| name | size | address area | *------------------------------------------------------- *| spl | 128.000 KiB | 0x 0..0x 1ffff | @@ -496,23 +496,23 @@ *| u-boot | 1.875 MiB | 0x 80000..0x 25ffff | *| uboot.env0 | 512.000 KiB | 0x 260000..0x 2Dffff | *| uboot.env1 | 512.000 KiB | 0x 2E0000..0x 35ffff | - *| rootfs | 148.000 MiB | 0x 360000..0x 975ffff | - *| mtdoops | 512.000 KiB | 0x 9760000..0x 98Dffff | - *|configuration | 104.125 MiB | 0x 97E0000..0x fffffff | + *| mtdoops | 512.000 KiB | 0x 360000..0x 3dffff | + *| (256) rootfs | 252.125 MiB | 0x 3E0000..0x fffffff | + *| (512) rootfs | 508.125 MiB | 0x 3E0000..0x1fffffff | *------------------------------------------------------- */
#define MTDPARTS_DEFAULT_V2 "mtdparts=" MTDIDS_NAME_STR ":" \ - "128k(spl)," \ - "128k(spl.backup1)," \ - "128k(spl.backup2)," \ - "128k(spl.backup3)," \ - "1920k(u-boot)," \ - "512k(u-boot.env0)," \ - "512k(u-boot.env1)," \ - "148m(rootfs)," \ - "512k(mtdoops)," \ - "-(configuration)" + "128k(spl)," \ + "128k(spl.backup1)," \ + "128k(spl.backup2)," \ + "128k(spl.backup3)," \ + "1920k(u-boot)," \ + "512k(u-boot.env0)," \ + "512k(u-boot.env1)," \ + "512k(mtdoops)," \ + "-(rootfs)" +
#define DFU_ALT_INFO_NAND_V2 \ "spl part 0 1;" \ @@ -522,8 +522,7 @@ "u-boot part 0 5;" \ "u-boot.env0 part 0 6;" \ "u-boot.env1 part 0 7;" \ - "rootfs partubi 0 8;" \ - "configuration partubi 0 10" + "rootfs partubi 0 9" \
#define CONFIG_ENV_SETTINGS_NAND_V2 \ "nand_active_ubi_vol=rootfs_a\0" \ @@ -540,7 +539,7 @@ "setenv nand_active_ubi_vol ${rootfs_name}_b;" \ "fi;" \ "setenv nand_root ubi0:${nand_active_ubi_vol} rw " \ - "ubi.mtd=7,2048 ubi.mtd=9,2048;" \ + "ubi.mtd=8,2048;" \ "setenv bootargs ${bootargs} " \ "root=${nand_root} noinitrd ${mtdparts} " \ "rootfstype=${nand_root_fs_type} ip=${ip_method} " \
Thanks Sam!
-----Original Message----- From: Samuel Egli [mailto:samuel.egli@siemens.com] Sent: Mittwoch, 1. Juli 2015 11:05 To: u-boot@lists.denx.de Cc: trini@konsulko.com; Egli, Samuel; Heiko Schocher; Meier, Roger Subject: [PATCH] siemens,am33x: adjust mtd partition
Use one mtd partition for rootfs and configuration by means of ubi volumes and get rid of configuration partition. We can use partition layout for both 256MB and 512MB flash.
Signed-off-by: Samuel Egli samuel.egli@siemens.com Cc: Heiko Schocher hs@denx.de Cc: Roger Meier r.meier@siemens.com
Reviewed-by: Roger Meier r.meier@siemens.com
Hallo Samuel,
Am 01.07.2015 um 11:04 schrieb Samuel Egli:
Use one mtd partition for rootfs and configuration by means of ubi volumes and get rid of configuration partition. We can use partition layout for both 256MB and 512MB flash.
Signed-off-by: Samuel Egli samuel.egli@siemens.com Cc: Heiko Schocher hs@denx.de Cc: Roger Meier r.meier@siemens.com
include/configs/siemens-am33x-common.h | 33 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 17 deletions(-)
only one nitpick ...
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 120647f..eddb868 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -486,7 +486,7 @@
/*
- Variant 2 partition layout
- chip-size = 256MiB
*| name | size | address area | *------------------------------------------------------- *| spl | 128.000 KiB | 0x 0..0x 1ffff |
- chip-size = 256MiB or 512 MiB
@@ -496,23 +496,23 @@ *| u-boot | 1.875 MiB | 0x 80000..0x 25ffff | *| uboot.env0 | 512.000 KiB | 0x 260000..0x 2Dffff | *| uboot.env1 | 512.000 KiB | 0x 2E0000..0x 35ffff |
- *| rootfs | 148.000 MiB | 0x 360000..0x 975ffff |
- *| mtdoops | 512.000 KiB | 0x 9760000..0x 98Dffff |
- *|configuration | 104.125 MiB | 0x 97E0000..0x fffffff |
*| mtdoops | 512.000 KiB | 0x 360000..0x 3dffff |
*| (256) rootfs | 252.125 MiB | 0x 3E0000..0x fffffff |
*| (512) rootfs | 508.125 MiB | 0x 3E0000..0x1fffffff | *------------------------------------------------------- */
#define MTDPARTS_DEFAULT_V2 "mtdparts=" MTDIDS_NAME_STR ":" \
"128k(spl)," \"128k(spl.backup1)," \"128k(spl.backup2)," \"128k(spl.backup3)," \"1920k(u-boot)," \"512k(u-boot.env0)," \"512k(u-boot.env1)," \"148m(rootfs)," \"512k(mtdoops)," \"-(configuration)"
"128k(spl)," \"128k(spl.backup1)," \"128k(spl.backup2)," \"128k(spl.backup3)," \"1920k(u-boot)," \"512k(u-boot.env0)," \"512k(u-boot.env1)," \"512k(mtdoops)," \"-(rootfs)"
You name the partition "rootfs" .. but it contains not only the rootfs, instead it contains now 2 or more UBI volumes ...
Maybe a rename it to "ubi" or "ubivolumes" or ... makes this clearer? Beside of this, you can add my:
Acked-by: Heiko Schocher hs@denx.de
bye, Heiko
#define DFU_ALT_INFO_NAND_V2 \ "spl part 0 1;" \
@@ -522,8 +522,7 @@ "u-boot part 0 5;" \ "u-boot.env0 part 0 6;" \ "u-boot.env1 part 0 7;" \
- "rootfs partubi 0 8;" \
- "configuration partubi 0 10"
"rootfs partubi 0 9" \
#define CONFIG_ENV_SETTINGS_NAND_V2 \ "nand_active_ubi_vol=rootfs_a\0" \
@@ -540,7 +539,7 @@ "setenv nand_active_ubi_vol ${rootfs_name}_b;" \ "fi;" \ "setenv nand_root ubi0:${nand_active_ubi_vol} rw " \
"ubi.mtd=7,2048 ubi.mtd=9,2048;" \
"ubi.mtd=8,2048;" \
Hi Heiko,
-----Original Message----- From: Heiko Schocher denx [mailto:hs@denx.de] Sent: Mittwoch, 1. Juli 2015 13:14 To: Egli, Samuel Cc: u-boot@lists.denx.de; trini@konsulko.com; Meier, Roger Subject: Re: [PATCH] siemens,am33x: adjust mtd partition
Hallo Samuel,
Am 01.07.2015 um 11:04 schrieb Samuel Egli:
Use one mtd partition for rootfs and configuration by means of ubi volumes and get rid of configuration partition. We can use partition layout for both 256MB and 512MB flash.
Signed-off-by: Samuel Egli samuel.egli@siemens.com Cc: Heiko Schocher hs@denx.de Cc: Roger Meier r.meier@siemens.com
include/configs/siemens-am33x-common.h | 33 ++++++++++++++++------
1 file changed, 16 insertions(+), 17 deletions(-)
only one nitpick ...
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 120647f..eddb868 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -486,7 +486,7 @@
/*
- Variant 2 partition layout
- chip-size = 256MiB
*| name | size | address area | *------------------------------------------------------- *| spl | 128.000 KiB | 0x 0..0x 1ffff |
- chip-size = 256MiB or 512 MiB
@@ -496,23 +496,23 @@ *| u-boot | 1.875 MiB | 0x 80000..0x 25ffff | *| uboot.env0 | 512.000 KiB | 0x 260000..0x 2Dffff | *| uboot.env1 | 512.000 KiB | 0x 2E0000..0x 35ffff |
- *| rootfs | 148.000 MiB | 0x 360000..0x 975ffff |
- *| mtdoops | 512.000 KiB | 0x 9760000..0x 98Dffff |
- *|configuration | 104.125 MiB | 0x 97E0000..0x fffffff |
*| mtdoops | 512.000 KiB | 0x 360000..0x 3dffff |
*| (256) rootfs | 252.125 MiB | 0x 3E0000..0x fffffff | *| (512)
rootfs | 508.125 MiB | 0x 3E0000..0x1fffffff | *------------------------------------------------------- */
#define MTDPARTS_DEFAULT_V2 "mtdparts=" MTDIDS_NAME_STR ":" \
"128k(spl)," \"128k(spl.backup1)," \"128k(spl.backup2)," \"128k(spl.backup3)," \"1920k(u-boot)," \"512k(u-boot.env0)," \"512k(u-boot.env1)," \"148m(rootfs)," \"512k(mtdoops)," \"-(configuration)"
"128k(spl)," \"128k(spl.backup1)," \"128k(spl.backup2)," \"128k(spl.backup3)," \"1920k(u-boot)," \"512k(u-boot.env0)," \"512k(u-boot.env1)," \"512k(mtdoops)," \"-(rootfs)"You name the partition "rootfs" .. but it contains not only the rootfs, instead it contains now 2 or more UBI volumes ...
Yes this is true.
Maybe a rename it to "ubi" or "ubivolumes" or ... makes this clearer? Beside of this, you can add my:
I had a first draft with partition name "ubi" ;-). What made me switch back too rootfs:
* Minimal changes in xml descriptions and scripts (not part of U-Boot) * DFU handles partitions with name "rootfs" differently, i.e. performs an erase for remaining blocks (although, I'm not sure if this is still true)
Acked-by: Heiko Schocher hs@denx.de
bye, Heiko
#define DFU_ALT_INFO_NAND_V2 \ "spl part 0 1;" \
@@ -522,8 +522,7 @@ "u-boot part 0 5;" \ "u-boot.env0 part 0 6;" \ "u-boot.env1 part 0 7;" \
- "rootfs partubi 0 8;" \
- "configuration partubi 0 10"
"rootfs partubi 0 9" \
#define CONFIG_ENV_SETTINGS_NAND_V2 \ "nand_active_ubi_vol=rootfs_a\0" \
@@ -540,7 +539,7 @@ "setenv nand_active_ubi_vol ${rootfs_name}_b;" \ "fi;" \ "setenv nand_root ubi0:${nand_active_ubi_vol} rw " \
"ubi.mtd=7,2048 ubi.mtd=9,2048;" \
"ubi.mtd=8,2048;" \-- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Sam
On Wed, Jul 01, 2015 at 11:04:38AM +0200, Samuel Egli wrote:
Use one mtd partition for rootfs and configuration by means of ubi volumes and get rid of configuration partition. We can use partition layout for both 256MB and 512MB flash.
Signed-off-by: Samuel Egli samuel.egli@siemens.com Cc: Heiko Schocher hs@denx.de Cc: Roger Meier r.meier@siemens.com
[snip]
@@ -540,7 +539,7 @@ "setenv nand_active_ubi_vol ${rootfs_name}_b;" \ "fi;" \ "setenv nand_root ubi0:${nand_active_ubi_vol} rw " \
"ubi.mtd=7,2048 ubi.mtd=9,2048;" \
"ubi.mtd=8,2048;" \
The kernel also accepts partition names here instead of numbers making this more future-proof.
Use one mtd partition for rootfs and configuration by means of ubi volumes and get rid of configuration partition. We can use partition layout for both 256MB and 512MB flash.
Signed-off-by: Samuel Egli samuel.egli@siemens.com Cc: Heiko Schocher hs@denx.de Cc: Roger Meier r.meier@siemens.com --- Changes for v2: - Use partition name instead of number
include/configs/siemens-am33x-common.h | 33 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 35427db..b0d9243 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -490,7 +490,7 @@
/* * Variant 2 partition layout - * chip-size = 256MiB + * chip-size = 256MiB or 512 MiB *| name | size | address area | *------------------------------------------------------- *| spl | 128.000 KiB | 0x 0..0x 1ffff | @@ -500,23 +500,23 @@ *| u-boot | 1.875 MiB | 0x 80000..0x 25ffff | *| uboot.env0 | 512.000 KiB | 0x 260000..0x 2Dffff | *| uboot.env1 | 512.000 KiB | 0x 2E0000..0x 35ffff | - *| rootfs | 148.000 MiB | 0x 360000..0x 975ffff | - *| mtdoops | 512.000 KiB | 0x 9760000..0x 98Dffff | - *|configuration | 104.125 MiB | 0x 97E0000..0x fffffff | + *| mtdoops | 512.000 KiB | 0x 360000..0x 3dffff | + *| (256) rootfs | 252.125 MiB | 0x 3E0000..0x fffffff | + *| (512) rootfs | 508.125 MiB | 0x 3E0000..0x1fffffff | *------------------------------------------------------- */
#define MTDPARTS_DEFAULT_V2 "mtdparts=" MTDIDS_NAME_STR ":" \ - "128k(spl)," \ - "128k(spl.backup1)," \ - "128k(spl.backup2)," \ - "128k(spl.backup3)," \ - "1920k(u-boot)," \ - "512k(u-boot.env0)," \ - "512k(u-boot.env1)," \ - "148m(rootfs)," \ - "512k(mtdoops)," \ - "-(configuration)" + "128k(spl)," \ + "128k(spl.backup1)," \ + "128k(spl.backup2)," \ + "128k(spl.backup3)," \ + "1920k(u-boot)," \ + "512k(u-boot.env0)," \ + "512k(u-boot.env1)," \ + "512k(mtdoops)," \ + "-(rootfs)" +
#define DFU_ALT_INFO_NAND_V2 \ "spl part 0 1;" \ @@ -526,8 +526,7 @@ "u-boot part 0 5;" \ "u-boot.env0 part 0 6;" \ "u-boot.env1 part 0 7;" \ - "rootfs partubi 0 8;" \ - "configuration partubi 0 10" + "rootfs partubi 0 9" \
#define CONFIG_ENV_SETTINGS_NAND_V2 \ "nand_active_ubi_vol=rootfs_a\0" \ @@ -544,7 +543,7 @@ "setenv nand_active_ubi_vol ${rootfs_name}_b;" \ "fi;" \ "setenv nand_root ubi0:${nand_active_ubi_vol} rw " \ - "ubi.mtd=7,2048 ubi.mtd=9,2048;" \ + "ubi.mtd=rootfs,2048;" \ "setenv bootargs ${bootargs} " \ "root=${nand_root} noinitrd ${mtdparts} " \ "rootfstype=${nand_root_fs_type} ip=${ip_method} " \ -- 1.7.10.4
On Wed, Jul 01, 2015 at 05:57:39PM +0200, Samuel Egli wrote:
Use one mtd partition for rootfs and configuration by means of ubi volumes and get rid of configuration partition. We can use partition layout for both 256MB and 512MB flash.
Signed-off-by: Samuel Egli samuel.egli@siemens.com Cc: Heiko Schocher hs@denx.de Cc: Roger Meier r.meier@siemens.com
Reviewed-by: Tom Rini trini@konsulko.com
Hello Samuel,
Am 01.07.2015 um 17:57 schrieb Samuel Egli:
Use one mtd partition for rootfs and configuration by means of ubi volumes and get rid of configuration partition. We can use partition layout for both 256MB and 512MB flash.
Signed-off-by: Samuel Egli samuel.egli@siemens.com Cc: Heiko Schocher hs@denx.de Cc: Roger Meier r.meier@siemens.com
Changes for v2: - Use partition name instead of number
include/configs/siemens-am33x-common.h | 33 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 17 deletions(-)
Acked-by: Heiko Schocher hs@denx.de
bye, Heiko
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 35427db..b0d9243 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -490,7 +490,7 @@
/*
- Variant 2 partition layout
- chip-size = 256MiB
*| name | size | address area | *------------------------------------------------------- *| spl | 128.000 KiB | 0x 0..0x 1ffff |
- chip-size = 256MiB or 512 MiB
@@ -500,23 +500,23 @@ *| u-boot | 1.875 MiB | 0x 80000..0x 25ffff | *| uboot.env0 | 512.000 KiB | 0x 260000..0x 2Dffff | *| uboot.env1 | 512.000 KiB | 0x 2E0000..0x 35ffff |
- *| rootfs | 148.000 MiB | 0x 360000..0x 975ffff |
- *| mtdoops | 512.000 KiB | 0x 9760000..0x 98Dffff |
- *|configuration | 104.125 MiB | 0x 97E0000..0x fffffff |
*| mtdoops | 512.000 KiB | 0x 360000..0x 3dffff |
*| (256) rootfs | 252.125 MiB | 0x 3E0000..0x fffffff |
*| (512) rootfs | 508.125 MiB | 0x 3E0000..0x1fffffff | *------------------------------------------------------- */
#define MTDPARTS_DEFAULT_V2 "mtdparts=" MTDIDS_NAME_STR ":" \
"128k(spl)," \"128k(spl.backup1)," \"128k(spl.backup2)," \"128k(spl.backup3)," \"1920k(u-boot)," \"512k(u-boot.env0)," \"512k(u-boot.env1)," \"148m(rootfs)," \"512k(mtdoops)," \"-(configuration)"
"128k(spl)," \"128k(spl.backup1)," \"128k(spl.backup2)," \"128k(spl.backup3)," \"1920k(u-boot)," \"512k(u-boot.env0)," \"512k(u-boot.env1)," \"512k(mtdoops)," \"-(rootfs)"#define DFU_ALT_INFO_NAND_V2 \ "spl part 0 1;" \
@@ -526,8 +526,7 @@ "u-boot part 0 5;" \ "u-boot.env0 part 0 6;" \ "u-boot.env1 part 0 7;" \
- "rootfs partubi 0 8;" \
- "configuration partubi 0 10"
"rootfs partubi 0 9" \
#define CONFIG_ENV_SETTINGS_NAND_V2 \ "nand_active_ubi_vol=rootfs_a\0" \
@@ -544,7 +543,7 @@ "setenv nand_active_ubi_vol ${rootfs_name}_b;" \ "fi;" \ "setenv nand_root ubi0:${nand_active_ubi_vol} rw " \
"ubi.mtd=7,2048 ubi.mtd=9,2048;" \
"ubi.mtd=rootfs,2048;" \-- 1.7.10.4
On Wed, Jul 01, 2015 at 05:57:39PM +0200, Egli, Samuel wrote:
Use one mtd partition for rootfs and configuration by means of ubi volumes and get rid of configuration partition. We can use partition layout for both 256MB and 512MB flash.
Signed-off-by: Samuel Egli samuel.egli@siemens.com Cc: Heiko Schocher hs@denx.de Cc: Roger Meier r.meier@siemens.com Reviewed-by: Tom Rini trini@konsulko.com Acked-by: Heiko Schocher hs@denx.de
Applied to u-boot/master, thanks!
participants (5)
-
Egli, Samuel -
Heiko Schocher denx -
Meier, Roger -
Samuel Egli
-
Tom Rini