diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-11-20 12:17:41 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-11-20 12:17:41 +0000 |
| commit | 97867f8717abc2b02bbea8c1ef625fe68f05700b (patch) | |
| tree | 0b4fbdf06d47f606118af0854ca3e0349652f446 /target/linux/ar71xx/image | |
| parent | dd092fd10cb1b5e4ef5414952ee0180e2e616886 (diff) | |
| download | upstream-97867f8717abc2b02bbea8c1ef625fe68f05700b.tar.gz upstream-97867f8717abc2b02bbea8c1ef625fe68f05700b.tar.bz2 upstream-97867f8717abc2b02bbea8c1ef625fe68f05700b.zip | |
ar71xx/image: relink loader.elf image to LOADADDR
This allows to load the resulting image directly
from RouterBOOT.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 34271
Diffstat (limited to 'target/linux/ar71xx/image')
| -rw-r--r-- | target/linux/ar71xx/image/lzma-loader/src/Makefile | 16 | ||||
| -rw-r--r-- | target/linux/ar71xx/image/lzma-loader/src/loader2.lds | 10 |
2 files changed, 21 insertions, 5 deletions
diff --git a/target/linux/ar71xx/image/lzma-loader/src/Makefile b/target/linux/ar71xx/image/lzma-loader/src/Makefile index 3e6839c7c3..8038b2fba9 100644 --- a/target/linux/ar71xx/image/lzma-loader/src/Makefile +++ b/target/linux/ar71xx/image/lzma-loader/src/Makefile @@ -68,7 +68,7 @@ ifneq ($(BOARD_DEF),) CFLAGS += -DCONFIG_BOARD_$(BOARD_DEF) endif -all: loader.bin +all: loader.elf # Don't build dependencies, this may die if $(CC) isn't gcc dep: @@ -84,16 +84,22 @@ install: data.o: $(LOADER_DATA) $(LD) -r -b binary --oformat $(O_FORMAT) -T lzma-data.lds -o $@ $< -loader.bin: loader.elf +loader: $(OBJECTS) + $(LD) $(LDFLAGS) -o $@ $(OBJECTS) + +loader.bin: loader $(OBJCOPY) $(BIN_FLAGS) $< $@ -loader.elf: $(OBJECTS) - $(LD) $(LDFLAGS) -o $@ $(OBJECTS) +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 $@ $< mrproper: clean clean: - rm -f *.elf *.bin *.o + rm -f loader *.elf *.bin *.o diff --git a/target/linux/ar71xx/image/lzma-loader/src/loader2.lds b/target/linux/ar71xx/image/lzma-loader/src/loader2.lds new file mode 100644 index 0000000000..db0bb46424 --- /dev/null +++ b/target/linux/ar71xx/image/lzma-loader/src/loader2.lds @@ -0,0 +1,10 @@ +OUTPUT_ARCH(mips) +SECTIONS { + .text : { + startup = .; + *(.text) + *(.text.*) + *(.data) + *(.data.*) + } +} |