From e3e6ec3cdafb226ba5eaab867659b08e7f0d700f Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Mon, 22 Feb 2021 18:07:02 +0100 Subject: [PATCH] bcm63xx: limit name metadata to model name MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Since there are only 16 characters available, on most cases the vendor name will fit in the metadata, but the model name won't fit. Signed-off-by: Álvaro Fernández Rojas (cherry-picked from commit c27532742d) --- target/linux/bcm63xx/image/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/target/linux/bcm63xx/image/Makefile b/target/linux/bcm63xx/image/Makefile index 822e26e993..f35358173c 100644 --- a/target/linux/bcm63xx/image/Makefile +++ b/target/linux/bcm63xx/image/Makefile @@ -84,10 +84,6 @@ endef define rootfspad/squashfs endef -define Image/LimitName16 -$(shell expr substr "$(1)" 1 16) -endef - define Image/FileSystemStrip $(firstword $(subst +,$(space),$(subst root.,,$(notdir $(1))))) endef @@ -96,7 +92,7 @@ define Build/cfe-bin $(STAGING_DIR_HOST)/bin/imagetag -i $(IMAGE_KERNEL) -f $(IMAGE_ROOTFS) \ --output $@ --boardid $(CFE_BOARD_ID) --chipid $(CHIP_ID) \ --entry $(LOADER_ENTRY) --load-addr $(LOADER_ENTRY) \ - --info1 "$(call Image/LimitName16,$(DEVICE_NAME))" \ + --info1 "$(call ModelNameLimit16,$(DEVICE_NAME))" \ --info2 "$(call Image/FileSystemStrip,$(IMAGE_ROOTFS))" \ $(call rootfspad/$(call Image/FileSystemStrip,$(IMAGE_ROOTFS))) \ $(CFE_EXTRAS) $(1) -- 2.30.2