diff --git a/target/linux/bcm63xx/image/Makefile b/target/linux/bcm63xx/image/Makefile index d7e2432bdb..c962e531a9 100644 --- a/target/linux/bcm63xx/image/Makefile +++ b/target/linux/bcm63xx/image/Makefile @@ -15,7 +15,8 @@ LZMA_TEXT_START = 0x81800000 # 32MB - 8MB LOADER_MAKEOPTS= \ KDIR=$(KDIR) \ - LOADADDR=$(KERNEL_LOADADDR) \ + LOADER_ADDR=$(LOADER_ENTRY) \ + KERNEL_ADDR=$(KERNEL_LOADADDR) \ RAMSIZE=$(RAMSIZE) \ LZMA_TEXT_START=$(LZMA_TEXT_START) \ CHIP_ID=$(CHIP_ID) diff --git a/target/linux/bcm63xx/image/lzma-loader/src/Makefile b/target/linux/bcm63xx/image/lzma-loader/src/Makefile index 9115f75af3..0310051a93 100644 --- a/target/linux/bcm63xx/image/lzma-loader/src/Makefile +++ b/target/linux/bcm63xx/image/lzma-loader/src/Makefile @@ -17,7 +17,8 @@ # by the Free Software Foundation. # -LOADADDR := +LOADER_ADDR := +KERNEL_ADDR := LZMA_TEXT_START := 0x80a00000 LOADER_DATA := @@ -49,7 +50,7 @@ OBJECTS := head.o loader.o cache.o board.o printf.o LzmaDecode.o ifneq ($(strip $(LOADER_DATA)),) OBJECTS += data.o -CFLAGS += -DLZMA_WRAPPER=1 -DLOADADDR=$(LOADADDR) +CFLAGS += -DLZMA_WRAPPER=1 -DLOADADDR=$(KERNEL_ADDR) endif @@ -79,7 +80,7 @@ loader2.o: loader.bin $(LD) -r -b binary --oformat $(O_FORMAT) -o $@ $< loader.elf: loader2.o - $(LD) -e startup -T loader2.lds -Ttext $(LOADADDR) -o $@ $< + $(LD) -e startup -T loader2.lds -Ttext $(LOADER_ADDR) -o $@ $< mrproper: clean