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 <jonas.gorski@gmail.com>

diff --git a/target/linux/brcm63xx/image/bcm63xx.mk b/target/linux/brcm63xx/image/bcm63xx.mk
index e42c233a64287a1039e73a998da1f27c924ce2b1..af14168b7428a37c15891f829d3eb6d0c4d9ed7c 100644 (file)
--- 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