ARM: dts: gemini: Switch to redboot partition parsing

This switches the kernel to parse the Redboot partitions
in the SL93512r and the NAS4220B properly using the
right compatible string instead of using hard-coded
partitions.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/boot/dts/gemini-nas4220b.dts b/arch/arm/boot/dts/gemini-nas4220b.dts
index f4535d6..254ecbc 100644 (file)
--- a/arch/arm/boot/dts/gemini-nas4220b.dts
+++ b/arch/arm/boot/dts/gemini-nas4220b.dts
@@ -81,37 +81,10 @@
                        /* 16MB of flash */
                        reg = <0x30000000 0x01000000>;
 
-                       partition@0 {
-                               label = "RedBoot";
-                               reg = <0x00000000 0x00020000>;
-                               read-only;
-                       };
-                       partition@20000 {
-                               label = "Kernel";
-                               reg = <0x00020000 0x00300000>;
-                       };
-                       partition@320000 {
-                               label = "Ramdisk";
-                               reg = <0x00320000 0x00600000>;
-                       };
-                       partition@920000 {
-                               label = "Application";
-                               reg = <0x00920000 0x00600000>;
-                       };
-                       partition@f20000 {
-                               label = "VCTL";
-                               reg = <0x00f20000 0x00020000>;
-                               read-only;
-                       };
-                       partition@f40000 {
-                               label = "CurConf";
-                               reg = <0x00f40000 0x000a0000>;
-                               read-only;
-                       };
-                       partition@fe0000 {
-                               label = "FIS directory";
-                               reg = <0x00fe0000 0x00020000>;
-                               read-only;
+                       partitions {
+                               compatible = "redboot-fis";
+                               /* Eraseblock at 0xfe0000 */
+                               fis-index-block = <0x1fc>;
                        };
                };
 

diff --git a/arch/arm/boot/dts/gemini-sl93512r.dts b/arch/arm/boot/dts/gemini-sl93512r.dts
index afe6555..5f70e01 100644 (file)
--- a/arch/arm/boot/dts/gemini-sl93512r.dts
+++ b/arch/arm/boot/dts/gemini-sl93512r.dts
@@ -143,37 +143,10 @@
                        /* 16MB of flash */
                        reg = <0x30000000 0x01000000>;
 
-                       partition@0 {
-                               label = "BOOT";
-                               reg = <0x00000000 0x00020000>;
-                               read-only;
-                       };
-                       partition@120000 {
-                               label = "Kern";
-                               reg = <0x00020000 0x00300000>;
-                       };
-                       partition@320000 {
-                               label = "Ramdisk";
-                               reg = <0x00320000 0x00600000>;
-                       };
-                       partition@920000 {
-                               label = "Application";
-                               reg = <0x00920000 0x00600000>;
-                       };
-                       partition@f20000 {
-                               label = "VCTL";
-                               reg = <0x00f20000 0x00020000>;
-                               read-only;
-                       };
-                       partition@f40000 {
-                               label = "CurConf";
-                               reg = <0x00f40000 0x000a0000>;
-                               read-only;
-                       };
-                       partition@fe0000 {
-                               label = "FIS directory";
-                               reg = <0x00fe0000 0x00020000>;
-                               read-only;
+                       partitions {
+                               compatible = "redboot-fis";
+                               /* Eraseblock at 0xfe0000 */
+                               fis-index-block = <0x1fc>;
                        };
                };