diff options
| author | Marcin Bukat <marcin.bukat@gmail.com> | 2012-02-22 09:01:09 +0100 |
|---|---|---|
| committer | Marcin Bukat <marcin.bukat@gmail.com> | 2012-02-22 09:01:09 +0100 |
| commit | 164cb21fe5964a8bc3a78f9acbccea0ab7295ccf (patch) | |
| tree | d774dfd07b79663b33c3c7eeffd10c531dcaee64 | |
| parent | b4eab599513324dcaffa4c5693345ae11f3f9725 (diff) | |
| download | rockbox-164cb21fe5964a8bc3a78f9acbccea0ab7295ccf.tar.gz rockbox-164cb21fe5964a8bc3a78f9acbccea0ab7295ccf.zip | |
unwarminder: fix bootloader builds
Change-Id: I045a4c9639ff17c96b514996574d41f586b5bd7c
| -rw-r--r-- | bootloader/bootloader.make | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/bootloader/bootloader.make b/bootloader/bootloader.make index 78b8b438c4..f57fac0e42 100644 --- a/bootloader/bootloader.make +++ b/bootloader/bootloader.make | |||
| @@ -18,15 +18,21 @@ CLEANOBJS += $(BUILDDIR)/bootloader.* | |||
| 18 | 18 | ||
| 19 | .SECONDEXPANSION: | 19 | .SECONDEXPANSION: |
| 20 | 20 | ||
| 21 | ifeq (arm,$(ARCH)) | ||
| 22 | UNWARMINDER_LINK := -lunwarminder -L$(BUILDDIR)/lib | ||
| 23 | else | ||
| 24 | UNWARMINDER_LINK := | ||
| 25 | endif | ||
| 26 | |||
| 21 | $(BOOTLINK): $(BOOTLDS) $(CONFIGFILE) | 27 | $(BOOTLINK): $(BOOTLDS) $(CONFIGFILE) |
| 22 | $(call PRINTS,PP $(@F)) | 28 | $(call PRINTS,PP $(@F)) |
| 23 | $(call preprocess2file,$<,$@,-DLOADADDRESS=$(LOADADDRESS)) | 29 | $(call preprocess2file,$<,$@,-DLOADADDRESS=$(LOADADDRESS)) |
| 24 | 30 | ||
| 25 | $(BUILDDIR)/bootloader.elf: $$(OBJ) $$(FIRMLIB) $$(BOOTLINK) | 31 | $(BUILDDIR)/bootloader.elf: $$(OBJ) $$(FIRMLIB) $$(UNWARMINDER) $$(BOOTLINK) |
| 26 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ | 32 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ |
| 27 | $(FIRMLIB) -lgcc -L$(BUILDDIR)/firmware -T$(BOOTLINK) \ | 33 | $(FIRMLIB) $(UNWARMINDER_LINK) -lgcc -L$(BUILDDIR)/firmware \ |
| 28 | $(GLOBAL_LDOPTS) \ | 34 | -T$(BOOTLINK) $(GLOBAL_LDOPTS) \ |
| 29 | -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map | 35 | -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map |
| 30 | 36 | ||
| 31 | $(BUILDDIR)/bootloader.bin : $(BUILDDIR)/bootloader.elf | 37 | $(BUILDDIR)/bootloader.bin : $(BUILDDIR)/bootloader.elf |
| 32 | $(call PRINTS,OBJCOPY $(@F))$(OC) $(if $(filter yes, $(USE_ELF)), -S -x, -O binary) $< $@ | 38 | $(call PRINTS,OBJCOPY $(@F))$(OC) $(if $(filter yes, $(USE_ELF)), -S -x, -O binary) $< $@ |