[openwrt/openwrt] uboot-mediatek: add missing 'memory' nodes to downstream boards

LEDE Commits lede-commits at lists.infradead.org
Mon Aug 7 15:54:34 PDT 2023


dangole pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/0415aba6a937c71fa3071f2c385dc66ff3f074aa

commit 0415aba6a937c71fa3071f2c385dc66ff3f074aa
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Mon Jul 31 17:46:22 2023 +0100

    uboot-mediatek: add missing 'memory' nodes to downstream boards
    
    Among the patches adding support for MT7988 also came the switch to
    use fdtdec_setup_mem_size_base() and no longer rely on CFG_SYS_SDRAM_BASE.
    Take care of our downstream boards which did not have a 'memory' node in
    their device trees.
    
    Fixes: 572ea68070 ("uboot-mediatek: add patches for MT7988 and builds for RFB")
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch  | 7 ++++++-
 .../boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch  | 7 ++++++-
 package/boot/uboot-mediatek/patches/432-add-tplink-xdr608x.patch   | 7 ++++++-
 package/boot/uboot-mediatek/patches/433-add-qihoo_360t7.patch      | 7 ++++++-
 .../uboot-mediatek/patches/434-add-xiaomi_mi-router-wr30u.patch    | 7 ++++++-
 .../boot/uboot-mediatek/patches/435-add-h3c_magic-nx30-pro.patch   | 7 ++++++-
 6 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch b/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch
index b495f48d66..4bde061765 100644
--- a/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch
+++ b/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch
@@ -150,7 +150,7 @@
 +CONFIG_SERVERIP="192.168.1.254"
 --- /dev/null
 +++ b/arch/arm/dts/mt7622-ubnt-unifi-6-lr.dts
-@@ -0,0 +1,188 @@
+@@ -0,0 +1,193 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (c) 2019 MediaTek Inc.
@@ -173,6 +173,11 @@
 +		tick-timer = &timer0;
 +	};
 +
++	memory at 40000000 {
++		device_type = "memory";
++		reg = <0x40000000 0x20000000>;
++	};
++
 +	aliases {
 +		spi0 = &snor;
 +	};
diff --git a/package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch b/package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch
index 88e426366b..070456b2ee 100644
--- a/package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch
+++ b/package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch
@@ -182,7 +182,7 @@
 +CONFIG_SERVERIP="192.168.1.254"
 --- /dev/null
 +++ b/arch/arm/dts/mt7986a-xiaomi_redmi-ax6000.dts
-@@ -0,0 +1,156 @@
+@@ -0,0 +1,161 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (c) 2021 MediaTek Inc.
@@ -205,6 +205,11 @@
 +		tick-timer = &timer0;
 +	};
 +
++	memory at 40000000 {
++		device_type = "memory";
++		reg = <0x40000000 0x20000000>;
++	};
++
 +	keys {
 +		compatible = "gpio-keys";
 +		factory {
diff --git a/package/boot/uboot-mediatek/patches/432-add-tplink-xdr608x.patch b/package/boot/uboot-mediatek/patches/432-add-tplink-xdr608x.patch
index b1c25ba791..365f280947 100644
--- a/package/boot/uboot-mediatek/patches/432-add-tplink-xdr608x.patch
+++ b/package/boot/uboot-mediatek/patches/432-add-tplink-xdr608x.patch
@@ -555,7 +555,7 @@
 +CONFIG_SERVERIP="192.168.1.254"
 --- /dev/null
 +++ b/arch/arm/dts/mt7986a-tplink-tl-xdr608x.dts
-@@ -0,0 +1,191 @@
+@@ -0,0 +1,196 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (c) 2021 MediaTek Inc.
@@ -578,6 +578,11 @@
 +		tick-timer = &timer0;
 +	};
 +
++	memory at 40000000 {
++		device_type = "memory";
++		reg = <0x40000000 0x20000000>;
++	};
++
 +	keys {
 +		compatible = "gpio-keys";
 +
diff --git a/package/boot/uboot-mediatek/patches/433-add-qihoo_360t7.patch b/package/boot/uboot-mediatek/patches/433-add-qihoo_360t7.patch
index aaaeaa4f8a..4f98c95893 100644
--- a/package/boot/uboot-mediatek/patches/433-add-qihoo_360t7.patch
+++ b/package/boot/uboot-mediatek/patches/433-add-qihoo_360t7.patch
@@ -178,7 +178,7 @@
 +CONFIG_SERVERIP="192.168.1.254"
 --- /dev/null
 +++ b/arch/arm/dts/mt7981_qihoo-360t7.dts
-@@ -0,0 +1,180 @@
+@@ -0,0 +1,185 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (c) 2022 MediaTek Inc.
@@ -201,6 +201,11 @@
 +		tick-timer = &timer0;
 +	};
 +
++	memory at 40000000 {
++		device_type = "memory";
++		reg = <0x40000000 0x10000000>;
++	};
++
 +	keys {
 +		compatible = "gpio-keys";
 +
diff --git a/package/boot/uboot-mediatek/patches/434-add-xiaomi_mi-router-wr30u.patch b/package/boot/uboot-mediatek/patches/434-add-xiaomi_mi-router-wr30u.patch
index 6be64e5421..2bd1afe7a8 100644
--- a/package/boot/uboot-mediatek/patches/434-add-xiaomi_mi-router-wr30u.patch
+++ b/package/boot/uboot-mediatek/patches/434-add-xiaomi_mi-router-wr30u.patch
@@ -178,7 +178,7 @@
 +CONFIG_SERVERIP="192.168.1.254"
 --- /dev/null
 +++ b/arch/arm/dts/mt7981_xiaomi_mi-router-wr30u.dts
-@@ -0,0 +1,216 @@
+@@ -0,0 +1,221 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (c) 2022 MediaTek Inc.
@@ -206,6 +206,11 @@
 +		system_led = "yellow:system";
 +	};
 +
++	memory at 40000000 {
++		device_type = "memory";
++		reg = <0x40000000 0x10000000>;
++	};
++
 +	gpio-keys {
 +		compatible = "gpio-keys";
 +
diff --git a/package/boot/uboot-mediatek/patches/435-add-h3c_magic-nx30-pro.patch b/package/boot/uboot-mediatek/patches/435-add-h3c_magic-nx30-pro.patch
index 57181c73c0..d5a149b903 100644
--- a/package/boot/uboot-mediatek/patches/435-add-h3c_magic-nx30-pro.patch
+++ b/package/boot/uboot-mediatek/patches/435-add-h3c_magic-nx30-pro.patch
@@ -178,7 +178,7 @@
 +CONFIG_SERVERIP="192.168.1.254"
 --- /dev/null
 +++ b/arch/arm/dts/mt7981_h3c_magic-nx30-pro.dts
-@@ -0,0 +1,200 @@
+@@ -0,0 +1,205 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (c) 2022 MediaTek Inc.
@@ -201,6 +201,11 @@
 +		tick-timer = &timer0;
 +	};
 +
++	memory at 40000000 {
++		device_type = "memory";
++		reg = <0x40000000 0x10000000>;
++	};
++
 +	keys {
 +		compatible = "gpio-keys";
 +




More information about the lede-commits mailing list