From e2f284dbd1841a78bc35d2ae87aec4e4fd9769d9 Mon Sep 17 00:00:00 2001 From: Moritz Warning <moritzwarning@web.de> Date: Tue, 4 May 2021 21:15:13 +0200 Subject: [PATCH] x86: use device vendor/model variable Remove use of DEVICE_TITLE in favor of the DEVICE_VENDOR and DEVICE_MODEL as used by all other targets. Signed-off-by: Moritz Warning <moritzwarning@web.de> --- target/linux/x86/image/64.mk | 3 ++- target/linux/x86/image/generic.mk | 3 ++- target/linux/x86/image/geode.mk | 6 ++++-- target/linux/x86/image/legacy.mk | 3 ++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/target/linux/x86/image/64.mk b/target/linux/x86/image/64.mk index d5033f932a5..f54858d0b74 100644 --- a/target/linux/x86/image/64.mk +++ b/target/linux/x86/image/64.mk @@ -1,5 +1,6 @@ define Device/generic - DEVICE_TITLE := Generic x86/64 + DEVICE_VENDOR := Generic + DEVICE_MODEL := x86/64 DEVICE_PACKAGES += kmod-amazon-ena kmod-bnx2 kmod-e1000e kmod-e1000 \ kmod-forcedeth kmod-igb kmod-ixgbe kmod-amd-xgbe kmod-r8169 kmod-fs-vfat GRUB2_VARIANT := generic diff --git a/target/linux/x86/image/generic.mk b/target/linux/x86/image/generic.mk index 81cccd30b07..e9545fbf319 100644 --- a/target/linux/x86/image/generic.mk +++ b/target/linux/x86/image/generic.mk @@ -1,5 +1,6 @@ define Device/generic - DEVICE_TITLE := Generic x86 + DEVICE_VENDOR := Generic + DEVICE_MODEL := x86 DEVICE_PACKAGES += kmod-3c59x kmod-8139too kmod-e100 kmod-e1000 kmod-natsemi \ kmod-ne2k-pci kmod-pcnet32 kmod-r8169 kmod-sis900 kmod-tg3 \ kmod-via-rhine kmod-via-velocity kmod-forcedeth kmod-fs-vfat diff --git a/target/linux/x86/image/geode.mk b/target/linux/x86/image/geode.mk index 2ed2245f7de..6cea887926d 100644 --- a/target/linux/x86/image/geode.mk +++ b/target/linux/x86/image/geode.mk @@ -1,5 +1,6 @@ define Device/generic - DEVICE_TITLE := Generic x86/Geode + DEVICE_VENDOR := Generic + DEVICE_MODEL := x86/Geode DEVICE_PACKAGES += kmod-crypto-cbc kmod-crypto-hw-geode kmod-ledtrig-gpio GRUB2_VARIANT := legacy endef @@ -7,7 +8,8 @@ TARGET_DEVICES += generic define Device/geos $(call Device/generic) - DEVICE_TITLE := Traverse Technologies Geos + DEVICE_VENDOR := Traverse Technologies + DEVICE_MODEL := Geos DEVICE_PACKAGES += br2684ctl flashrom kmod-hwmon-lm90 kmod-mppe kmod-pppoa \ kmod-usb-ohci-pci linux-atm ppp-mod-pppoa pppdump pppstats soloscli tc endef diff --git a/target/linux/x86/image/legacy.mk b/target/linux/x86/image/legacy.mk index 5c13f95157d..6c0d8e78f9a 100644 --- a/target/linux/x86/image/legacy.mk +++ b/target/linux/x86/image/legacy.mk @@ -1,5 +1,6 @@ define Device/generic - DEVICE_TITLE := Generic x86/legacy + DEVICE_VENDOR := Generic + DEVICE_MODEL := x86/legacy DEVICE_PACKAGES += kmod-3c59x kmod-8139too kmod-e100 kmod-e1000 \ kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-r8169 kmod-sis900 \ kmod-tg3 kmod-via-rhine kmod-via-velocity kmod-forcedeth -- GitLab