[source] brcm63xx: fix image generation with offsets/blocksizes != 64K

LEDE Commits lede-commits at lists.infradead.org
Sat Jul 9 04:43:45 PDT 2016


jogo pushed a commit to source.git, branch master:
https://git.lede-project.org/?p=source.git;a=commitdiff;h=eae812ddb6cc6edfd253711ebb2250c32c599692

commit eae812ddb6cc6edfd253711ebb2250c32c599692
Author: Jonas Gorski <jonas.gorski at gmail.com>
AuthorDate: Sat Jul 9 13:10:08 2016 +0200

    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 at gmail.com>
---
 target/linux/brcm63xx/image/bcm63xx.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/linux/brcm63xx/image/bcm63xx.mk b/target/linux/brcm63xx/image/bcm63xx.mk
index e42c233..af14168 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



More information about the lede-commits mailing list