aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-01-14 15:38:51 +0100
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-01-26 22:11:48 +0100
commit49d66e0468c14d8a05bd6c33056708d2051437cb (patch)
tree22a677bca7f12a43af7debb9ebb1bc3aba868d9c /target/linux
parent9e0aab44b656be530b7b92ac03588ffc4d4cd1fa (diff)
downloadupstream-49d66e0468c14d8a05bd6c33056708d2051437cb.tar.gz
upstream-49d66e0468c14d8a05bd6c33056708d2051437cb.tar.bz2
upstream-49d66e0468c14d8a05bd6c33056708d2051437cb.zip
mediatek: use consistent naming scheme for device nodes
This harmonizes the device node names (and thus the image names, too) between subtargets of the mediatek target. So far, each subtarget has somewhat used its own naming scheme. Now, we use the vendor_device syntax there, too. Since DTS names have different patterns and the target only contains a few devices, this does not replace DEVICE_DTS by a calculated default value (like for other targets). SUPPORTED_DEVICES is adjusted based on the node rename where necessary, though it looks like for several older devices it was not set up correctly so far. While at it, this also changes the DTS name for u7623-02-emmc-512m to all-lower-case. Cc: John Crispin <john@phrozen.org> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/mediatek/image/mt7622.mk14
-rw-r--r--target/linux/mediatek/image/mt7623.mk14
-rw-r--r--target/linux/mediatek/image/mt7629.mk1
-rw-r--r--target/linux/mediatek/patches-4.14/0227-arm-dts-Add-Unielec-U7623-DTS.patch8
-rw-r--r--target/linux/mediatek/patches-4.19/0227-arm-dts-Add-Unielec-U7623-DTS.patch8
5 files changed, 22 insertions, 23 deletions
diff --git a/target/linux/mediatek/image/mt7622.mk b/target/linux/mediatek/image/mt7622.mk
index b84a3a6b50..9a5aedc88d 100644
--- a/target/linux/mediatek/image/mt7622.mk
+++ b/target/linux/mediatek/image/mt7622.mk
@@ -1,4 +1,4 @@
-define Device/MTK-RFB1
+define Device/mediatek_mt7622-rfb1
DEVICE_VENDOR := MediaTek
DEVICE_MODEL := MTK7622 rfb1 AP
DEVICE_DTS := mt7622-rfb1
@@ -6,24 +6,26 @@ define Device/MTK-RFB1
DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb3 \
kmod-ata-core kmod-ata-ahci-mtk
endef
-TARGET_DEVICES += MTK-RFB1
+TARGET_DEVICES += mediatek_mt7622-rfb1
-define Device/MTK-LYNX-RFB1
+define Device/mediatek_mt7622-lynx-rfb1
DEVICE_VENDOR := MediaTek
DEVICE_MODEL := MTK7622 Lynx rfb1 AP
DEVICE_DTS := mt7622-lynx-rfb1
DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
+ SUPPORTED_DEVICES := mediatek,mt7622-rfb1
DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb3 \
kmod-ata-core kmod-ata-ahci-mtk
endef
-TARGET_DEVICES += MTK-LYNX-RFB1
+TARGET_DEVICES += mediatek_mt7622-lynx-rfb1
-define Device/BPI-R64
+define Device/lemaker_bananapi-bpi-r64
DEVICE_VENDOR := LeMaker
DEVICE_MODEL := Banana Pi R64
DEVICE_DTS := mt7622-bananapi-bpi-r64
DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
+ SUPPORTED_DEVICES := bananapi,bpi-r64
DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb3 \
kmod-ata-core kmod-ata-ahci-mtk
endef
-TARGET_DEVICES += BPI-R64
+TARGET_DEVICES += lemaker_bananapi-bpi-r64
diff --git a/target/linux/mediatek/image/mt7623.mk b/target/linux/mediatek/image/mt7623.mk
index 3f72979849..fd609d22fa 100644
--- a/target/linux/mediatek/image/mt7623.mk
+++ b/target/linux/mediatek/image/mt7623.mk
@@ -1,20 +1,18 @@
-define Device/7623a-unielec-u7623-02-emmc-512m
+define Device/unielec_u7623-02-emmc-512m
DEVICE_VENDOR := UniElec
DEVICE_MODEL := U7623-02
DEVICE_VARIANT := eMMC/512MB RAM
- DEVICE_DTS := mt7623a-unielec-u7623-02-emmc-512M
+ DEVICE_DTS := mt7623a-unielec-u7623-02-emmc-512m
DEVICE_PACKAGES := mkf2fs e2fsprogs kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 kmod-mmc
- SUPPORTED_DEVICES := unielec,u7623-02-emmc-512m
IMAGES := sysupgrade-emmc.bin.gz
IMAGE/sysupgrade-emmc.bin.gz := sysupgrade-emmc | gzip | append-metadata
endef
+TARGET_DEVICES += unielec_u7623-02-emmc-512m
-TARGET_DEVICES += 7623a-unielec-u7623-02-emmc-512m
-
-define Device/7623n-bananapi-bpi-r2
+define Device/lemaker_bananapi-bpi-r2
DEVICE_VENDOR := LeMaker
DEVICE_MODEL := Banana Pi R2
DEVICE_DTS := mt7623n-bananapi-bpi-r2
+ SUPPORTED_DEVICES := bananapi,bpi-r2
endef
-
-TARGET_DEVICES += 7623n-bananapi-bpi-r2
+TARGET_DEVICES += lemaker_bananapi-bpi-r2
diff --git a/target/linux/mediatek/image/mt7629.mk b/target/linux/mediatek/image/mt7629.mk
index ba1daefa03..71fb3dda09 100644
--- a/target/linux/mediatek/image/mt7629.mk
+++ b/target/linux/mediatek/image/mt7629.mk
@@ -5,4 +5,3 @@ define Device/mediatek_mt7629-lynx-rfb
DEVICE_PACKAGES := swconfig
endef
TARGET_DEVICES += mediatek_mt7629-lynx-rfb
-
diff --git a/target/linux/mediatek/patches-4.14/0227-arm-dts-Add-Unielec-U7623-DTS.patch b/target/linux/mediatek/patches-4.14/0227-arm-dts-Add-Unielec-U7623-DTS.patch
index 996b309e8f..46fc9abab9 100644
--- a/target/linux/mediatek/patches-4.14/0227-arm-dts-Add-Unielec-U7623-DTS.patch
+++ b/target/linux/mediatek/patches-4.14/0227-arm-dts-Add-Unielec-U7623-DTS.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] arm: dts: Add Unielec U7623 DTS
---
arch/arm/boot/dts/Makefile | 1 +
- .../dts/mt7623a-unielec-u7623-02-emmc-512M.dts | 18 +
+ .../dts/mt7623a-unielec-u7623-02-emmc-512m.dts | 18 +
.../boot/dts/mt7623a-unielec-u7623-02-emmc.dtsi | 366 +++++++++++++++++++++
3 files changed, 385 insertions(+)
- create mode 100644 arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512M.dts
+ create mode 100644 arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512m.dts
create mode 100644 arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc.dtsi
--- a/arch/arm/boot/dts/Makefile
@@ -17,12 +17,12 @@ Subject: [PATCH] arm: dts: Add Unielec U7623 DTS
mt6589-aquaris5.dtb \
mt6592-evb.dtb \
mt7623a-rfb-emmc.dtb \
-+ mt7623a-unielec-u7623-02-emmc-512M.dtb \
++ mt7623a-unielec-u7623-02-emmc-512m.dtb \
mt7623n-rfb-nand.dtb \
mt7623n-bananapi-bpi-r2.dtb \
mt8127-moose.dtb \
--- /dev/null
-+++ b/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512M.dts
++++ b/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512m.dts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2018 Kristian Evensen <kristian.evensen@gmail.com>
diff --git a/target/linux/mediatek/patches-4.19/0227-arm-dts-Add-Unielec-U7623-DTS.patch b/target/linux/mediatek/patches-4.19/0227-arm-dts-Add-Unielec-U7623-DTS.patch
index 6561e8d5a7..7b92141c5f 100644
--- a/target/linux/mediatek/patches-4.19/0227-arm-dts-Add-Unielec-U7623-DTS.patch
+++ b/target/linux/mediatek/patches-4.19/0227-arm-dts-Add-Unielec-U7623-DTS.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] arm: dts: Add Unielec U7623 DTS
---
arch/arm/boot/dts/Makefile | 1 +
- .../dts/mt7623a-unielec-u7623-02-emmc-512M.dts | 18 +
+ .../dts/mt7623a-unielec-u7623-02-emmc-512m.dts | 18 +
.../boot/dts/mt7623a-unielec-u7623-02-emmc.dtsi | 366 +++++++++++++++++++++
3 files changed, 385 insertions(+)
- create mode 100644 arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512M.dts
+ create mode 100644 arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512m.dts
create mode 100644 arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc.dtsi
--- a/arch/arm/boot/dts/Makefile
@@ -17,12 +17,12 @@ Subject: [PATCH] arm: dts: Add Unielec U7623 DTS
mt7623a-rfb-nand.dtb \
mt7623n-rfb-emmc.dtb \
mt7623n-bananapi-bpi-r2.dtb \
-+ mt7623a-unielec-u7623-02-emmc-512M.dtb \
++ mt7623a-unielec-u7623-02-emmc-512m.dtb \
mt8127-moose.dtb \
mt8135-evbp1.dtb
dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb
--- /dev/null
-+++ b/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512M.dts
++++ b/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512m.dts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2018 Kristian Evensen <kristian.evensen@gmail.com>