From 90daff4cf8a86622012217d3be7ce136c313a896 Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Mon, 9 Mar 2020 21:14:06 +0900 Subject: [PATCH] build: image: move IMAGE_SIZE to image.mk IMAGE_SIZE is widely used in many targets. Declare it in the default template to clean up redundant code. This also prevents deriving IMAGE_SIZE unintentionally from the previously defined device. While at it, remove duplicate KERNEL_SIZE declaration. Signed-off-by: Sungbo Eo --- include/image.mk | 6 +++--- target/linux/apm821xx/image/Makefile | 2 +- target/linux/ar71xx/image/Makefile | 2 +- target/linux/ath79/image/Makefile | 2 +- target/linux/lantiq/image/Makefile | 2 -- target/linux/ramips/image/Makefile | 2 +- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/include/image.mk b/include/image.mk index fd04d4020bf..2436b94f814 100644 --- a/include/image.mk +++ b/include/image.mk @@ -381,13 +381,13 @@ define Device/Init DEVICE_NAME := $(1) KERNEL:= KERNEL_INITRAMFS = $$(KERNEL) - KERNEL_SIZE:= CMDLINE:= IMAGES := ARTIFACTS := IMAGE_PREFIX := $(IMG_PREFIX)-$(1) IMAGE_NAME = $$(IMAGE_PREFIX)-$$(1)-$$(2) + IMAGE_SIZE := KERNEL_PREFIX = $$(IMAGE_PREFIX) KERNEL_SUFFIX := -kernel.bin KERNEL_INITRAMFS_SUFFIX = $$(KERNEL_SUFFIX) @@ -434,8 +434,8 @@ DEFAULT_DEVICE_VARS := \ CMDLINE UBOOTENV_IN_UBI KERNEL_IN_UBI BLOCKSIZE PAGESIZE SUBPAGESIZE \ VID_HDR_OFFSET UBINIZE_OPTS UBINIZE_PARTS MKUBIFS_OPTS DEVICE_DTS \ DEVICE_DTS_CONFIG DEVICE_DTS_DIR SOC BOARD_NAME UIMAGE_NAME SUPPORTED_DEVICES \ - IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR UBOOT_PATH DEVICE_VENDOR \ - DEVICE_MODEL DEVICE_VARIANT \ + IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR UBOOT_PATH IMAGE_SIZE \ + DEVICE_VENDOR DEVICE_MODEL DEVICE_VARIANT \ DEVICE_ALT0_VENDOR DEVICE_ALT0_MODEL DEVICE_ALT0_VARIANT \ DEVICE_ALT1_VENDOR DEVICE_ALT1_MODEL DEVICE_ALT1_VARIANT \ DEVICE_ALT2_VENDOR DEVICE_ALT2_MODEL DEVICE_ALT2_VARIANT diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile index 108f63cb7a9..1b0bc477a9d 100644 --- a/target/linux/apm821xx/image/Makefile +++ b/target/linux/apm821xx/image/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk -DEVICE_VARS += IMAGE_SIZE DTB_SIZE +DEVICE_VARS += DTB_SIZE define Build/boot-img $(RM) -rf $@.bootdir diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 804532b55cb..dea8338dddc 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/image.mk KERNEL_LOADADDR = 0x80060000 -DEVICE_VARS += BOARDNAME CMDLINE CONSOLE IMAGE_SIZE LOADER_TYPE +DEVICE_VARS += BOARDNAME CMDLINE CONSOLE LOADER_TYPE ifeq ($(SUBTARGET),generic) include ./generic.mk diff --git a/target/linux/ath79/image/Makefile b/target/linux/ath79/image/Makefile index a28658ec0bb..c27db93947f 100644 --- a/target/linux/ath79/image/Makefile +++ b/target/linux/ath79/image/Makefile @@ -3,7 +3,7 @@ include $(INCLUDE_DIR)/image.mk KERNEL_LOADADDR = 0x80060000 -DEVICE_VARS += IMAGE_SIZE LOADER_FLASH_OFFS LOADER_TYPE +DEVICE_VARS += LOADER_FLASH_OFFS LOADER_TYPE define Build/loader-common rm -rf $@.src diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile index d0dc49730b5..0ec04af6b31 100644 --- a/target/linux/lantiq/image/Makefile +++ b/target/linux/lantiq/image/Makefile @@ -62,14 +62,12 @@ define Device/Default KERNEL := kernel-bin | append-dtb | lzma | uImage lzma KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | uImage lzma FILESYSTEMS := squashfs - IMAGE_SIZE := SOC := $(DEFAULT_SOC) DEVICE_DTS = $$(SOC)_$(1) SUPPORTED_DEVICES := $(subst _,$(comma),$(1)) IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) endef -DEVICE_VARS += IMAGE_SIZE define Device/NAND/xway BLOCKSIZE := 16k diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index 1d865aa5673..e34bf372100 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk -DEVICE_VARS += IMAGE_SIZE NETGEAR_BOARD_ID NETGEAR_HW_ID +DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID DEVICE_VARS += BUFFALO_TAG_PLATFORM BUFFALO_TAG_VERSION BUFFALO_TAG_MINOR DEVICE_VARS += SEAMA_SIGNATURE SEAMA_MTDBLOCK DEVICE_VARS += SERCOMM_HWID SERCOMM_HWVER SERCOMM_SWVER -- 2.30.2