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@nbd.name>
This commit is contained in:
Felix Fietkau 2022-10-29 23:03:08 +02:00
parent b8bf27e4cb
commit 4f1e54801e
4 changed files with 92 additions and 91 deletions

View file

@ -1,15 +1,14 @@
/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */ /* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */
/dts-v1/; #include "mt7986a-rfb.dtsi"
/plugin/;
/ { / {
compatible = "mediatek,mt7986a-spim-snand-rfb"; compatible = "mediatek,mt7986a-rfb-snand";
};
fragment@0 { &spi0 {
target-path = "/soc/spi@1100a000";
__overlay__ {
status = "okay"; status = "okay";
spi_nand: spi_nand@0 { spi_nand: spi_nand@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
@ -47,5 +46,7 @@
}; };
}; };
}; };
};
&wmac {
mediatek,mtd-eeprom = <&factory 0>;
}; };

View file

@ -1,15 +1,14 @@
/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */ /* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */
/dts-v1/; #include "mt7986a-rfb.dtsi"
/plugin/;
/ { / {
compatible = "mediatek,mt7986a-snor-rfb"; compatible = "mediatek,mt7986a-rfb-snor";
};
fragment@0 { &spi0 {
target-path = "/soc/spi@1100a000";
__overlay__ {
status = "okay"; status = "okay";
spi_nor: spi_nor@0 { spi_nor: spi_nor@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
@ -46,5 +45,7 @@
}; };
}; };
}; };
};
&wmac {
mediatek,mtd-eeprom = <&factory 0>;
}; };

View file

@ -84,14 +84,13 @@ define Device/bananapi_bpi-r3
endef endef
TARGET_DEVICES += bananapi_bpi-r3 TARGET_DEVICES += bananapi_bpi-r3
define Device/mediatek_mt7986a-rfb define Device/mediatek_mt7986a-rfb-nand
DEVICE_VENDOR := MediaTek DEVICE_VENDOR := MediaTek
DEVICE_MODEL := MTK7986 rfba AP DEVICE_MODEL := MT7986 rfba AP (NAND)
DEVICE_DTS := mt7986a-rfb DEVICE_DTS := mt7986a-rfb-spim-nand
DEVICE_DTS_DIR := $(DTS_DIR)/ DEVICE_DTS_DIR := $(DTS_DIR)/
KERNEL_LOADADDR := 0x48000000 KERNEL_LOADADDR := 0x48000000
DEVICE_DTS_OVERLAY := mt7986a-rfb-spim-nand mt7986a-rfb-spim-nor SUPPORTED_DEVICES := mediatek,mt7986a-rfb-snand
SUPPORTED_DEVICES := mediatek,mt7986a-rfb
UBINIZE_OPTS := -E 5 UBINIZE_OPTS := -E 5
BLOCKSIZE := 128k BLOCKSIZE := 128k
PAGESIZE := 2048 PAGESIZE := 2048
@ -101,12 +100,12 @@ define Device/mediatek_mt7986a-rfb
IMAGE/factory.bin := append-ubi | check-size $$$$(IMAGE_SIZE) IMAGE/factory.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
KERNEL = kernel-bin | lzma | \ KERNEL = kernel-bin | lzma | \
fit lzma $$(KDIR)/$$(firstword $$(DEVICE_DTS)).dtb fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
KERNEL_INITRAMFS = kernel-bin | lzma | \ 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 DTC_FLAGS += -@ --space 32768
endef endef
TARGET_DEVICES += mediatek_mt7986a-rfb TARGET_DEVICES += mediatek_mt7986a-rfb-nand
define Device/mediatek_mt7986b-rfb define Device/mediatek_mt7986b-rfb
DEVICE_VENDOR := MediaTek DEVICE_VENDOR := MediaTek