summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bootloader/Makefile4
-rw-r--r--flash/bootbox/Makefile4
2 files changed, 6 insertions, 2 deletions
diff --git a/bootloader/Makefile b/bootloader/Makefile
index 6039680096..8a483c3191 100644
--- a/bootloader/Makefile
+++ b/bootloader/Makefile
@@ -35,6 +35,8 @@ LINKFILE = $(OBJDIR)/linkage.lds
MAXINFILE = $(OBJDIR)/romstart.temp
MAXOUTFILE = $(OBJDIR)/romstart
+LIBROCKBOX = $(BUILDDIR)/librockbox.a
+
ifdef DEBUG
all: $(OBJDIR)/bootloader.elf
else
@@ -53,7 +55,7 @@ $(MAXOUTFILE):
@cat $(MAXINFILE) | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - > $(MAXOUTFILE)
@rm $(MAXINFILE)
-$(OBJDIR)/bootloader.elf : $(OBJS) $(LINKFILE) $(DEPFILE)
+$(OBJDIR)/bootloader.elf : $(OBJS) $(LINKFILE) $(DEPFILE) $(LIBROCKBOX)
@echo "LD bootloader.elf"
$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -L$(BUILDDIR)/firmware -lrockbox -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/bootloader.map
diff --git a/flash/bootbox/Makefile b/flash/bootbox/Makefile
index 26de92fb57..276782053f 100644
--- a/flash/bootbox/Makefile
+++ b/flash/bootbox/Makefile
@@ -35,6 +35,8 @@ LINKFILE = $(OBJDIR)/linkage.lds
MAXINFILE = $(OBJDIR)/romstart.temp
MAXOUTFILE = $(OBJDIR)/romstart
+LIBROCKBOX = $(BUILDDIR)/librockbox.a
+
all: $(BUILDDIR)/$(BINARY) $(FLASHFILE)
dep: $(DEPFILE)
@@ -49,7 +51,7 @@ $(MAXOUTFILE):
@cat $(MAXINFILE) | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - > $(MAXOUTFILE)
@rm $(MAXINFILE)
-$(OBJDIR)/bootbox.elf : $(OBJS) $(LINKFILE) $(DEPFILE)
+$(OBJDIR)/bootbox.elf : $(OBJS) $(LINKFILE) $(DEPFILE) $(LIBROCKBOX)
@echo "LD bootbox.elf"
$(CC) $(GCCOPTS) -Wl,--gc-sections -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -L$(BUILDDIR)/firmware -lrockbox -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/bootbox.map