Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mediatek: drop the use of device tree overlays on mt7986a-rfb board

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

85
target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nand.dts
View file

@ -1,51 +1,52 @@
/* 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"; status = "okay";
__overlay__ {
status = "okay";
spi_nand: spi_nand@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 { spi_nand: spi_nand@0 {
compatible = "fixed-partitions"; #address-cells = <1>;
#address-cells = <1>; #size-cells = <1>;
#size-cells = <1>; compatible = "spi-nand";
partition@0 { reg = <1>;
label = "BL2"; spi-max-frequency = <10000000>;
reg = <0x00000 0x0100000>; spi-tx-buswidth = <4>;
read-only; spi-rx-buswidth = <4>;
};
partition@100000 { partitions {
label = "u-boot-env"; compatible = "fixed-partitions";
reg = <0x0100000 0x0080000>; #address-cells = <1>;
}; #size-cells = <1>;
factory: partition@180000 { partition@0 {
label = "Factory"; label = "BL2";
reg = <0x180000 0x0200000>; reg = <0x00000 0x0100000>;
}; read-only;
partition@380000 { };
label = "FIP"; partition@100000 {
reg = <0x380000 0x0200000>; label = "u-boot-env";
}; reg = <0x0100000 0x0080000>;
partition@580000 { };
label = "ubi"; factory: partition@180000 {
reg = <0x580000 0x4000000>; label = "Factory";
}; reg = <0x180000 0x0200000>;
}; };
partition@380000 {
label = "FIP";
reg = <0x380000 0x0200000>;
};
partition@580000 {
label = "ubi";
reg = <0x580000 0x4000000>;
}; };
}; };
}; };
};
&wmac {
mediatek,mtd-eeprom = <&factory 0>;
}; };

83
target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nor.dts
View file

@ -1,50 +1,51 @@
/* 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"; status = "okay";
__overlay__ {
status = "okay";
spi_nor: spi_nor@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@00000 { spi_nor: spi_nor@0 {
label = "BL2"; #address-cells = <1>;
reg = <0x00000 0x0040000>; #size-cells = <1>;
}; compatible = "jedec,spi-nor";
partition@40000 { reg = <0>;
label = "u-boot-env"; spi-max-frequency = <52000000>;
reg = <0x40000 0x0010000>; spi-tx-buswidth = <4>;
}; spi-rx-buswidth = <4>;
factory: partition@50000 { partitions {
label = "Factory"; compatible = "fixed-partitions";
reg = <0x50000 0x00B0000>; #address-cells = <1>;
}; #size-cells = <1>;
partition@100000 {
label = "FIP"; partition@00000 {
reg = <0x100000 0x0080000>; label = "BL2";
}; reg = <0x00000 0x0040000>;
partition@180000 { };
label = "firmware"; partition@40000 {
reg = <0x180000 0xE00000>; label = "u-boot-env";
}; reg = <0x40000 0x0010000>;
}; };
factory: partition@50000 {
label = "Factory";
reg = <0x50000 0x00B0000>;
};
partition@100000 {
label = "FIP";
reg = <0x100000 0x0080000>;
};
partition@180000 {
label = "firmware";
reg = <0x180000 0xE00000>;
}; };
}; };
}; };
};
&wmac {
mediatek,mtd-eeprom = <&factory 0>;
}; };

0
target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts → target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi
View file

15
target/linux/mediatek/image/filogic.mk
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