siemens,am33x: adjust mtd partition
PATCH 1/1 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.
--- include/configs/siemens-am33x-common.h | 33 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 17 deletions(-)
include/configs/siemens-am33x-common.h +16 -17
@@ -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} " \
Signature · 1 line
1.7.10.4
Meier
PATCH 1/1 siemens,am33x: adjust mtd partition
Thanks Sam!
Quoted 7 lines
-----Original Message-----
From: Samuel Egli [mailto:samuel.egli at siemens.com]
Sent: Mittwoch, 1. Juli 2015 11:05
To: u-boot at lists.denx.de
Cc: trini at konsulko.com; Egli, Samuel; Heiko Schocher; Meier, Roger
Subject: [PATCH] siemens,am33x: adjust mtd partition
Quoted 7 lines
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 <[email protected]>Cc Heiko Schocher <[email protected]>Cc Roger Meier <[email protected]>
PATCH 1/1 siemens,am33x: adjust mtd partition
In reply to Samuel EgliHallo Samuel,
Am 01.07.2015 um 11:04 schrieb Samuel Egli:
Quoted 10 lines
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 <[email protected]>Cc Heiko Schocher <[email protected]>Cc Roger Meier <[email protected]>--- include/configs/siemens-am33x-common.h | 33 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 17 deletions(-)
only one nitpick ...
Quoted 36 lines
include/configs/siemens-am33x-common.h +4
-13@@ -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)," \
include/configs/siemens-am33x-common.h line 514
Quoted 10 lines
include/configs/siemens-am33x-common.h +9
-1-"-(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:
bye,
Heiko
Quoted 24 lines
include/configs/siemens-am33x-common.h +3
-3+#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} " \
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Egli
PATCH 1/1 siemens,am33x: adjust mtd partition
Hi Heiko,
Quoted 66 lines
-----Original Message-----
From: Heiko Schocher denx [mailto:hs at denx.de]
Sent: Mittwoch, 1. Juli 2015 13:14
To: Egli, Samuel
Cc: u-boot at lists.denx.de; trini at konsulko.com; Meier, Roger
Subject: Re: [PATCH] siemens,am33x: adjust mtd partitionHallo Samuel,
Am 01.07.2015 um 11:04 schrieb Samuel Egli:
Quoted 9 lines
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 <[email protected]>Cc Heiko Schocher <[email protected]>Cc Roger Meier <[email protected]>--- include/configs/siemens-am33x-common.h | 33 ++++++++++++++++----------------
Quoted 1 line
1 file changed, 16 insertions(+), 17 deletions(-)only one nitpick ...
Quoted 42 lines
include/configs/siemens-am33x-common.h +8
-14@@ -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)," \
Quoted 9 lines
include/configs/siemens-am33x-common.h line 514
Quoted 5 lines
include/configs/siemens-am33x-common.h +5
-0+"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.
Quoted 2 lines
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)
Quoted 17 lines
Acked-by Heiko Schocher <[email protected]>bye,
HeikoQuoted 12 lines
include/configs/siemens-am33x-common.h +2
-2+#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" \
Quoted 16 lines
include/configs/siemens-am33x-common.h line 545
Quoted 12 lines
include/configs/siemens-am33x-common.h +1
-1#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} " \--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Sam
PATCH 1/1 siemens,am33x: adjust mtd partition
In reply to Samuel EgliQuoted 7 lines · 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 <[email protected]>Cc Heiko Schocher <[email protected]>Cc Roger Meier <[email protected]>
[snip]
include/configs/siemens-am33x-common.h line 542
Quoted 6 lines
include/configs/siemens-am33x-common.h +1
-1@@ -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.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150701/4983e3eb/attachment.sig>
PATCH v2 1/1 siemens,am33x: adjust mtd partition
In reply to Samuel EgliUse 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.
---
Changes for v2:
- Use partition name instead of number
include/configs/siemens-am33x-common.h | 33 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 17 deletions(-)
include/configs/siemens-am33x-common.h +16 -17
@@ -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
PATCH v2 1/1 siemens,am33x: adjust mtd partition
Quoted 7 lines · 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 <[email protected]>Cc Heiko Schocher <[email protected]>Cc Roger Meier <[email protected]>
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150701/55246f8a/attachment.sig>
PATCH v2 1/1 siemens,am33x: adjust mtd partition
In reply to Samuel EgliHello Samuel,
Am 01.07.2015 um 17:57 schrieb Samuel Egli:
Quoted 7 lines
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 <[email protected]>Cc Heiko Schocher <[email protected]>Cc Roger Meier <[email protected]>
Quoted 6 lines
---
Changes for v2:
- Use partition name instead of numberinclude/configs/siemens-am33x-common.h | 33 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 17 deletions(-)
bye,
Heiko
Quoted 73 lines
include/configs/siemens-am33x-common.h +16
-18@@ -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
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH v2 1/1 siemens,am33x: adjust mtd partition
In reply to Samuel EgliQuoted 9 lines · Samuel
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 <[email protected]>Cc Heiko Schocher <[email protected]>Cc Roger Meier <[email protected]>Reviewed-by Tom Rini <[email protected]>Acked-by Heiko Schocher <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150710/45e8cf35/attachment.sig>