From 88f8b63a3db241bdcaaaa7e5c8ae1169e6446902 Mon Sep 17 00:00:00 2001 From: Moritz Warning Date: Tue, 10 Sep 2019 00:13:30 +0200 Subject: [PATCH] mvebu: split up DEVICE_TITLE DEVICE_TITLE is split up into DEVICE_VENDOR, DEVICE_MODEL and DEVICE_VARIANT Signed-off-by: Moritz Warning --- target/linux/mvebu/image/cortex-a53.mk | 34 +++++++++--- target/linux/mvebu/image/cortex-a72.mk | 11 ++-- target/linux/mvebu/image/cortex-a9.mk | 72 +++++++++++++++++++------- 3 files changed, 90 insertions(+), 27 deletions(-) diff --git a/target/linux/mvebu/image/cortex-a53.mk b/target/linux/mvebu/image/cortex-a53.mk index e0b2b5e186..f5313429af 100644 --- a/target/linux/mvebu/image/cortex-a53.mk +++ b/target/linux/mvebu/image/cortex-a53.mk @@ -2,42 +2,64 @@ ifeq ($(SUBTARGET),cortexa53) define Device/globalscale_espressobin $(call Device/Default-arm64) - DEVICE_TITLE := ESPRESSObin (Marvell Armada 3700 Community Board) + DEVICE_VENDOR := Marvell + DEVICE_MODEL := ESPRESSObin + DEVICE_VARIANT := Non-eMMC + DEVICE_ALT0_VENDOR := Marvell + DEVICE_ALT0_MODEL := Armada 3700 Community Board + DEVICE_ALT0_VARIANT := Non-eMMC DEVICE_DTS := armada-3720-espressobin endef TARGET_DEVICES += globalscale_espressobin define Device/globalscale_espressobin-emmc $(call Device/Default-arm64) - DEVICE_TITLE := ESPRESSObin eMMC (Marvell Armada 3700 Community Board) + DEVICE_VENDOR := Marvell + DEVICE_MODEL := ESPRESSObin + DEVICE_VARIANT := eMMC + DEVICE_ALT0_VENDOR := Marvell + DEVICE_ALT0_MODEL := Armada 3700 Community Board + DEVICE_ALT0_VARIANT := eMMC DEVICE_DTS := armada-3720-espressobin-emmc endef TARGET_DEVICES += globalscale_espressobin-emmc define Device/globalscale_espressobin-v7 $(call Device/Default-arm64) - DEVICE_TITLE := ESPRESSObin V7 (Marvell Armada 3700 Community Board) + DEVICE_VENDOR := Marvell + DEVICE_MODEL := ESPRESSObin + DEVICE_VARIANT := V7 Non-eMMC + DEVICE_ALT0_VENDOR := Marvell + DEVICE_ALT0_MODEL := Armada 3700 Community Board + DEVICE_ALT0_VARIANT := V7 Non-eMMC DEVICE_DTS := armada-3720-espressobin-v7 endef TARGET_DEVICES += globalscale_espressobin-v7 define Device/globalscale_espressobin-v7-emmc $(call Device/Default-arm64) - DEVICE_TITLE := ESPRESSObin V7 eMMC (Marvell Armada 3700 Community Board) + DEVICE_VENDOR := Marvell + DEVICE_MODEL := ESPRESSObin + DEVICE_VARIANT := V7 eMMC + DEVICE_ALT0_VENDOR := Marvell + DEVICE_ALT0_MODEL := Armada 3700 Community Board + DEVICE_ALT0_VARIANT := V7 eMMC DEVICE_DTS := armada-3720-espressobin-v7-emmc endef TARGET_DEVICES += globalscale_espressobin-v7-emmc define Device/marvell_armada-3720-db $(call Device/Default-arm64) - DEVICE_TITLE := Marvell Armada 3720 Development Board DB-88F3720-DDR3 + DEVICE_VENDOR := Marvell + DEVICE_MODEL := Armada 3720 Development Board (DB-88F3720-DDR3) DEVICE_DTS := armada-3720-db endef TARGET_DEVICES += marvell_armada-3720-db define Device/methode_udpu $(call Device/Default-arm64) - DEVICE_TITLE := Methode micro-DPU (uDPU) + DEVICE_VENDOR := Methode + DEVICE_MODEL := micro-DPU (uDPU) DEVICE_DTS := armada-3720-uDPU KERNEL_LOADADDR := 0x00080000 KERNEL_INITRAMFS := kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb diff --git a/target/linux/mvebu/image/cortex-a72.mk b/target/linux/mvebu/image/cortex-a72.mk index 73dc67b60a..5e619804e8 100644 --- a/target/linux/mvebu/image/cortex-a72.mk +++ b/target/linux/mvebu/image/cortex-a72.mk @@ -2,7 +2,10 @@ ifeq ($(SUBTARGET),cortexa72) define Device/marvell_macchiatobin $(call Device/Default-arm64) - DEVICE_TITLE := MACCHIATObin (SolidRun Armada 8040 Community Board) + DEVICE_VENDOR := SolidRun + DEVICE_MODEL := MACCHIATObin + DEVICE_ALT0_VENDOR := SolidRun + DEVICE_ALT0_MODEL := Armada 8040 Community Board DEVICE_PACKAGES += kmod-i2c-core kmod-i2c-mux kmod-i2c-mux-pca954x DEVICE_DTS := armada-8040-mcbin SUPPORTED_DEVICES := marvell,armada8040-mcbin @@ -11,7 +14,8 @@ TARGET_DEVICES += marvell_macchiatobin define Device/marvell_armada8040-db $(call Device/Default-arm64) - DEVICE_TITLE := Marvell Armada 8040 DB board + DEVICE_VENDOR := Marvell + DEVICE_MODEL := Armada 8040 Development Board DEVICE_DTS := armada-8040-db IMAGE/sdcard.img.gz := boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata endef @@ -19,7 +23,8 @@ TARGET_DEVICES += marvell_armada8040-db define Device/marvell_armada7040-db $(call Device/Default-arm64) - DEVICE_TITLE := Marvell Armada 7040 DB board + DEVICE_VENDOR := Marvell + DEVICE_MODEL := Armada 7040 Development Board DEVICE_DTS := armada-7040-db IMAGE/sdcard.img.gz := boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata endef diff --git a/target/linux/mvebu/image/cortex-a9.mk b/target/linux/mvebu/image/cortex-a9.mk index 17d950d595..c2ada75c2d 100644 --- a/target/linux/mvebu/image/cortex-a9.mk +++ b/target/linux/mvebu/image/cortex-a9.mk @@ -10,14 +10,17 @@ ifeq ($(SUBTARGET),cortexa9) define Device/linksys $(Device/NAND-128K) - DEVICE_TITLE := Linksys $(1) + DEVICE_VENDOR := Linksys DEVICE_PACKAGES := kmod-mwlwifi swconfig wpad-basic IMAGES += factory.img KERNEL_SIZE := 6144k endef define Device/linksys_wrt1200ac - $(call Device/linksys,WRT1200AC (Caiman)) + $(call Device/linksys) + DEVICE_MODEL := WRT1200AC + DEVICE_ALT0_VENDOR := Linksys + DEVICE_ALT0_MODEL := Caiman DEVICE_DTS := armada-385-linksys-caiman DEVICE_PACKAGES += mwlwifi-firmware-88w8864 SUPPORTED_DEVICES := armada-385-linksys-caiman linksys,caiman @@ -25,7 +28,11 @@ endef TARGET_DEVICES += linksys_wrt1200ac define Device/linksys_wrt1900acv2 - $(call Device/linksys,WRT1900ACv2 (Cobra)) + $(call Device/linksys) + DEVICE_MODEL := WRT1900AC + DEVICE_VARIANT := v2 + DEVICE_ALT0_VENDOR := Linksys + DEVICE_ALT0_MODEL := Cobra DEVICE_DTS := armada-385-linksys-cobra DEVICE_PACKAGES += mwlwifi-firmware-88w8864 SUPPORTED_DEVICES := armada-385-linksys-cobra linksys,cobra @@ -33,7 +40,10 @@ endef TARGET_DEVICES += linksys_wrt1900acv2 define Device/linksys_wrt3200acm - $(call Device/linksys,WRT3200ACM (Rango)) + $(call Device/linksys) + DEVICE_MODEL := WRT3200ACM + DEVICE_ALT0_VENDOR := Linksys + DEVICE_ALT0_MODEL := Rango DEVICE_DTS := armada-385-linksys-rango DEVICE_PACKAGES += kmod-btmrvl kmod-mwifiex-sdio mwlwifi-firmware-88w8964 SUPPORTED_DEVICES := armada-385-linksys-rango linksys,rango @@ -41,7 +51,14 @@ endef TARGET_DEVICES += linksys_wrt3200acm define Device/linksys_wrt1900acs - $(call Device/linksys,WRT1900ACS (Shelby)) + $(call Device/linksys) + DEVICE_MODEL := WRT1900ACS + DEVICE_VARIANT := v1 + DEVICE_ALT0_VENDOR := Linksys + DEVICE_ALT0_MODEL := WRT1900ACS + DEVICE_ALT0_VARIANT := v2 + DEVICE_ALT1_VENDOR := Linksys + DEVICE_ALT1_MODEL := Shelby DEVICE_DTS := armada-385-linksys-shelby DEVICE_PACKAGES += mwlwifi-firmware-88w8864 SUPPORTED_DEVICES := armada-385-linksys-shelby linksys,shelby @@ -49,7 +66,10 @@ endef TARGET_DEVICES += linksys_wrt1900acs define Device/linksys_wrt32x - $(call Device/linksys,WRT32X (Venom)) + $(call Device/linksys) + DEVICE_MODEL := WRT32X + DEVICE_ALT0_VENDOR := Linksys + DEVICE_ALT0_MODEL := Venom DEVICE_DTS := armada-385-linksys-venom DEVICE_PACKAGES += kmod-btmrvl kmod-mwifiex-sdio mwlwifi-firmware-88w8964 KERNEL_SIZE := 3072k @@ -59,7 +79,11 @@ endef TARGET_DEVICES += linksys_wrt32x define Device/linksys_wrt1900ac - $(call Device/linksys,WRT1900AC (Mamba)) + $(call Device/linksys) + DEVICE_MODEL := WRT1900AC + DEVICE_VARIANT := v1 + DEVICE_ALT0_VENDOR := Linksys + DEVICE_ALT0_MODEL := Mamba DEVICE_DTS := armada-xp-linksys-mamba DEVICE_PACKAGES += mwlwifi-firmware-88w8864 KERNEL_SIZE := 3072k @@ -68,29 +92,33 @@ endef TARGET_DEVICES += linksys_wrt1900ac define Device/plathome_openblocks-ax3-4 + DEVICE_VENDOR := Plat'Home + DEVICE_MODEL := OpenBlocks AX3 + DEVICE_VARIANT := 4 ports DEVICE_DTS := armada-xp-openblocks-ax3-4 SUPPORTED_DEVICES += openblocks-ax3-4 BLOCKSIZE := 128k PAGESIZE := 1 IMAGES += factory.img IMAGE/factory.img := append-kernel | pad-to $$(BLOCKSIZE) | append-ubi - DEVICE_TITLE := Plat'Home OpenBlocks AX3 endef TARGET_DEVICES += plathome_openblocks-ax3-4 define Device/marvell_a385-db-ap $(Device/NAND-256K) + DEVICE_VENDOR := Marvell + DEVICE_MODEL := Armada 385 Development Board AP (DB-88F6820-AP) DEVICE_DTS := armada-385-db-ap IMAGES += factory.img KERNEL_SIZE := 8192k - DEVICE_TITLE := Marvell Armada 385 DB AP (DB-88F6820-AP) SUPPORTED_DEVICES += armada-385-db-ap endef TARGET_DEVICES += marvell_a385-db-ap define Device/marvell_a370-db $(Device/NAND-512K) - DEVICE_TITLE := Marvell Armada 370 DB (DB-88F6710-BP-DDR3) + DEVICE_VENDOR := Marvell + DEVICE_MODEL := Armada 370 Development Board (DB-88F6710-BP-DDR3) DEVICE_DTS := armada-370-db SUPPORTED_DEVICES += armada-370-db endef @@ -98,7 +126,8 @@ TARGET_DEVICES += marvell_a370-db define Device/marvell_a370-rd $(Device/NAND-512K) - DEVICE_TITLE := Marvell Armada 370 RD (RD-88F6710-A1) + DEVICE_VENDOR := Marvell + DEVICE_MODEL := Armada 370 RD (RD-88F6710-A1) DEVICE_DTS := armada-370-rd SUPPORTED_DEVICES += armada-370-rd endef @@ -106,7 +135,8 @@ TARGET_DEVICES += marvell_a370-rd define Device/marvell_axp-db $(Device/NAND-512K) - DEVICE_TITLE := Marvell Armada XP DB (DB-78460-BP) + DEVICE_VENDOR := Marvell + DEVICE_MODEL := Armada XP Development Board (DB-78460-BP) DEVICE_DTS := armada-xp-db SUPPORTED_DEVICES += armada-xp-db endef @@ -114,14 +144,16 @@ TARGET_DEVICES += marvell_axp-db define Device/marvell_axp-gp $(Device/NAND-512K) - DEVICE_TITLE := Marvell Armada XP GP (DB-MV784MP-GP) + DEVICE_VENDOR := Marvell + DEVICE_MODEL := Armada Armada XP GP (DB-MV784MP-GP) DEVICE_DTS := armada-xp-gp SUPPORTED_DEVICES += armada-xp-gp endef TARGET_DEVICES += marvell_axp-gp define Device/marvell_a388-rd - DEVICE_TITLE := Marvell Armada 388 RD (RD-88F6820-AP) + DEVICE_VENDOR := Marvell + DEVICE_MODEL := Armada 388 RD (RD-88F6820-AP) DEVICE_DTS := armada-388-rd IMAGES := firmware.bin IMAGE/firmware.bin := append-kernel | pad-to 256k | append-rootfs | pad-rootfs @@ -130,9 +162,10 @@ endef TARGET_DEVICES += marvell_a388-rd define Device/solidrun_clearfog-pro-a1 + DEVICE_VENDOR := SolidRun + DEVICE_MODEL := ClearFog Pro KERNEL_INSTALL := 1 KERNEL := kernel-bin - DEVICE_TITLE := SolidRun ClearFog Pro DEVICE_PACKAGES := mkf2fs e2fsprogs partx-utils swconfig IMAGES := sdcard.img.gz IMAGE/sdcard.img.gz := boot-scr | boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata @@ -144,9 +177,10 @@ endef TARGET_DEVICES += solidrun_clearfog-pro-a1 define Device/solidrun_clearfog-base-a1 + DEVICE_VENDOR := SolidRun + DEVICE_MODEL := ClearFog Base KERNEL_INSTALL := 1 KERNEL := kernel-bin - DEVICE_TITLE := SolidRun ClearFog Base DEVICE_PACKAGES := mkf2fs e2fsprogs partx-utils IMAGES := sdcard.img.gz IMAGE/sdcard.img.gz := boot-scr | boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata @@ -159,17 +193,19 @@ TARGET_DEVICES += solidrun_clearfog-base-a1 define Device/globalscale_mirabox $(Device/NAND-512K) + DEVICE_VENDOR := Globalscale + DEVICE_MODEL := Mirabox DEVICE_DTS := armada-370-mirabox SUPPORTED_DEVICES += mirabox - DEVICE_TITLE := Globalscale Mirabox endef TARGET_DEVICES += globalscale_mirabox define Device/cznic_turris-omnia + DEVICE_VENDOR := CZ.NIC + DEVICE_MODEL := Turris Omnia KERNEL_INSTALL := 1 KERNEL := kernel-bin KERNEL_INITRAMFS := kernel-bin - DEVICE_TITLE := Turris Omnia DEVICE_PACKAGES := \ mkf2fs e2fsprogs kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 \ wpad-basic kmod-ath9k kmod-ath10k-ct ath10k-firmware-qca988x-ct \ -- 2.30.2