diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2019-07-17 19:22:40 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-08-17 16:57:32 +0200 |
| commit | 860d6ce0ce19b96506597bd7befadda86f15b489 (patch) | |
| tree | c8e19e16d1df0ff87c4e16e4e14f17aec45dff51 /target/linux/gemini/patches-4.19/0023-ARM-dts-gemini-Mount-root-from-mtdblock3.patch | |
| parent | 1eb851143a442d78dfebc1a3d925e5f04880d796 (diff) | |
| download | upstream-860d6ce0ce19b96506597bd7befadda86f15b489.tar.gz upstream-860d6ce0ce19b96506597bd7befadda86f15b489.tar.bz2 upstream-860d6ce0ce19b96506597bd7befadda86f15b489.zip | |
gemini: Fix up flash accesses
The SL93512r and the NAS4220B have Redboot partition
tables (rely on these) and need to boot from mtdblock3.
Add two patches from upstream to fix this.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'target/linux/gemini/patches-4.19/0023-ARM-dts-gemini-Mount-root-from-mtdblock3.patch')
| -rw-r--r-- | target/linux/gemini/patches-4.19/0023-ARM-dts-gemini-Mount-root-from-mtdblock3.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/gemini/patches-4.19/0023-ARM-dts-gemini-Mount-root-from-mtdblock3.patch b/target/linux/gemini/patches-4.19/0023-ARM-dts-gemini-Mount-root-from-mtdblock3.patch new file mode 100644 index 0000000000..2c2ddfaaf4 --- /dev/null +++ b/target/linux/gemini/patches-4.19/0023-ARM-dts-gemini-Mount-root-from-mtdblock3.patch @@ -0,0 +1,36 @@ +From b40cd2116ea0ba3584db12ab9dab7e02dd1e3333 Mon Sep 17 00:00:00 2001 +From: Linus Walleij <linus.walleij@linaro.org> +Date: Fri, 12 Jul 2019 22:59:39 +0200 +Subject: [PATCH 2/2] ARM: dts: gemini: Mount root from mtdblock3 + +The third mtdblock device named "Application" is where we +want to mount our root filesystem. + +Signed-off-by: Linus Walleij <linus.walleij@linaro.org> +--- + arch/arm/boot/dts/gemini-nas4220b.dts | 2 +- + arch/arm/boot/dts/gemini-sl93512r.dts | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/arch/arm/boot/dts/gemini-nas4220b.dts ++++ b/arch/arm/boot/dts/gemini-nas4220b.dts +@@ -20,7 +20,7 @@ + }; + + chosen { +- bootargs = "console=ttyS0,19200n8"; ++ bootargs = "console=ttyS0,19200n8 root=/dev/mtdblock3 rw rootfstype=squashfs,jffs2 rootwait"; + stdout-path = &uart0; + }; + +--- a/arch/arm/boot/dts/gemini-sl93512r.dts ++++ b/arch/arm/boot/dts/gemini-sl93512r.dts +@@ -24,7 +24,7 @@ + }; + + chosen { +- bootargs = "console=ttyS0,19200n8 root=/dev/sda1 rw rootwait"; ++ bootargs = "console=ttyS0,19200n8 root=/dev/mtdblock3 rw rootfstype=squashfs,jffs2 rootwait"; + stdout-path = &uart0; + }; + |