diff options
author | Thomas Martitz <kugel@rockbox.org> | 2012-03-26 23:55:02 +0200 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2012-03-26 23:55:02 +0200 |
commit | 045c69c51d541c90f133abcb94f32f9323ed8c6e (patch) | |
tree | 43d4a9c3c5e487945bd98581a5c5199fc0d6e211 | |
parent | d26bbb9cfb4dc9b11b790ba428d3a8787bce61bb (diff) | |
download | rockbox-045c69c51d541c90f133abcb94f32f9323ed8c6e.tar.gz rockbox-045c69c51d541c90f133abcb94f32f9323ed8c6e.zip |
Fix bootloaders.
Change-Id: I7e1666d604c554509375a4ae858ff3cd7be96b3a
-rw-r--r-- | bootloader/bootloader.make | 13 | ||||
-rw-r--r-- | tools/root.make | 4 |
2 files changed, 7 insertions, 10 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.* | |||
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 | |||
27 | $(BOOTLINK): $(BOOTLDS) $(CONFIGFILE) | 21 | $(BOOTLINK): $(BOOTLDS) $(CONFIGFILE) |
28 | $(call PRINTS,PP $(@F)) | 22 | $(call PRINTS,PP $(@F)) |
29 | $(call preprocess2file,$<,$@,-DLOADADDRESS=$(LOADADDRESS)) | 23 | $(call preprocess2file,$<,$@,-DLOADADDRESS=$(LOADADDRESS)) |
30 | 24 | ||
31 | $(BUILDDIR)/bootloader.elf: $$(OBJ) $$(FIRMLIB) $$(UNWARMINDER) $$(BOOTLINK) | 25 | $(BUILDDIR)/bootloader.elf: $$(OBJ) $(FIRMLIB) $(CORE_LIBS) $$(BOOTLINK) |
32 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ | 26 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ |
33 | $(FIRMLIB) $(UNWARMINDER_LINK) -lgcc -L$(BUILDDIR)/firmware \ | 27 | -L$(BUILDDIR)/firmware -lfirmware \ |
34 | -T$(BOOTLINK) $(GLOBAL_LDOPTS) \ | 28 | -L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \ |
29 | -lgcc -T$(BOOTLINK) $(GLOBAL_LDOPTS) \ | ||
35 | -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map | 30 | -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map |
36 | 31 | ||
37 | $(BUILDDIR)/bootloader.bin : $(BUILDDIR)/bootloader.elf | 32 | $(BUILDDIR)/bootloader.bin : $(BUILDDIR)/bootloader.elf |
diff --git a/tools/root.make b/tools/root.make index 861f017a82..4a8d2adf16 100644 --- a/tools/root.make +++ b/tools/root.make | |||
@@ -66,8 +66,10 @@ include $(TOOLSDIR)/tools.make | |||
66 | ifeq (,$(findstring checkwps,$(APPSDIR))) | 66 | ifeq (,$(findstring checkwps,$(APPSDIR))) |
67 | ifeq (,$(findstring database,$(APPSDIR))) | 67 | ifeq (,$(findstring database,$(APPSDIR))) |
68 | include $(FIRMDIR)/firmware.make | 68 | include $(FIRMDIR)/firmware.make |
69 | include $(ROOTDIR)/lib/skin_parser/skin_parser.make | ||
70 | include $(ROOTDIR)/apps/bitmaps/bitmaps.make | 69 | include $(ROOTDIR)/apps/bitmaps/bitmaps.make |
70 | ifeq (,$(findstring bootloader,$(APPSDIR))) | ||
71 | include $(ROOTDIR)/lib/skin_parser/skin_parser.make | ||
72 | endif | ||
71 | endif | 73 | endif |
72 | endif | 74 | endif |
73 | 75 | ||