From 472dbaba811cb91e7006f620a32d47b88c1976c0 Mon Sep 17 00:00:00 2001 From: Luis Araneda Date: Fri, 5 Jul 2019 22:26:00 -0400 Subject: [PATCH] sunxi: convert to multi-variable device title Use data from the linux-sunxi community wiki to fill-in missing device information Signed-off-by: Luis Araneda --- target/linux/sunxi/image/cortex-a53.mk | 18 +++++--- target/linux/sunxi/image/cortex-a7.mk | 64 +++++++++++++++++--------- target/linux/sunxi/image/cortex-a8.mk | 18 +++++--- 3 files changed, 67 insertions(+), 33 deletions(-) diff --git a/target/linux/sunxi/image/cortex-a53.mk b/target/linux/sunxi/image/cortex-a53.mk index 65551407ced..7a67160c33c 100644 --- a/target/linux/sunxi/image/cortex-a53.mk +++ b/target/linux/sunxi/image/cortex-a53.mk @@ -8,7 +8,8 @@ ifeq ($(SUBTARGET),cortexa53) define Device/sun50i-h5-nanopi-neo-plus2 - DEVICE_TITLE:=Nanopi NEO Plus2 (H5) + DEVICE_VENDOR := FriendlyARM + DEVICE_MODEL := NanoPi NEO Plus2 SUPPORTED_DEVICES:=nanopi-neo-plus2 SUNXI_DTS:=allwinner/sun50i-h5-nanopi-neo-plus2 KERNEL_NAME := Image @@ -18,7 +19,8 @@ endef TARGET_DEVICES += sun50i-h5-nanopi-neo-plus2 define Device/sun50i-h5-nanopi-neo2 - DEVICE_TITLE:=Nanopi NEO2 (H5) + DEVICE_VENDOR := FriendlyARM + DEVICE_MODEL := NanoPi NEO2 SUPPORTED_DEVICES:=nanopi-neo2 SUNXI_DTS:=allwinner/sun50i-h5-nanopi-neo2 KERNEL_NAME := Image @@ -28,7 +30,8 @@ endef TARGET_DEVICES += sun50i-h5-nanopi-neo2 define Device/sun50i-a64-pine64-plus - DEVICE_TITLE:=Pine64 Plus A64 + DEVICE_VENDOR := Pine64 + DEVICE_MODEL := Pine64+ SUPPORTED_DEVICES:=pine64,pine64-plus SUNXI_DTS:=allwinner/sun50i-a64-pine64-plus KERNEL_NAME := Image @@ -38,7 +41,8 @@ endef TARGET_DEVICES += sun50i-a64-pine64-plus define Device/sun50i-a64-sopine-baseboard - DEVICE_TITLE:=Pine64 Sopine + DEVICE_VENDOR := Pine64 + DEVICE_MODEL := SoPine SUPPORTED_DEVICES:=pine64,sopine-baseboard SUNXI_DTS:=allwinner/sun50i-a64-sopine-baseboard KERNEL_NAME := Image @@ -49,7 +53,8 @@ TARGET_DEVICES += sun50i-a64-sopine-baseboard define Device/sun50i-h5-orangepi-zero-plus - DEVICE_TITLE:=Xunlong Orange Pi 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 @@ -59,7 +64,8 @@ endef TARGET_DEVICES += sun50i-h5-orangepi-zero-plus define Device/sun50i-h5-orangepi-pc2 - DEVICE_TITLE:=Xunlong Orange Pi 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 diff --git a/target/linux/sunxi/image/cortex-a7.mk b/target/linux/sunxi/image/cortex-a7.mk index ce0cbe5a5c3..05c4328d8e4 100644 --- a/target/linux/sunxi/image/cortex-a7.mk +++ b/target/linux/sunxi/image/cortex-a7.mk @@ -9,7 +9,8 @@ ifeq ($(SUBTARGET),cortexa7) define Device/sun7i-a20-olinuxino-lime - DEVICE_TITLE:=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 @@ -19,7 +20,8 @@ TARGET_DEVICES += sun7i-a20-olinuxino-lime define Device/sun7i-a20-olinuxino-lime2 - DEVICE_TITLE:=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 @@ -29,7 +31,9 @@ TARGET_DEVICES += sun7i-a20-olinuxino-lime2 define Device/sun7i-a20-olinuxino-lime2-emmc - DEVICE_TITLE:=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 @@ -39,7 +43,8 @@ TARGET_DEVICES += sun7i-a20-olinuxino-lime2-emmc define Device/sun7i-a20-olinuxino-micro - DEVICE_TITLE:=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 @@ -49,7 +54,8 @@ TARGET_DEVICES += sun7i-a20-olinuxino-micro define Device/sun7i-a20-bananapi - DEVICE_TITLE:=LeMaker Banana Pi + 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 @@ -59,7 +65,8 @@ TARGET_DEVICES += sun7i-a20-bananapi define Device/sun7i-a20-bananapro - DEVICE_TITLE:=LeMaker Banana Pro + 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 @@ -69,7 +76,8 @@ TARGET_DEVICES += sun7i-a20-bananapro define Device/sun7i-a20-cubieboard2 - DEVICE_TITLE:=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 @@ -79,7 +87,8 @@ TARGET_DEVICES += sun7i-a20-cubieboard2 define Device/sun7i-a20-cubietruck - DEVICE_TITLE:=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 @@ -89,7 +98,8 @@ TARGET_DEVICES += sun7i-a20-cubietruck define Device/sun7i-a20-lamobo-r1 - DEVICE_TITLE:=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 @@ -99,7 +109,8 @@ TARGET_DEVICES += sun7i-a20-lamobo-r1 define Device/sun6i-a31-m9 - DEVICE_TITLE:=Mele M9 top set box + 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 @@ -109,7 +120,8 @@ TARGET_DEVICES += sun6i-a31-m9 define Device/sun8i-h2-plus-orangepi-zero - DEVICE_TITLE:=Xunlong Orange Pi 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 @@ -119,7 +131,8 @@ TARGET_DEVICES += sun8i-h2-plus-orangepi-zero define Device/sun8i-h2-plus-orangepi-r1 - DEVICE_TITLE:=Xunlong Orange Pi 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 @@ -128,7 +141,8 @@ endef TARGET_DEVICES += sun8i-h2-plus-orangepi-r1 define Device/sun8i-h3-bananapi-m2-plus - DEVICE_TITLE:=Sinovoip Banana Pi 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 @@ -139,7 +153,8 @@ endef TARGET_DEVICES += sun8i-h3-bananapi-m2-plus define Device/sun8i-h3-nanopi-m1-plus - DEVICE_TITLE:=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 @@ -151,7 +166,8 @@ TARGET_DEVICES += sun8i-h3-nanopi-m1-plus define Device/sun8i-h3-nanopi-neo - DEVICE_TITLE:=FriendlyARM NanoPi NEO + DEVICE_VENDOR := FriendlyARM + DEVICE_MODEL := NanoPi NEO SUPPORTED_DEVICES:=friendlyarm,nanopi-neo SUNXI_DTS:=sun8i-h3-nanopi-neo endef @@ -160,7 +176,8 @@ TARGET_DEVICES += sun8i-h3-nanopi-neo define Device/sun8i-h3-orangepi-one - DEVICE_TITLE:=Xunlong Orange Pi 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 @@ -170,7 +187,8 @@ TARGET_DEVICES += sun8i-h3-orangepi-one define Device/sun8i-h3-orangepi-pc - DEVICE_TITLE:=Xunlong Orange Pi 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 @@ -180,7 +198,8 @@ TARGET_DEVICES += sun8i-h3-orangepi-pc define Device/sun8i-h3-orangepi-pc-plus - DEVICE_TITLE:=Xunlong Orange Pi 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 @@ -190,7 +209,8 @@ TARGET_DEVICES += sun8i-h3-orangepi-pc-plus define Device/sun8i-h3-orangepi-plus - DEVICE_TITLE:=Xunlong Orange Pi 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 @@ -199,7 +219,8 @@ endef TARGET_DEVICES += sun8i-h3-orangepi-plus define Device/sun8i-h3-orangepi-2 - DEVICE_TITLE:=Xunlong Orange Pi 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 @@ -209,7 +230,8 @@ TARGET_DEVICES += sun8i-h3-orangepi-2 define Device/sun7i-a20-pcduino3 - DEVICE_TITLE:=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 diff --git a/target/linux/sunxi/image/cortex-a8.mk b/target/linux/sunxi/image/cortex-a8.mk index 564a66f9386..4eeaab99d19 100644 --- a/target/linux/sunxi/image/cortex-a8.mk +++ b/target/linux/sunxi/image/cortex-a8.mk @@ -8,7 +8,8 @@ ifeq ($(SUBTARGET),cortexa8) define Device/sun4i-a10-olinuxino-lime - DEVICE_TITLE:=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 @@ -18,7 +19,8 @@ TARGET_DEVICES += sun4i-a10-olinuxino-lime define Device/sun5i-a13-olimex-som - DEVICE_TITLE:=Olimex A13 SOM + DEVICE_VENDOR := Olimex + DEVICE_MODEL := A13-SOM DEVICE_PACKAGES:=kmod-rtl8192cu SUPPORTED_DEVICES:=olimex,a13-olinuxino SUNXI_DTS:=sun5i-a13-olinuxino @@ -28,7 +30,8 @@ TARGET_DEVICES += sun5i-a13-olimex-som define Device/sun5i-a13-olinuxino - DEVICE_TITLE:=Olimex A13-Olinuxino + DEVICE_VENDOR := Olimex + DEVICE_MODEL := A13-OLinuXino DEVICE_PACKAGES:=kmod-rtl8192cu SUPPORTED_DEVICES:=olimex,a13-olinuxino SUNXI_DTS:=sun5i-a13-olinuxino @@ -38,7 +41,8 @@ TARGET_DEVICES += sun5i-a13-olinuxino define Device/sun4i-a10-cubieboard - DEVICE_TITLE:=Cubietech 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 @@ -48,7 +52,8 @@ TARGET_DEVICES += sun4i-a10-cubieboard define Device/sun4i-a10-pcduino - DEVICE_TITLE:=LinkSprite 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 @@ -58,7 +63,8 @@ TARGET_DEVICES += sun4i-a10-pcduino define Device/sun4i-a10-marsboard - DEVICE_TITLE:=HAOYU Electronics Marsboard A10 + 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 -- 2.30.2