domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sunxi: use vendor_device scheme for device definitions

Browse Source 
This changes device definition to resemble the vendor_device scheme
already present for the majority of device compatible strings.

By doing this, we achieve several advantages at once:
- Image names and node names are more consistent with other targets.
- SUPPORTED_DEVICES can be set automatically for all but two cases.
- Image names and node names are in line with DEVICE_TITLEs.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler
2019-12-06 00:11:56 +01:00
parent c642a97aa6
commit a4cdb537b1
5 changed files with 103 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
target/linux/sunxi/image/Makefile
View File

@@ -37,6 +37,7 @@ define Device/Default
KERNEL := kernel-bin | uImage none
IMAGES := sdcard.img.gz
IMAGE/sdcard.img.gz := sunxi-sdcard | append-metadata | gzip
SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
endef
include cortex-a7.mk

28
target/linux/sunxi/image/cortex-a53.mk
View File

@@ -7,7 +7,7 @@
#
ifeq ($(SUBTARGET),cortexa53)
define Device/sun50i-h5-nanopi-neo-plus2
define Device/friendlyarm_nanopi-neo-plus2
DEVICE_VENDOR := FriendlyARM
DEVICE_MODEL := NanoPi NEO Plus2
SUPPORTED_DEVICES:=nanopi-neo-plus2
@@ -16,9 +16,9 @@ define Device/sun50i-h5-nanopi-neo-plus2
KERNEL := kernel-bin
endef
TARGET_DEVICES += sun50i-h5-nanopi-neo-plus2
TARGET_DEVICES += friendlyarm_nanopi-neo-plus2
define Device/sun50i-h5-nanopi-neo2
define Device/friendlyarm_nanopi-neo2
DEVICE_VENDOR := FriendlyARM
DEVICE_MODEL := NanoPi NEO2
SUPPORTED_DEVICES:=nanopi-neo2
@@ -27,51 +27,47 @@ define Device/sun50i-h5-nanopi-neo2
KERNEL := kernel-bin
endef
TARGET_DEVICES += sun50i-h5-nanopi-neo2
TARGET_DEVICES += friendlyarm_nanopi-neo2
define Device/sun50i-a64-pine64-plus
define Device/pine64_pine64-plus
DEVICE_VENDOR := Pine64
DEVICE_MODEL := Pine64+
SUPPORTED_DEVICES:=pine64,pine64-plus
SUNXI_DTS:=allwinner/sun50i-a64-pine64-plus
KERNEL_NAME := Image
KERNEL := kernel-bin
endef
TARGET_DEVICES += sun50i-a64-pine64-plus
TARGET_DEVICES += pine64_pine64-plus
define Device/sun50i-a64-sopine-baseboard
define Device/pine64_sopine-baseboard
DEVICE_VENDOR := Pine64
DEVICE_MODEL := SoPine
SUPPORTED_DEVICES:=pine64,sopine-baseboard
SUNXI_DTS:=allwinner/sun50i-a64-sopine-baseboard
KERNEL_NAME := Image
KERNEL := kernel-bin
endef
TARGET_DEVICES += sun50i-a64-sopine-baseboard
TARGET_DEVICES += pine64_sopine-baseboard
define Device/sun50i-h5-orangepi-zero-plus
define Device/xunlong_orangepi-zero-plus
DEVICE_VENDOR := Xunlong
DEVICE_MODEL := Orange Pi Zero Plus
SUPPORTED_DEVICES:=xunlong,orangepi-zero-plus
SUNXI_DTS:=allwinner/sun50i-h5-orangepi-zero-plus
KERNEL_NAME := Image
KERNEL := kernel-bin
endef
TARGET_DEVICES += sun50i-h5-orangepi-zero-plus
TARGET_DEVICES += xunlong_orangepi-zero-plus
define Device/sun50i-h5-orangepi-pc2
define Device/xunlong_orangepi-pc2
DEVICE_VENDOR := Xunlong
DEVICE_MODEL := Orange Pi PC 2
SUPPORTED_DEVICES:=xunlong,orangepi-pc2
SUNXI_DTS:=allwinner/sun50i-h5-orangepi-pc2
KERNEL_NAME := Image
KERNEL := kernel-bin
endef
TARGET_DEVICES += sun50i-h5-orangepi-pc2
TARGET_DEVICES += xunlong_orangepi-pc2
endif

110
target/linux/sunxi/image/cortex-a7.mk
View File

@@ -8,245 +8,223 @@
ifeq ($(SUBTARGET),cortexa7)
define Device/sun7i-a20-olinuxino-lime
define Device/olimex_a20-olinuxino-lime
DEVICE_VENDOR := Olimex
DEVICE_MODEL := A20-OLinuXino-LIME
DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-rtc-sunxi
SUPPORTED_DEVICES:=olimex,a20-olinuxino-lime
SUNXI_DTS:=sun7i-a20-olinuxino-lime
endef
TARGET_DEVICES += sun7i-a20-olinuxino-lime
TARGET_DEVICES += olimex_a20-olinuxino-lime
define Device/sun7i-a20-olinuxino-lime2
define Device/olimex_a20-olinuxino-lime2
DEVICE_VENDOR := Olimex
DEVICE_MODEL := A20-OLinuXino-LIME2
DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-rtc-sunxi kmod-usb-hid
SUPPORTED_DEVICES:=olimex,a20-olinuxino-lime2
SUNXI_DTS:=sun7i-a20-olinuxino-lime2
endef
TARGET_DEVICES += sun7i-a20-olinuxino-lime2
TARGET_DEVICES += olimex_a20-olinuxino-lime2
define Device/sun7i-a20-olinuxino-lime2-emmc
define Device/olimex_a20-olinuxino-lime2-emmc
DEVICE_VENDOR := Olimex
DEVICE_MODEL := A20-OLinuXino-LIME2
DEVICE_VARIANT := eMMC
DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-rtc-sunxi kmod-usb-hid
SUPPORTED_DEVICES:=olimex,a20-olinuxino-lime2-emmc
SUNXI_DTS:=sun7i-a20-olinuxino-lime2-emmc
endef
TARGET_DEVICES += sun7i-a20-olinuxino-lime2-emmc
TARGET_DEVICES += olimex_a20-olinuxino-lime2-emmc
define Device/sun7i-a20-olinuxino-micro
define Device/olimex_a20-olinuxino-micro
DEVICE_VENDOR := Olimex
DEVICE_MODEL := A20-OLinuXino-MICRO
DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi
SUPPORTED_DEVICES:=olimex,a20-olinuxino-micro
SUNXI_DTS:=sun7i-a20-olinuxino-micro
endef
TARGET_DEVICES += sun7i-a20-olinuxino-micro
TARGET_DEVICES += olimex_a20-olinuxino-micro
define Device/sun7i-a20-bananapi
define Device/lemaker_bananapi
DEVICE_VENDOR := LeMaker
DEVICE_MODEL := Banana Pi
DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi
SUPPORTED_DEVICES:=lemaker,bananapi
SUNXI_DTS:=sun7i-a20-bananapi
endef
TARGET_DEVICES += sun7i-a20-bananapi
TARGET_DEVICES += lemaker_bananapi
define Device/sun7i-a20-bananapro
define Device/lemaker_bananapro
DEVICE_VENDOR := LeMaker
DEVICE_MODEL := Banana Pro
DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi kmod-brcmfmac
SUPPORTED_DEVICES:=lemaker,bananapro
SUNXI_DTS:=sun7i-a20-bananapro
endef
TARGET_DEVICES += sun7i-a20-bananapro
TARGET_DEVICES += lemaker_bananapro
define Device/sun7i-a20-cubieboard2
define Device/cubietech_cubieboard2
DEVICE_VENDOR := Cubietech
DEVICE_MODEL := Cubieboard2
DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi
SUPPORTED_DEVICES:=cubietech,cubieboard2
SUNXI_DTS:=sun7i-a20-cubieboard2
endef
TARGET_DEVICES += sun7i-a20-cubieboard2
TARGET_DEVICES += cubietech_cubieboard2
define Device/sun7i-a20-cubietruck
define Device/cubietech_cubietruck
DEVICE_VENDOR := Cubietech
DEVICE_MODEL := Cubietruck
DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-rtc-sunxi kmod-brcmfmac
SUPPORTED_DEVICES:=cubietech,cubietruck
SUNXI_DTS:=sun7i-a20-cubietruck
endef
TARGET_DEVICES += sun7i-a20-cubietruck
TARGET_DEVICES += cubietech_cubietruck
define Device/sun7i-a20-lamobo-r1
define Device/lamobo_lamobo-r1
DEVICE_VENDOR := Lamobo
DEVICE_MODEL := Lamobo R1
DEVICE_PACKAGES:=kmod-ata-sunxi kmod-rtl8192cu swconfig wpad-basic
SUPPORTED_DEVICES:=lamobo,lamobo-r1
SUNXI_DTS:=sun7i-a20-lamobo-r1
endef
TARGET_DEVICES += sun7i-a20-lamobo-r1
TARGET_DEVICES += lamobo_lamobo-r1
define Device/sun6i-a31-m9
define Device/mele_m9
DEVICE_VENDOR := Mele
DEVICE_MODEL := M9
DEVICE_PACKAGES:=kmod-sun4i-emac kmod-rtc-sunxi kmod-rtl8192cu
SUPPORTED_DEVICES:=mele,m9
SUNXI_DTS:=sun6i-a31-m9
endef
TARGET_DEVICES += sun6i-a31-m9
TARGET_DEVICES += mele_m9
define Device/sun8i-h2-plus-orangepi-zero
define Device/xunlong_orangepi-zero
DEVICE_VENDOR := Xunlong
DEVICE_MODEL := Orange Pi Zero
DEVICE_PACKAGES:=kmod-rtc-sunxi
SUPPORTED_DEVICES:=xunlong,orangepi-zero
SUNXI_DTS:=sun8i-h2-plus-orangepi-zero
endef
TARGET_DEVICES += sun8i-h2-plus-orangepi-zero
TARGET_DEVICES += xunlong_orangepi-zero
define Device/sun8i-h2-plus-orangepi-r1
define Device/xunlong_orangepi-r1
DEVICE_VENDOR := Xunlong
DEVICE_MODEL := Orange Pi R1
DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-usb-net kmod-usb-net-rtl8152
SUPPORTED_DEVICES:=xunlong,orangepi-r1
SUNXI_DTS:=sun8i-h2-plus-orangepi-r1
endef
TARGET_DEVICES += sun8i-h2-plus-orangepi-r1
TARGET_DEVICES += xunlong_orangepi-r1
define Device/sun8i-h3-bananapi-m2-plus
define Device/sinovoip_bananapi-m2-plus
DEVICE_VENDOR := Sinovoip
DEVICE_MODEL := Banana Pi M2+
DEVICE_PACKAGES:=kmod-rtc-sunxi \
kmod-leds-gpio kmod-ledtrig-heartbeat \
kmod-brcmfmac brcmfmac-firmware-43430a0-sdio wpad-basic
SUPPORTED_DEVICES:=sinovoip,bananapi-m2-plus
SUNXI_DTS:=sun8i-h3-bananapi-m2-plus
endef
TARGET_DEVICES += sun8i-h3-bananapi-m2-plus
TARGET_DEVICES += sinovoip_bananapi-m2-plus
define Device/sun8i-h3-nanopi-m1-plus
define Device/friendlyarm_nanopi-m1-plus
DEVICE_VENDOR := FriendlyARM
DEVICE_MODEL := NanoPi M1 Plus
DEVICE_PACKAGES:=kmod-rtc-sunxi \
kmod-leds-gpio kmod-ledtrig-heartbeat \
kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic
SUPPORTED_DEVICES:=friendlyarm,nanopi-m1-plus
SUNXI_DTS:=sun8i-h3-nanopi-m1-plus
endef
TARGET_DEVICES += sun8i-h3-nanopi-m1-plus
TARGET_DEVICES += friendlyarm_nanopi-m1-plus
define Device/sun8i-h3-nanopi-neo
define Device/friendlyarm_nanopi-neo
DEVICE_VENDOR := FriendlyARM
DEVICE_MODEL := NanoPi NEO
SUPPORTED_DEVICES:=friendlyarm,nanopi-neo
SUNXI_DTS:=sun8i-h3-nanopi-neo
endef
TARGET_DEVICES += sun8i-h3-nanopi-neo
TARGET_DEVICES += friendlyarm_nanopi-neo
define Device/sun8i-h3-orangepi-one
define Device/xunlong_orangepi-one
DEVICE_VENDOR := Xunlong
DEVICE_MODEL := Orange Pi One
DEVICE_PACKAGES:=kmod-rtc-sunxi
SUPPORTED_DEVICES:=xunlong,orangepi-one
SUNXI_DTS:=sun8i-h3-orangepi-one
endef
TARGET_DEVICES += sun8i-h3-orangepi-one
TARGET_DEVICES += xunlong_orangepi-one
define Device/sun8i-h3-orangepi-pc
define Device/xunlong_orangepi-pc
DEVICE_VENDOR := Xunlong
DEVICE_MODEL := Orange Pi PC
DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-gpio-button-hotplug
SUPPORTED_DEVICES:=xunlong,orangepi-pc
SUNXI_DTS:=sun8i-h3-orangepi-pc
endef
TARGET_DEVICES += sun8i-h3-orangepi-pc
TARGET_DEVICES += xunlong_orangepi-pc
define Device/sun8i-h3-orangepi-pc-plus
define Device/xunlong_orangepi-pc-plus
DEVICE_VENDOR := Xunlong
DEVICE_MODEL := Orange Pi PC Plus
DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-gpio-button-hotplug
SUPPORTED_DEVICES:=xunlong,orangepi-pc-plus
SUNXI_DTS:=sun8i-h3-orangepi-pc-plus
endef
TARGET_DEVICES += sun8i-h3-orangepi-pc-plus
TARGET_DEVICES += xunlong_orangepi-pc-plus
define Device/sun8i-h3-orangepi-plus
define Device/xunlong_orangepi-plus
DEVICE_VENDOR := Xunlong
DEVICE_MODEL := Orange Pi Plus
DEVICE_PACKAGES:=kmod-rtc-sunxi
SUPPORTED_DEVICES:=xunlong,orangepi-plus
SUNXI_DTS:=sun8i-h3-orangepi-plus
endef
TARGET_DEVICES += sun8i-h3-orangepi-plus
TARGET_DEVICES += xunlong_orangepi-plus
define Device/sun8i-h3-orangepi-2
define Device/xunlong_orangepi-2
DEVICE_VENDOR := Xunlong
DEVICE_MODEL := Orange Pi 2
DEVICE_PACKAGES:=kmod-rtc-sunxi
SUPPORTED_DEVICES:=xunlong,orangepi-2
SUNXI_DTS:=sun8i-h3-orangepi-2
endef
TARGET_DEVICES += sun8i-h3-orangepi-2
TARGET_DEVICES += xunlong_orangepi-2
define Device/sun7i-a20-pcduino3
define Device/linksprite_pcduino3
DEVICE_VENDOR := LinkSprite
DEVICE_MODEL := pcDuino3
DEVICE_PACKAGES:=kmod-sun4i-emac kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi kmod-rtl8xxxu rtl8188eu-firmware
SUPPORTED_DEVICES:=linksprite,pcduino3
SUNXI_DTS:=sun7i-a20-pcduino3
endef
TARGET_DEVICES += sun7i-a20-pcduino3
TARGET_DEVICES += linksprite_pcduino3
define Device/sun8i-r40-bananapi-m2-ultra
define Device/lemaker_bananapi-m2-ultra
DEVICE_VENDOR := LeMaker
DEVICE_MODEL := Banana Pi M2 Ultra
DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi
SUPPORTED_DEVICES:=lemaker,bananapi-m2-ultra
SUNXI_DTS:=sun8i-r40-bananapi-m2-ultra
endef
TARGET_DEVICES += sun8i-r40-bananapi-m2-ultra
TARGET_DEVICES += lemaker_bananapi-m2-ultra
endif

29
target/linux/sunxi/image/cortex-a8.mk
View File

@@ -7,18 +7,17 @@
#
ifeq ($(SUBTARGET),cortexa8)
define Device/sun4i-a10-olinuxino-lime
define Device/olimex_a10-olinuxino-lime
DEVICE_VENDOR := Olimex
DEVICE_MODEL := A10-OLinuXino-LIME
DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi
SUPPORTED_DEVICES:=olimex,a10-olinuxino-lime
SUNXI_DTS:=sun4i-a10-olinuxino-lime
endef
TARGET_DEVICES += sun4i-a10-olinuxino-lime
TARGET_DEVICES += olimex_a10-olinuxino-lime
define Device/sun5i-a13-olimex-som
define Device/olimex_a13-olimex-som
DEVICE_VENDOR := Olimex
DEVICE_MODEL := A13-SOM
DEVICE_PACKAGES:=kmod-rtl8192cu
@@ -26,50 +25,46 @@ define Device/sun5i-a13-olimex-som
SUNXI_DTS:=sun5i-a13-olinuxino
endef
TARGET_DEVICES += sun5i-a13-olimex-som
TARGET_DEVICES += olimex_a13-olimex-som
define Device/sun5i-a13-olinuxino
define Device/olimex_a13-olinuxino
DEVICE_VENDOR := Olimex
DEVICE_MODEL := A13-OLinuXino
DEVICE_PACKAGES:=kmod-rtl8192cu
SUPPORTED_DEVICES:=olimex,a13-olinuxino
SUNXI_DTS:=sun5i-a13-olinuxino
endef
TARGET_DEVICES += sun5i-a13-olinuxino
TARGET_DEVICES += olimex_a13-olinuxino
define Device/sun4i-a10-cubieboard
define Device/cubietech_a10-cubieboard
DEVICE_VENDOR := Cubietech
DEVICE_MODEL := Cubieboard
DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi
SUPPORTED_DEVICES:=cubietech,a10-cubieboard
SUNXI_DTS:=sun4i-a10-cubieboard
endef
TARGET_DEVICES += sun4i-a10-cubieboard
TARGET_DEVICES += cubietech_a10-cubieboard
define Device/sun4i-a10-pcduino
define Device/linksprite_a10-pcduino
DEVICE_VENDOR := LinkSprite
DEVICE_MODEL := pcDuino
DEVICE_PACKAGES:=kmod-sun4i-emac kmod-rtc-sunxi kmod-rtl8192cu
SUPPORTED_DEVICES:=linksprite,a10-pcduino
SUNXI_DTS:=sun4i-a10-pcduino
endef
TARGET_DEVICES += sun4i-a10-pcduino
TARGET_DEVICES += linksprite_a10-pcduino
define Device/sun4i-a10-marsboard
define Device/marsboard_a10-marsboard
DEVICE_VENDOR := HAOYU Electronics
DEVICE_MODEL := MarsBoard A10
DEVICE_PACKAGES:=mod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi sound-soc-sunxi
SUPPORTED_DEVICES:=marsboard,a10-marsboard
SUNXI_DTS:=sun4i-a10-marsboard
endef
TARGET_DEVICES += sun4i-a10-marsboard
TARGET_DEVICES += marsboard_a10-marsboard
endif