[openwrt/openwrt] mediatek: drop the use of device tree overlays on mt7986a-rfb board
LEDE Commits
lede-commits at lists.infradead.org
Wed Nov 9 11:45:19 PST 2022
nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/4f1e54801ef9d43c6202f007f0ce8fcbee2ed369
commit 4f1e54801ef9d43c6202f007f0ce8fcbee2ed369
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Sat Oct 29 23:03:08 2022 +0200
mediatek: drop the use of device tree overlays on mt7986a-rfb board
The boot loader does not support it. Instead make NAND the default image for
this board
Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
.../boot/dts/mediatek/mt7986a-rfb-spim-nand.dts | 85 +++++++++++-----------
.../boot/dts/mediatek/mt7986a-rfb-spim-nor.dts | 83 ++++++++++-----------
.../mediatek/{mt7986a-rfb.dts => mt7986a-rfb.dtsi} | 0
target/linux/mediatek/image/filogic.mk | 15 ++--
4 files changed, 92 insertions(+), 91 deletions(-)
diff --git a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nand.dts b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nand.dts
index 72b8923b41..938dd181b9 100644
--- a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nand.dts
+++ b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nand.dts
@@ -1,51 +1,52 @@
/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */
-/dts-v1/;
-/plugin/;
+#include "mt7986a-rfb.dtsi"
/ {
- compatible = "mediatek,mt7986a-spim-snand-rfb";
+ compatible = "mediatek,mt7986a-rfb-snand";
+};
+
+&spi0 {
+ status = "okay";
- fragment at 0 {
- target-path = "/soc/spi at 1100a000";
- __overlay__ {
- status = "okay";
- spi_nand: spi_nand at 0 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "spi-nand";
- reg = <1>;
- spi-max-frequency = <10000000>;
- spi-tx-buswidth = <4>;
- spi-rx-buswidth = <4>;
+ spi_nand: spi_nand at 0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "spi-nand";
+ reg = <1>;
+ spi-max-frequency = <10000000>;
+ spi-tx-buswidth = <4>;
+ spi-rx-buswidth = <4>;
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
- partition at 0 {
- label = "BL2";
- reg = <0x00000 0x0100000>;
- read-only;
- };
- partition at 100000 {
- label = "u-boot-env";
- reg = <0x0100000 0x0080000>;
- };
- factory: partition at 180000 {
- label = "Factory";
- reg = <0x180000 0x0200000>;
- };
- partition at 380000 {
- label = "FIP";
- reg = <0x380000 0x0200000>;
- };
- partition at 580000 {
- label = "ubi";
- reg = <0x580000 0x4000000>;
- };
- };
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+ partition at 0 {
+ label = "BL2";
+ reg = <0x00000 0x0100000>;
+ read-only;
+ };
+ partition at 100000 {
+ label = "u-boot-env";
+ reg = <0x0100000 0x0080000>;
+ };
+ factory: partition at 180000 {
+ label = "Factory";
+ reg = <0x180000 0x0200000>;
+ };
+ partition at 380000 {
+ label = "FIP";
+ reg = <0x380000 0x0200000>;
+ };
+ partition at 580000 {
+ label = "ubi";
+ reg = <0x580000 0x4000000>;
};
};
- };
+ };
+};
+
+&wmac {
+ mediatek,mtd-eeprom = <&factory 0>;
};
diff --git a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nor.dts b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nor.dts
index b847e48455..8d94069dcf 100644
--- a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nor.dts
+++ b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nor.dts
@@ -1,50 +1,51 @@
/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */
-/dts-v1/;
-/plugin/;
+#include "mt7986a-rfb.dtsi"
/ {
- compatible = "mediatek,mt7986a-snor-rfb";
+ compatible = "mediatek,mt7986a-rfb-snor";
+};
+
+&spi0 {
+ status = "okay";
- fragment at 0 {
- target-path = "/soc/spi at 1100a000";
- __overlay__ {
- status = "okay";
- spi_nor: spi_nor at 0 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "jedec,spi-nor";
- reg = <0>;
- spi-max-frequency = <52000000>;
- spi-tx-buswidth = <4>;
- spi-rx-buswidth = <4>;
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
+ spi_nor: spi_nor at 0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "jedec,spi-nor";
+ reg = <0>;
+ spi-max-frequency = <52000000>;
+ spi-tx-buswidth = <4>;
+ spi-rx-buswidth = <4>;
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
- partition at 00000 {
- label = "BL2";
- reg = <0x00000 0x0040000>;
- };
- partition at 40000 {
- label = "u-boot-env";
- reg = <0x40000 0x0010000>;
- };
- factory: partition at 50000 {
- label = "Factory";
- reg = <0x50000 0x00B0000>;
- };
- partition at 100000 {
- label = "FIP";
- reg = <0x100000 0x0080000>;
- };
- partition at 180000 {
- label = "firmware";
- reg = <0x180000 0xE00000>;
- };
- };
+ partition at 00000 {
+ label = "BL2";
+ reg = <0x00000 0x0040000>;
+ };
+ partition at 40000 {
+ label = "u-boot-env";
+ reg = <0x40000 0x0010000>;
+ };
+ factory: partition at 50000 {
+ label = "Factory";
+ reg = <0x50000 0x00B0000>;
+ };
+ partition at 100000 {
+ label = "FIP";
+ reg = <0x100000 0x0080000>;
+ };
+ partition at 180000 {
+ label = "firmware";
+ reg = <0x180000 0xE00000>;
};
};
- };
+ };
+};
+
+&wmac {
+ mediatek,mtd-eeprom = <&factory 0>;
};
diff --git a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi
similarity index 100%
rename from target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts
rename to target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi
diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk
index f7fc9e30d1..1ece1465c2 100644
--- a/target/linux/mediatek/image/filogic.mk
+++ b/target/linux/mediatek/image/filogic.mk
@@ -84,14 +84,13 @@ define Device/bananapi_bpi-r3
endef
TARGET_DEVICES += bananapi_bpi-r3
-define Device/mediatek_mt7986a-rfb
+define Device/mediatek_mt7986a-rfb-nand
DEVICE_VENDOR := MediaTek
- DEVICE_MODEL := MTK7986 rfba AP
- DEVICE_DTS := mt7986a-rfb
+ DEVICE_MODEL := MT7986 rfba AP (NAND)
+ DEVICE_DTS := mt7986a-rfb-spim-nand
DEVICE_DTS_DIR := $(DTS_DIR)/
KERNEL_LOADADDR := 0x48000000
- DEVICE_DTS_OVERLAY := mt7986a-rfb-spim-nand mt7986a-rfb-spim-nor
- SUPPORTED_DEVICES := mediatek,mt7986a-rfb
+ SUPPORTED_DEVICES := mediatek,mt7986a-rfb-snand
UBINIZE_OPTS := -E 5
BLOCKSIZE := 128k
PAGESIZE := 2048
@@ -101,12 +100,12 @@ define Device/mediatek_mt7986a-rfb
IMAGE/factory.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
KERNEL = kernel-bin | lzma | \
- fit lzma $$(KDIR)/$$(firstword $$(DEVICE_DTS)).dtb
+ fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
KERNEL_INITRAMFS = kernel-bin | lzma | \
- fit lzma $$(KDIR)/$$(firstword $$(DEVICE_DTS)).dtb with-initrd
+ fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd
DTC_FLAGS += -@ --space 32768
endef
-TARGET_DEVICES += mediatek_mt7986a-rfb
+TARGET_DEVICES += mediatek_mt7986a-rfb-nand
define Device/mediatek_mt7986b-rfb
DEVICE_VENDOR := MediaTek
More information about the lede-commits
mailing list