kernel: bump 4.19 to 4.19.18
[openwrt/openwrt.git] / 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 --- a/arch/arm/boot/dts/gemini-sq201.dts
17 +++ b/arch/arm/boot/dts/gemini-sq201.dts
18 @@ -20,7 +20,7 @@
19 };
20
21 chosen {
22 - bootargs = "console=ttyS0,115200n8 root=/dev/sda1 rw rootwait";
23 + bootargs = "console=ttyS0,115200n8 root=/dev/mtdblock2 rw rootfstype=squashfs,jffs2 rootwait";
24 stdout-path = &uart0;
25 };
26
27 @@ -131,37 +131,10 @@
28 /* 16MB of flash */
29 reg = <0x30000000 0x01000000>;
30
31 - partition@0 {
32 - label = "RedBoot";
33 - reg = <0x00000000 0x00120000>;
34 - read-only;
35 - };
36 - partition@120000 {
37 - label = "Kernel";
38 - reg = <0x00120000 0x00200000>;
39 - };
40 - partition@320000 {
41 - label = "Ramdisk";
42 - reg = <0x00320000 0x00600000>;
43 - };
44 - partition@920000 {
45 - label = "Application";
46 - reg = <0x00920000 0x00600000>;
47 - };
48 - partition@f20000 {
49 - label = "VCTL";
50 - reg = <0x00f20000 0x00020000>;
51 - read-only;
52 - };
53 - partition@f40000 {
54 - label = "CurConf";
55 - reg = <0x00f40000 0x000a0000>;
56 - read-only;
57 - };
58 - partition@fe0000 {
59 - label = "FIS directory";
60 - reg = <0x00fe0000 0x00020000>;
61 - read-only;
62 + partitions {
63 + compatible = "redboot-fis";
64 + /* Eraseblock at 0xfe0000 */
65 + fis-index-block = <0x1fc>;
66 };
67 };
68