aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--target/linux/ath79/dts/qca9563_glinet_gl-ar750s-nor-nand.dts17
-rw-r--r--target/linux/ath79/dts/qca9563_glinet_gl-ar750s-nor.dts12
-rw-r--r--target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi15
-rw-r--r--target/linux/ath79/image/nand.mk12
4 files changed, 23 insertions, 33 deletions
diff --git a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s-nor-nand.dts b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s-nor-nand.dts
index 92d1fb9ba2..3fe8a35b98 100644
--- a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s-nor-nand.dts
+++ b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s-nor-nand.dts
@@ -9,8 +9,21 @@
model = "GL.iNet GL-AR750S (NOR/NAND)";
};
-&nor_kernel {
- label = "kernel";
+&nor_partitions {
+ partition@60000 {
+ label = "kernel";
+ reg = <0x060000 0x400000>;
+
+ /*
+ * U-Boot bootcmd is "bootm 0x9f060000".
+ * So this might be possible to resize in the future.
+ */
+ };
+
+ partition@460000 {
+ label = "nor_reserved";
+ reg = <0x460000 0xba0000>;
+ };
};
&nand_ubi {
diff --git a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s-nor.dts b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s-nor.dts
index bb33abd630..271cef516e 100644
--- a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s-nor.dts
+++ b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s-nor.dts
@@ -9,10 +9,10 @@
model = "GL.iNet GL-AR750S (NOR)";
};
-/delete-node/ &nor_kernel;
-/delete-node/ &nor_reserved;
-
-&nor_firmware {
- compatible = "denx,uimage";
- label = "firmware";
+&nor_partitions {
+ partition@60000 {
+ compatible = "denx,uimage";
+ label = "firmware";
+ reg = <0x060000 0xfa0000>;
+ };
};
diff --git a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi
index 6111b968a2..f5c64c07eb 100644
--- a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi
+++ b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi
@@ -99,20 +99,7 @@
read-only;
};
- nor_firmware: partition@60000 {
- label = "nor_firmware";
- reg = <0x060000 0xfa0000>;
- };
-
- nor_kernel: partition_alt@60000 {
- label = "nor_kernel";
- reg = <0x060000 0x400000>;
- };
-
- nor_reserved: parition_alt@460000 {
- label = "nor_reserved";
- reg = <0x460000 0xba0000>;
- };
+ /* Firmware / Kernel flash type specific */
};
};
diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk
index f7fc71d65e..420c62a5db 100644
--- a/target/linux/ath79/image/nand.mk
+++ b/target/linux/ath79/image/nand.mk
@@ -117,24 +117,15 @@ define Device/glinet_gl-ar750s-common
DEVICE_MODEL := GL-AR750S
DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct kmod-usb2 \
kmod-usb-storage block-mount
- KERNEL_SIZE := 2048k
IMAGE_SIZE := 16000k
- PAGESIZE := 2048
- VID_HDR_OFFSET := 2048
endef
-# NB: The kernel size is intentionally restricted at this time; see commit message
define Device/glinet_gl-ar750s-nor-nand
$(Device/glinet_gl-ar750s-common)
DEVICE_VARIANT := NOR/NAND
- BLOCKSIZE := 128k
- GL_UBOOT_UBI_OFFSET := 2048k
- IMAGES += factory.img
- IMAGE/factory.img := append-kernel | pad-to $$$$(GL_UBOOT_UBI_OFFSET) | \
- append-ubi | check-kernel-size $$$$(GL_UBOOT_UBI_OFFSET)
+ KERNEL_SIZE := 4096k
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
SUPPORTED_DEVICES += glinet,gl-ar750s-nor
- DEFAULT := n
endef
TARGET_DEVICES += glinet_gl-ar750s-nor-nand
@@ -143,7 +134,6 @@ define Device/glinet_gl-ar750s-nor
DEVICE_VARIANT := NOR
BLOCKSIZE := 64k
SUPPORTED_DEVICES += gl-ar750s glinet,gl-ar750s glinet,gl-ar750s-nor-nand
- DEFAULT := n
endef
TARGET_DEVICES += glinet_gl-ar750s-nor