2022-08-30 23:03:58

by Pali Rohár

Subject: [PATCH] powerpc: dts: turris1x.dts: Fix NOR partitions labels

Partition partition@20000 contains generic kernel image and it does not
have to be used only for rescue purposes. Partition partition@1c0000
contains bootable rescue system and partition partition@340000 contains
factory image/data for restoring to NAND. So change partition labels to
better fit their purpose by removing possible misleading substring "rootfs"
from these labels.

Fixes: 54c15ec3b738 ("powerpc: dts: Add DTS file for CZ.NIC Turris 1.x routers")
Signed-off-by: Pali Rohár <[email protected]>
---
arch/powerpc/boot/dts/turris1x.dts | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/boot/dts/turris1x.dts b/arch/powerpc/boot/dts/turris1x.dts
index b7635f0b87a9..64c0dd733e40 100644
--- a/arch/powerpc/boot/dts/turris1x.dts
+++ b/arch/powerpc/boot/dts/turris1x.dts
@@ -263,21 +263,21 @@
};

partition@20000 {
- /* 1.7 MB for Rescue Linux Kernel Image */
+ /* 1.7 MB for Linux Kernel Image */
reg = <0x00020000 0x001a0000>;
- label = "rescue-kernel";
+ label = "kernel";
};

partition@1c0000 {
/* 1.5 MB for Rescue JFFS2 Root File System */
reg = <0x001c0000 0x00180000>;
- label = "rescue-rootfs";
+ label = "rescue";
};

partition@340000 {
- /* 11 MB for TAR.XZ Backup with content of NAND Root File System */
+ /* 11 MB for TAR.XZ Archive with Factory content of NAND Root File System */
reg = <0x00340000 0x00b00000>;
- label = "backup-rootfs";
+ label = "factory";
};

partition@e40000 {
--
2.20.1

2022-09-22 13:10:30

by Pali Rohár

Subject: Re: [PATCH] powerpc: dts: turris1x.dts: Fix NOR partitions labels

On Wednesday 31 August 2022 00:55:00 Pali Rohár wrote:
> Partition partition@20000 contains generic kernel image and it does not
> have to be used only for rescue purposes. Partition partition@1c0000
> contains bootable rescue system and partition partition@340000 contains
> factory image/data for restoring to NAND. So change partition labels to
> better fit their purpose by removing possible misleading substring "rootfs"
> from these labels.
>
> Fixes: 54c15ec3b738 ("powerpc: dts: Add DTS file for CZ.NIC Turris 1.x routers")
> Signed-off-by: Pali Rohár <[email protected]>

Ping?

> ---
> arch/powerpc/boot/dts/turris1x.dts | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/powerpc/boot/dts/turris1x.dts b/arch/powerpc/boot/dts/turris1x.dts
> index b7635f0b87a9..64c0dd733e40 100644
> --- a/arch/powerpc/boot/dts/turris1x.dts
> +++ b/arch/powerpc/boot/dts/turris1x.dts
> @@ -263,21 +263,21 @@
> };
>
> partition@20000 {
> - /* 1.7 MB for Rescue Linux Kernel Image */
> + /* 1.7 MB for Linux Kernel Image */
> reg = <0x00020000 0x001a0000>;
> - label = "rescue-kernel";
> + label = "kernel";
> };
>
> partition@1c0000 {
> /* 1.5 MB for Rescue JFFS2 Root File System */
> reg = <0x001c0000 0x00180000>;
> - label = "rescue-rootfs";
> + label = "rescue";
> };
>
> partition@340000 {
> - /* 11 MB for TAR.XZ Backup with content of NAND Root File System */
> + /* 11 MB for TAR.XZ Archive with Factory content of NAND Root File System */
> reg = <0x00340000 0x00b00000>;
> - label = "backup-rootfs";
> + label = "factory";
> };
>
> partition@e40000 {
> --
> 2.20.1
>