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

mediatek: more clean solution for out-of-tree DTS

Browse source 
Use approach suggested by Adrian Schmutzler instead of introducing
another device variable.
Also revert the unnecessary white-space changes accidentally introduced
by the previous commit.

Fixed: c067b1e79b ("mediatek: move out-of-tree DTS files to dedicated dts folder")
Suggested-by: Adrian Schmutzler <mail@adrianschmutzler.de>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2021-02-19 01:13:26 +00:00
parent c067b1e79b
commit e3b8849088
No known key found for this signature in database
GPG key ID: 5A8F39C31C3217CA
4 changed files with 80 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/image.mk
View file

@ -31,7 +31,7 @@ mkfs_target_dir = $(if $(call param_get,pkg,$(1)),$(KDIR)/target-dir-$(call para
KDIR=$(KERNEL_BUILD_DIR) KDIR=$(KERNEL_BUILD_DIR)
KDIR_TMP=$(KDIR)/tmp KDIR_TMP=$(KDIR)/tmp
DTS_DIR:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts$$(if $$(DTS_VENDOR),/$$(DTS_VENDOR)) DTS_DIR:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts
IMG_PREFIX_EXTRA:=$(if $(EXTRA_IMAGE_NAME),$(call sanitize,$(EXTRA_IMAGE_NAME))-) IMG_PREFIX_EXTRA:=$(if $(EXTRA_IMAGE_NAME),$(call sanitize,$(EXTRA_IMAGE_NAME))-)
IMG_PREFIX_VERNUM:=$(if $(CONFIG_VERSION_FILENAMES),$(call sanitize,$(VERSION_NUMBER))-) IMG_PREFIX_VERNUM:=$(if $(CONFIG_VERSION_FILENAMES),$(call sanitize,$(VERSION_NUMBER))-)
@ -416,7 +416,7 @@ DEFAULT_DEVICE_VARS := \
DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_INITRAMFS_IMAGE KERNEL_SIZE \ DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_INITRAMFS_IMAGE KERNEL_SIZE \
CMDLINE UBOOTENV_IN_UBI KERNEL_IN_UBI BLOCKSIZE PAGESIZE SUBPAGESIZE \ CMDLINE UBOOTENV_IN_UBI KERNEL_IN_UBI BLOCKSIZE PAGESIZE SUBPAGESIZE \
VID_HDR_OFFSET UBINIZE_OPTS UBINIZE_PARTS MKUBIFS_OPTS DEVICE_DTS \ VID_HDR_OFFSET UBINIZE_OPTS UBINIZE_PARTS MKUBIFS_OPTS DEVICE_DTS \
DEVICE_DTS_CONFIG DEVICE_DTS_DIR DEVICE_FDT_NUM DTS_VENDOR SOC BOARD_NAME \ DEVICE_DTS_CONFIG DEVICE_DTS_DIR DEVICE_FDT_NUM SOC BOARD_NAME \
UIMAGE_MAGIC UIMAGE_NAME \ UIMAGE_MAGIC UIMAGE_NAME \
SUPPORTED_DEVICES IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR \ SUPPORTED_DEVICES IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR \
UBOOT_PATH IMAGE_SIZE \ UBOOT_PATH IMAGE_SIZE \

2
target/linux/mediatek/dts/mt7622-bananapi-bpi-r64-rootdisk.dts
View file

@ -59,13 +59,11 @@
green { green {
label = "bpi-r64:pio:green"; label = "bpi-r64:pio:green";
gpios = <&pio 89 GPIO_ACTIVE_HIGH>; gpios = <&pio 89 GPIO_ACTIVE_HIGH>;
default-state = "off";
}; };
red { red {
label = "bpi-r64:pio:red"; label = "bpi-r64:pio:red";
gpios = <&pio 88 GPIO_ACTIVE_HIGH>; gpios = <&pio 88 GPIO_ACTIVE_HIGH>;
default-state = "off";
}; };
}; };

4
target/linux/mediatek/dts/mt7622-elecom-wrc-2533gent.dts
View file

@ -459,6 +459,7 @@
pause; pause;
}; };
}; };
gmac1: mac@1 { gmac1: mac@1 {
compatible = "mediatek,eth-mac"; compatible = "mediatek,eth-mac";
reg = <1>; reg = <1>;
@ -469,6 +470,7 @@
pause; pause;
}; };
}; };
mdio: mdio-bus { mdio: mdio-bus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
@ -512,8 +514,6 @@
spi-max-frequency = <104000000>; spi-max-frequency = <104000000>;
reg = <0>; reg = <0>;
mediatek,bmt-v2;
partitions { partitions {
compatible = "fixed-partitions"; compatible = "fixed-partitions";
#address-cells = <1>; #address-cells = <1>;

2
target/linux/mediatek/image/mt7622.mk
View file

@ -1,4 +1,4 @@
DTS_VENDOR := mediatek DTS_DIR := $(DTS_DIR)/mediatek
KERNEL_LOADADDR := 0x44080000 KERNEL_LOADADDR := 0x44080000
define Device/bpi_bananapi-r64 define Device/bpi_bananapi-r64