nihilazo
/
rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bootloaders. 

Change-Id: I7e1666d604c554509375a4ae858ff3cd7be96b3a
This commit is contained in:
Thomas Martitz 2012-03-26 23:55:02 +02:00
parent d26bbb9cfb
commit 045c69c51d
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bootloader/bootloader.make
View File

@ -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

4
tools/root.make
View File

@ -66,8 +66,10 @@ include $(TOOLSDIR)/tools.make
ifeq (,$(findstring checkwps,$(APPSDIR)))
ifeq (,$(findstring database,$(APPSDIR)))
include $(FIRMDIR)/firmware.make
include $(ROOTDIR)/lib/skin_parser/skin_parser.make
include $(ROOTDIR)/apps/bitmaps/bitmaps.make
ifeq (,$(findstring bootloader,$(APPSDIR)))
include $(ROOTDIR)/lib/skin_parser/skin_parser.make
endif
endif
endif