From 8e85ad152950d433e6c0c6201f2dd178a2f109bb Mon Sep 17 00:00:00 2001 From: Caleb Ethridge Date: Thu, 19 Feb 2026 15:15:58 -0500 Subject: [PATCH] ARM: dts: adi: Update SPI and OSPI partitions in device tree Reconfiguring the partitions in the SPI and OSPI to remove the DTB partition and give the extra space to the rootfs partition. Signed-off-by: Caleb Ethridge --- arch/arm/boot/dts/adi/sc573-ezlite.dts | 15 +++------ arch/arm/boot/dts/adi/sc589-mini.dts | 15 +++------ arch/arm/boot/dts/adi/sc594-som.dtsi | 34 ++++++++------------- arch/arm64/boot/dts/adi/sc598-som-ezkit.dts | 13 +++----- arch/arm64/boot/dts/adi/sc598-som-revD.dtsi | 11 ++----- arch/arm64/boot/dts/adi/sc598-som-revE.dtsi | 11 ++----- 6 files changed, 32 insertions(+), 67 deletions(-) diff --git a/arch/arm/boot/dts/adi/sc573-ezlite.dts b/arch/arm/boot/dts/adi/sc573-ezlite.dts index da4ad94d479ddb..79cdd532b27eef 100644 --- a/arch/arm/boot/dts/adi/sc573-ezlite.dts +++ b/arch/arm/boot/dts/adi/sc573-ezlite.dts @@ -176,27 +176,22 @@ spi-rx-bus-width = <4>; partition@0 { - label = "uboot spl (spi)"; + label = "U-boot SPL"; reg = <0x0 0x20000>; }; partition@1 { - label = "uboot proper (spi)"; + label = "U-boot Proper"; reg = <0x20000 0xb0000>; }; partition@2 { - label = "uboot env"; - reg = <0xd0000 0x10000>; + label = "Kernel"; + reg = <0x00d0000 0x0610000>; }; partition@3 { - label = "kernel (spi)"; - reg = <0x00e0000 0x0600000>; - }; - - partition@4 { - label = "root file system (spi)"; + label = "Rootfs"; reg = <0x06e0000 0x0920000>; }; }; diff --git a/arch/arm/boot/dts/adi/sc589-mini.dts b/arch/arm/boot/dts/adi/sc589-mini.dts index 524b67e979f8e3..21e46276a4d18f 100644 --- a/arch/arm/boot/dts/adi/sc589-mini.dts +++ b/arch/arm/boot/dts/adi/sc589-mini.dts @@ -136,27 +136,22 @@ reg = <0>; partition@0 { - label = "uboot spl (spi)"; + label = "U-boot SPL"; reg = <0x0 0x20000>; }; partition@1 { - label = "uboot proper (spi)"; + label = "U-boot Proper"; reg = <0x20000 0xb0000>; }; partition@2 { - label = "uboot env"; - reg = <0xd0000 0x10000>; + label = "Kernel"; + reg = <0x00d0000 0x0810000>; }; partition@3 { - label = "kernel (spi)"; - reg = <0x00e0000 0x0800000>; - }; - - partition@4 { - label = "root file system (spi)"; + label = "Rootfs"; reg = <0x08e0000 0x3720000>; }; }; diff --git a/arch/arm/boot/dts/adi/sc594-som.dtsi b/arch/arm/boot/dts/adi/sc594-som.dtsi index c000736c61e45a..411c407327aee4 100644 --- a/arch/arm/boot/dts/adi/sc594-som.dtsi +++ b/arch/arm/boot/dts/adi/sc594-som.dtsi @@ -183,19 +183,14 @@ reg = <0x40000 0xC0000>; }; - qspi_2: partition@2 { - label = "U-Boot Environment"; - reg = <0x100000 0x20000>; + qspi_2: partition@3 { + label = "Kernel"; + reg = <0x00100000 0xF00000>; }; - qspi_3: partition@3 { - label = "FIT Image"; - reg = <0x120000 0xF00000>; - }; - - qspi_4: partition@4 { - label = "JFFS2 Formatted RFS"; - reg = <0x1020000 0x2FE0000>; + qspi_3: partition@4 { + label = "Rootfs"; + reg = <0x1000000 0x03000000>; }; }; @@ -239,19 +234,14 @@ reg = <0x40000 0xC0000>; }; - ospi_2: partition@2 { - label = "U-Boot Environment"; - reg = <0x100000 0x20000>; - }; - - ospi_3: partition@3 { - label = "FIT Image"; - reg = <0x120000 0xF00000>; + ospi_2: partition@3 { + label = "Kernel"; + reg = <0x100000 0xF00000>; }; - ospi_4: partition@4 { - label = "JFFS2 Formatted RFS"; - reg = <0x1020000 0xFE0000>; + ospi_3: partition@4 { + label = "Rootfs"; + reg = <0x01000000 0x1000000>; }; }; }; diff --git a/arch/arm64/boot/dts/adi/sc598-som-ezkit.dts b/arch/arm64/boot/dts/adi/sc598-som-ezkit.dts index 0dd95064d4c372..329025d227ad1d 100644 --- a/arch/arm64/boot/dts/adi/sc598-som-ezkit.dts +++ b/arch/arm64/boot/dts/adi/sc598-som-ezkit.dts @@ -57,18 +57,13 @@ }; ospi_2: partition@2 { - label = "U-Boot Environment"; - reg = <0x100000 0x20000>; - }; - - ospi_3: partition@3 { label = "FIT Image"; - reg = <0x120000 0xF00000>; + reg = <0x100000 0xF00000>; }; - ospi_4: partition@4 { - label = "JFFS2 Formatted RFS"; - reg = <0x1020000 0xFE0000>; + ospi_3: partition@3 { + label = "Rootfs"; + reg = <0x1000000 0x1000000>; }; }; }; diff --git a/arch/arm64/boot/dts/adi/sc598-som-revD.dtsi b/arch/arm64/boot/dts/adi/sc598-som-revD.dtsi index 78ec419b142426..1f5180f6f22878 100644 --- a/arch/arm64/boot/dts/adi/sc598-som-revD.dtsi +++ b/arch/arm64/boot/dts/adi/sc598-som-revD.dtsi @@ -103,18 +103,13 @@ }; qspi_2@100000 { - label = "dtb"; - reg = <0x00100000 0x00010000>; - }; - - qspi_3@110000 { label = "kernel"; - reg = <0x00110000 0x02000000>; + reg = <0x00100000 0x00F00000>; }; - qspi_4@2110000 { + qspi_3@1000000 { label = "rootfs"; - reg = <0x02110000 0x01EF0000>; + reg = <0x01000000 0x03000000>; }; }; }; diff --git a/arch/arm64/boot/dts/adi/sc598-som-revE.dtsi b/arch/arm64/boot/dts/adi/sc598-som-revE.dtsi index 0b620f2b0ec812..b39c6ef9becd94 100644 --- a/arch/arm64/boot/dts/adi/sc598-som-revE.dtsi +++ b/arch/arm64/boot/dts/adi/sc598-som-revE.dtsi @@ -102,18 +102,13 @@ }; qspi_2@100000 { - label = "dtb"; - reg = <0x00100000 0x00010000>; - }; - - qspi_3@110000 { label = "kernel"; - reg = <0x00110000 0x02000000>; + reg = <0x00100000 0x02000000>; }; - qspi_4@2110000 { + qspi_3@2100000 { label = "rootfs"; - reg = <0x02110000 0x05EF0000>; + reg = <0x02100000 0x05EF0000>; }; }; };