From: Jonas Gorski Date: Sat, 9 Jul 2016 11:10:08 +0000 (+0200) Subject: brcm63xx: fix image generation with offsets/blocksizes != 64K X-Git-Tag: v17.01.0-rc1~2120 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=eae812ddb6cc6edfd253711ebb2250c32c599692 brcm63xx: fix image generation with offsets/blocksizes != 64K Defer the CFE_EXTRAs evaluation to allow overriden BLOCK_SIZE and IMAGE_OFFSET take effect, and replace the unused IMAGE_SIZE with IMAGE_OFFSET in DEVICE_VARS. This fixes image generation for targets using different offsets or blocksizes. Signed-off-by: Jonas Gorski --- diff --git a/target/linux/brcm63xx/image/bcm63xx.mk b/target/linux/brcm63xx/image/bcm63xx.mk index e42c233a64..af14168b74 100644 --- a/target/linux/brcm63xx/image/bcm63xx.mk +++ b/target/linux/brcm63xx/image/bcm63xx.mk @@ -28,9 +28,9 @@ define Device/bcm63xx FLASH_MB := 4 CFE_BOARD_ID := CFE_CHIP_ID := - CFE_EXTRAS := --block-size $$(BLOCK_SIZE) --image-offset $$(if $$(IMAGE_OFFSET),$$(IMAGE_OFFSET),$$(BLOCK_SIZE)) + CFE_EXTRAS = --block-size $$(BLOCK_SIZE) --image-offset $$(if $$(IMAGE_OFFSET),$$(IMAGE_OFFSET),$$(BLOCK_SIZE)) endef -DEVICE_VARS += BLOCK_SIZE FLASH_MB IMAGE_SIZE +DEVICE_VARS += BLOCK_SIZE FLASH_MB IMAGE_OFFSET DEVICE_VARS += CFE_BOARD_ID CFE_CHIP_ID CFE_EXTRAS define Device/bcm63xx_netgear