From: Jeff Kletsky <git-commits@allycomm.com>
Date: Fri, 15 Nov 2019 16:51:43 +0000 (-0800)
Subject: ath79: fix firmware partition attributes for GL-AR300M16 and -Lite
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f84d6d2f3a84d8694cad8d069f1a6d355f497e0d;p=oweals%2Fopenwrt.git

ath79: fix firmware partition attributes for GL-AR300M16 and -Lite

During the introduction of the ath79/nand images for the GL-AR300M
series the firmware partition label and compatible were altered,
but the necessary adjustments have not been made for the
GL-AR300M16 and the GL-AR300M-Lite. This will result in a
non-bootable partition setup for these devices.

This patch adds the necessary definitions to those two devices.

Fixes: 55e6c903ae20 ("ath79: GL-AR300M: provide NAND support;
       increase to 4 MB kernel")
Fixes: b591cabd3989 ("ath79: add GL.iNet GL-AR300M16 as NOR-only
       board")

Signed-off-by: Jeff Kletsky <git-commits@allycomm.com>
[extend commit message, alter commit title]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---

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";
+};