target/linux/gemini/patches-4.19/0011-ARM-dts-Fix-up-SQ201-flash-access.patch

   1 From 186692e51e6c40d8ebd05d25f009098eb00f8110 Mon Sep 17 00:00:00 2001
   2 From: Linus Walleij <linus.walleij@linaro.org>
   3 Date: Fri, 19 Oct 2018 09:00:51 +0200
   4 Subject: [PATCH 11/18] ARM: dts: Fix up SQ201 flash access
   5
   6 This sets the partition information on the SQ201 to be read
   7 out from the RedBoot partition table, removes the static
   8 partition table and sets our boot options to mount root from
   9 /dev/mtdblock2 where the initramfs resides.
  10
  11 Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  12 ---
  13  arch/arm/boot/dts/gemini-sq201.dts | 37 ++++--------------------------
  14  1 file changed, 5 insertions(+), 32 deletions(-)
  15
  16 diff --git a/arch/arm/boot/dts/gemini-sq201.dts b/arch/arm/boot/dts/gemini-sq201.dts
  17 index 79df6ce5bc6a..c5bb24102b75 100644
  18 --- a/arch/arm/boot/dts/gemini-sq201.dts
  19 +++ b/arch/arm/boot/dts/gemini-sq201.dts
  20 @@ -20,7 +20,7 @@
  21         };
  22
  23         chosen {
  24 -               bootargs = "console=ttyS0,115200n8 root=/dev/sda1 rw rootwait";
  25 +               bootargs = "console=ttyS0,115200n8 root=/dev/mtdblock2 rw rootfstype=squashfs,jffs2 rootwait";
  26                 stdout-path = &uart0;
  27         };
  28
  29 @@ -131,37 +131,10 @@
  30                         /* 16MB of flash */
  31                         reg = <0x30000000 0x01000000>;
  32
  33 -                       partition@0 {
  34 -                               label = "RedBoot";
  35 -                               reg = <0x00000000 0x00120000>;
  36 -                               read-only;
  37 -                       };
  38 -                       partition@120000 {
  39 -                               label = "Kernel";
  40 -                               reg = <0x00120000 0x00200000>;
  41 -                       };
  42 -                       partition@320000 {
  43 -                               label = "Ramdisk";
  44 -                               reg = <0x00320000 0x00600000>;
  45 -                       };
  46 -                       partition@920000 {
  47 -                               label = "Application";
  48 -                               reg = <0x00920000 0x00600000>;
  49 -                       };
  50 -                       partition@f20000 {
  51 -                               label = "VCTL";
  52 -                               reg = <0x00f20000 0x00020000>;
  53 -                               read-only;
  54 -                       };
  55 -                       partition@f40000 {
  56 -                               label = "CurConf";
  57 -                               reg = <0x00f40000 0x000a0000>;
  58 -                               read-only;
  59 -                       };
  60 -                       partition@fe0000 {
  61 -                               label = "FIS directory";
  62 -                               reg = <0x00fe0000 0x00020000>;
  63 -                               read-only;
  64 +                       partitions {
  65 +                               compatible = "redboot-fis";
  66 +                               /* Eraseblock at 0xfe0000 */
  67 +                               fis-index-block = <0x1fc>;
  68                         };
  69                 };
  70
  71 --
  72 2.19.2
  73