summaryrefslogtreecommitdiffstats
path: root/bootloader
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2012-03-26 23:55:02 +0200
committerThomas Martitz <kugel@rockbox.org>2012-03-26 23:55:02 +0200
commit045c69c51d541c90f133abcb94f32f9323ed8c6e (patch)
tree43d4a9c3c5e487945bd98581a5c5199fc0d6e211 /bootloader
parentd26bbb9cfb4dc9b11b790ba428d3a8787bce61bb (diff)
downloadrockbox-045c69c51d541c90f133abcb94f32f9323ed8c6e.tar.gz
rockbox-045c69c51d541c90f133abcb94f32f9323ed8c6e.tar.bz2
rockbox-045c69c51d541c90f133abcb94f32f9323ed8c6e.zip
Fix bootloaders.
Change-Id: I7e1666d604c554509375a4ae858ff3cd7be96b3a
Diffstat (limited to 'bootloader')
-rw-r--r--bootloader/bootloader.make13
1 files changed, 4 insertions, 9 deletions
diff --git a/bootloader/bootloader.make b/bootloader/bootloader.make
index f57fac0e42..88305f3c89 100644
--- a/bootloader/bootloader.make
+++ b/bootloader/bootloader.make
@@ -18,20 +18,15 @@ CLEANOBJS += $(BUILDDIR)/bootloader.*
.SECONDEXPANSION:
-ifeq (arm,$(ARCH))
- UNWARMINDER_LINK := -lunwarminder -L$(BUILDDIR)/lib
-else
- UNWARMINDER_LINK :=
-endif
-
$(BOOTLINK): $(BOOTLDS) $(CONFIGFILE)
$(call PRINTS,PP $(@F))
$(call preprocess2file,$<,$@,-DLOADADDRESS=$(LOADADDRESS))
-$(BUILDDIR)/bootloader.elf: $$(OBJ) $$(FIRMLIB) $$(UNWARMINDER) $$(BOOTLINK)
+$(BUILDDIR)/bootloader.elf: $$(OBJ) $(FIRMLIB) $(CORE_LIBS) $$(BOOTLINK)
$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \
- $(FIRMLIB) $(UNWARMINDER_LINK) -lgcc -L$(BUILDDIR)/firmware \
- -T$(BOOTLINK) $(GLOBAL_LDOPTS) \
+ -L$(BUILDDIR)/firmware -lfirmware \
+ -L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \
+ -lgcc -T$(BOOTLINK) $(GLOBAL_LDOPTS) \
-Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map
$(BUILDDIR)/bootloader.bin : $(BUILDDIR)/bootloader.elf