From 5cfc0c8652f6d931af3c8c92b517cc313c6c5f36 Mon Sep 17 00:00:00 2001 From: Beginner <70857188+Beginner-Go@users.noreply.github.com> Date: Wed, 29 Sep 2021 21:12:52 +0800 Subject: [PATCH] bcm47xx: use device vendor/model variable (#7923) 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 Co-authored-by: Moritz Warning --- target/linux/bcm47xx/image/Makefile | 9 ++++++--- target/linux/bcm47xx/image/generic.mk | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/target/linux/bcm47xx/image/Makefile b/target/linux/bcm47xx/image/Makefile index 30a1b2f47..4341a232c 100644 --- a/target/linux/bcm47xx/image/Makefile +++ b/target/linux/bcm47xx/image/Makefile @@ -146,17 +146,20 @@ define Device/Default endef define Device/standard - DEVICE_TITLE := Image with LZMA loader and LZMA compressed kernel + DEVICE_VENDOR := Generic + DEVICE_MODEL := Image with LZMA loader and LZMA compressed kernel endef define Device/standard-noloader-gz - DEVICE_TITLE := Image with gzipped kernel + DEVICE_VENDOR := Generic + DEVICE_MODEL := Image with gzipped kernel KERNEL_NAME = vmlinux.gz IMAGE/trx := append-rootfs | trx-without-loader endef define Device/standard-noloader-nodictionarylzma - DEVICE_TITLE := Image with LZMA compressed kernel matching CFE decompressor + DEVICE_VENDOR := Generic + DEVICE_MODEL := Image with LZMA compressed kernel matching CFE decompressor KERNEL_NAME = vmlinux-nodictionary.lzma IMAGE/trx := append-rootfs | trx-without-loader endef diff --git a/target/linux/bcm47xx/image/generic.mk b/target/linux/bcm47xx/image/generic.mk index 61204bf23..94064cb7d 100644 --- a/target/linux/bcm47xx/image/generic.mk +++ b/target/linux/bcm47xx/image/generic.mk @@ -66,7 +66,8 @@ TARGET_DEVICES += linksys_e3000-v1 # generic has Ethernet drivers as modules so overwrite standard image define Device/standard - DEVICE_TITLE := Image with LZMA loader and LZMA compressed kernel + DEVICE_VENDOR := Generic + DEVICE_MODEL := Image with LZMA loader and LZMA compressed kernel DEVICE_PACKAGES := kmod-b44 kmod-bgmac kmod-tg3 endef TARGET_DEVICES += standard