[OpenWrt-Devel] [PATCH] ath79: fix merge/rebase omission for GL-AR300M16 and GL-AR300M-Lite

[Jeff Kletsky]

From: Jeff Kletsky <git-commits at allycomm.com>

Introduction of the ath79/nand images for the GL-AR300M series
resulted in a non-bootable set of partition names for the
ath79/generic kernels for the GL-AR300M16 and GL-AR300M-Lite.

Signed-off-by: Jeff Kletsky <git-commits at allycomm.com>
---
 target/linux/ath79/dts/qca9531_glinet_gl-ar300m-lite.dts | 5 +++++
 target/linux/ath79/dts/qca9531_glinet_gl-ar300m16.dts    | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-lite.dts b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-lite.dts
index ed00cdb585..0eeda5c3c9 100644
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-lite.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-lite.dts
@@ -11,6 +11,11 @@
 
 /delete-node/ &nand_flash;
 
+&nor_firmware {
+	compatible = "denx,uimage";
+	label = "firmware";
+};
+
 // "Disable" unpopulated GMAC1
 
 &eth1 {
diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m16.dts b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m16.dts
index ad491286ec..328b667f7b 100644
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m16.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m16.dts
@@ -10,3 +10,8 @@
 };
 
 /delete-node/ &nand_flash;
+
+&nor_firmware {
+	compatible = "denx,uimage";
+	label = "firmware";
+};
-- 
2.20.1


_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel