8df12d76c6
Refreshed all patches. Removed: - 030-PCI-dwc-skip-MSI-init-if-MSIs-have-been-explicitly-d.patch Altered: - 366-netfilter-nf_flow_table-clean-up-and-fix-dst-handlin.patch - 650-netfilter-add-xt_OFFLOAD-target.patch - 662-remove_pfifo_fast.patch - 332-arc-add-OWRTDTB-section.patch - 100-clocksource-drivers-arch_timer-Workaround-for-Allwin.patch - 702-phy_add_aneg_done_function.patch New symbols: - ARC_IRQ_NO_AUTOSAVE - SUN50I_ERRATUM_UNKNOWN1 Compile-tested: cns3xxx, imx6, sunxi Runtime-tested: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
106 lines
2.7 KiB
Diff
106 lines
2.7 KiB
Diff
From 4a228ecf553e879bae384e634bb6413438e81a0e Mon Sep 17 00:00:00 2001
|
|
From: Linus Walleij <linus.walleij@linaro.org>
|
|
Date: Mon, 11 Mar 2019 15:43:05 +0100
|
|
Subject: [PATCH 1/2] ARM: dts: gemini: Indent DIR-685 partition table
|
|
|
|
It is discouraged to have OF partitions as subnodes directly
|
|
under the device, create a "partitions" subnode and put the
|
|
partitions inside it.
|
|
|
|
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
|
---
|
|
arch/arm/boot/dts/gemini-dlink-dir-685.dts | 82 ++++++++++++----------
|
|
1 file changed, 44 insertions(+), 38 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts
|
|
+++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
|
|
@@ -267,44 +267,50 @@
|
|
/* 32MB of flash */
|
|
reg = <0x30000000 0x02000000>;
|
|
|
|
- /*
|
|
- * This "RedBoot" is the Storlink derivative.
|
|
- */
|
|
- partition@0 {
|
|
- label = "RedBoot";
|
|
- reg = <0x00000000 0x00040000>;
|
|
- read-only;
|
|
- };
|
|
- /*
|
|
- * This firmware image contains the kernel catenated
|
|
- * with the squashfs root filesystem. For some reason
|
|
- * this is called "upgrade" on the vendor system.
|
|
- */
|
|
- partition@40000 {
|
|
- label = "upgrade";
|
|
- reg = <0x00040000 0x01f40000>;
|
|
- read-only;
|
|
- };
|
|
- /* RGDB, Residental Gateway Database? */
|
|
- partition@1f80000 {
|
|
- label = "rgdb";
|
|
- reg = <0x01f80000 0x00040000>;
|
|
- read-only;
|
|
- };
|
|
- /*
|
|
- * This partition contains MAC addresses for WAN,
|
|
- * WLAN and LAN, and the country code (for wireless
|
|
- * I guess).
|
|
- */
|
|
- partition@1fc0000 {
|
|
- label = "nvram";
|
|
- reg = <0x01fc0000 0x00020000>;
|
|
- read-only;
|
|
- };
|
|
- partition@1fe0000 {
|
|
- label = "LangPack";
|
|
- reg = <0x01fe0000 0x00020000>;
|
|
- read-only;
|
|
+ partitions {
|
|
+ compatible = "fixed-partitions";
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <1>;
|
|
+
|
|
+ /*
|
|
+ * This "RedBoot" is the Storlink derivative.
|
|
+ */
|
|
+ partition@0 {
|
|
+ label = "RedBoot";
|
|
+ reg = <0x00000000 0x00040000>;
|
|
+ read-only;
|
|
+ };
|
|
+ /*
|
|
+ * This firmware image contains the kernel catenated
|
|
+ * with the squashfs root filesystem. For some reason
|
|
+ * this is called "upgrade" on the vendor system.
|
|
+ */
|
|
+ partition@40000 {
|
|
+ label = "upgrade";
|
|
+ reg = <0x00040000 0x01f40000>;
|
|
+ read-only;
|
|
+ };
|
|
+ /* RGDB, Residental Gateway Database? */
|
|
+ partition@1f80000 {
|
|
+ label = "rgdb";
|
|
+ reg = <0x01f80000 0x00040000>;
|
|
+ read-only;
|
|
+ };
|
|
+ /*
|
|
+ * This partition contains MAC addresses for WAN,
|
|
+ * WLAN and LAN, and the country code (for wireless
|
|
+ * I guess).
|
|
+ */
|
|
+ partition@1fc0000 {
|
|
+ label = "nvram";
|
|
+ reg = <0x01fc0000 0x00020000>;
|
|
+ read-only;
|
|
+ };
|
|
+ partition@1fe0000 {
|
|
+ label = "LangPack";
|
|
+ reg = <0x01fe0000 0x00020000>;
|
|
+ read-only;
|
|
+ };
|
|
};
|
|
};
|
|
|