mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-11-03 22:44:27 -05:00
860d6ce0ce
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>
105 lines
2.6 KiB
Diff
105 lines
2.6 KiB
Diff
From cad2161e64aca9e1c94fd11b0d0f7b53c9e80de0 Mon Sep 17 00:00:00 2001
|
|
From: Linus Walleij <linus.walleij@linaro.org>
|
|
Date: Fri, 12 Jul 2019 22:57:11 +0200
|
|
Subject: [PATCH 1/2] 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>
|
|
---
|
|
arch/arm/boot/dts/gemini-nas4220b.dts | 35 +++------------------------
|
|
arch/arm/boot/dts/gemini-sl93512r.dts | 35 +++------------------------
|
|
2 files changed, 8 insertions(+), 62 deletions(-)
|
|
|
|
--- 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>;
|
|
};
|
|
};
|
|
|
|
--- 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>;
|
|
};
|
|
};
|
|
|