target/linux/gemini/patches-4.19/0022-RM-dts-gemini-Switch-to-redboot-partition-parsing.patch

   1 From cad2161e64aca9e1c94fd11b0d0f7b53c9e80de0 Mon Sep 17 00:00:00 2001
   2 From: Linus Walleij <linus.walleij@linaro.org>
   3 Date: Fri, 12 Jul 2019 22:57:11 +0200
   4 Subject: [PATCH 1/2] ARM: dts: gemini: Switch to redboot partition parsing
   5
   6 This switches the kernel to parse the Redboot partitions
   7 in the SL93512r and the NAS4220B properly using the
   8 right compatible string instead of using hard-coded
   9 partitions.
  10
  11 Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  12 ---
  13  arch/arm/boot/dts/gemini-nas4220b.dts | 35 +++------------------------
  14  arch/arm/boot/dts/gemini-sl93512r.dts | 35 +++------------------------
  15  2 files changed, 8 insertions(+), 62 deletions(-)
  16
  17 --- a/arch/arm/boot/dts/gemini-nas4220b.dts
  18 +++ b/arch/arm/boot/dts/gemini-nas4220b.dts
  19 @@ -81,37 +81,10 @@
  20                         /* 16MB of flash */
  21                         reg = <0x30000000 0x01000000>;
  22
  23 -                       partition@0 {
  24 -                               label = "RedBoot";
  25 -                               reg = <0x00000000 0x00020000>;
  26 -                               read-only;
  27 -                       };
  28 -                       partition@20000 {
  29 -                               label = "Kernel";
  30 -                               reg = <0x00020000 0x00300000>;
  31 -                       };
  32 -                       partition@320000 {
  33 -                               label = "Ramdisk";
  34 -                               reg = <0x00320000 0x00600000>;
  35 -                       };
  36 -                       partition@920000 {
  37 -                               label = "Application";
  38 -                               reg = <0x00920000 0x00600000>;
  39 -                       };
  40 -                       partition@f20000 {
  41 -                               label = "VCTL";
  42 -                               reg = <0x00f20000 0x00020000>;
  43 -                               read-only;
  44 -                       };
  45 -                       partition@f40000 {
  46 -                               label = "CurConf";
  47 -                               reg = <0x00f40000 0x000a0000>;
  48 -                               read-only;
  49 -                       };
  50 -                       partition@fe0000 {
  51 -                               label = "FIS directory";
  52 -                               reg = <0x00fe0000 0x00020000>;
  53 -                               read-only;
  54 +                       partitions {
  55 +                               compatible = "redboot-fis";
  56 +                               /* Eraseblock at 0xfe0000 */
  57 +                               fis-index-block = <0x1fc>;
  58                         };
  59                 };
  60
  61 --- a/arch/arm/boot/dts/gemini-sl93512r.dts
  62 +++ b/arch/arm/boot/dts/gemini-sl93512r.dts
  63 @@ -143,37 +143,10 @@
  64                         /* 16MB of flash */
  65                         reg = <0x30000000 0x01000000>;
  66
  67 -                       partition@0 {
  68 -                               label = "BOOT";
  69 -                               reg = <0x00000000 0x00020000>;
  70 -                               read-only;
  71 -                       };
  72 -                       partition@120000 {
  73 -                               label = "Kern";
  74 -                               reg = <0x00020000 0x00300000>;
  75 -                       };
  76 -                       partition@320000 {
  77 -                               label = "Ramdisk";
  78 -                               reg = <0x00320000 0x00600000>;
  79 -                       };
  80 -                       partition@920000 {
  81 -                               label = "Application";
  82 -                               reg = <0x00920000 0x00600000>;
  83 -                       };
  84 -                       partition@f20000 {
  85 -                               label = "VCTL";
  86 -                               reg = <0x00f20000 0x00020000>;
  87 -                               read-only;
  88 -                       };
  89 -                       partition@f40000 {
  90 -                               label = "CurConf";
  91 -                               reg = <0x00f40000 0x000a0000>;
  92 -                               read-only;
  93 -                       };
  94 -                       partition@fe0000 {
  95 -                               label = "FIS directory";
  96 -                               reg = <0x00fe0000 0x00020000>;
  97 -                               read-only;
  98 +                       partitions {
  99 +                               compatible = "redboot-fis";
 100 +                               /* Eraseblock at 0xfe0000 */
 101 +                               fis-index-block = <0x1fc>;
 102                         };
 103                 };
 104