diff options
-rw-r--r-- | bootloader/Makefile | 4 | ||||
-rw-r--r-- | flash/bootbox/Makefile | 4 |
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 | |||
35 | MAXINFILE = $(OBJDIR)/romstart.temp | 35 | MAXINFILE = $(OBJDIR)/romstart.temp |
36 | MAXOUTFILE = $(OBJDIR)/romstart | 36 | MAXOUTFILE = $(OBJDIR)/romstart |
37 | 37 | ||
38 | LIBROCKBOX = $(BUILDDIR)/librockbox.a | ||
39 | |||
38 | ifdef DEBUG | 40 | ifdef DEBUG |
39 | all: $(OBJDIR)/bootloader.elf | 41 | all: $(OBJDIR)/bootloader.elf |
40 | else | 42 | else |
@@ -53,7 +55,7 @@ $(MAXOUTFILE): | |||
53 | @cat $(MAXINFILE) | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - > $(MAXOUTFILE) | 55 | @cat $(MAXINFILE) | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - > $(MAXOUTFILE) |
54 | @rm $(MAXINFILE) | 56 | @rm $(MAXINFILE) |
55 | 57 | ||
56 | $(OBJDIR)/bootloader.elf : $(OBJS) $(LINKFILE) $(DEPFILE) | 58 | $(OBJDIR)/bootloader.elf : $(OBJS) $(LINKFILE) $(DEPFILE) $(LIBROCKBOX) |
57 | @echo "LD bootloader.elf" | 59 | @echo "LD bootloader.elf" |
58 | $(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -L$(BUILDDIR)/firmware -lrockbox -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/bootloader.map | 60 | $(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -L$(BUILDDIR)/firmware -lrockbox -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/bootloader.map |
59 | 61 | ||
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 | |||
35 | MAXINFILE = $(OBJDIR)/romstart.temp | 35 | MAXINFILE = $(OBJDIR)/romstart.temp |
36 | MAXOUTFILE = $(OBJDIR)/romstart | 36 | MAXOUTFILE = $(OBJDIR)/romstart |
37 | 37 | ||
38 | LIBROCKBOX = $(BUILDDIR)/librockbox.a | ||
39 | |||
38 | all: $(BUILDDIR)/$(BINARY) $(FLASHFILE) | 40 | all: $(BUILDDIR)/$(BINARY) $(FLASHFILE) |
39 | 41 | ||
40 | dep: $(DEPFILE) | 42 | dep: $(DEPFILE) |
@@ -49,7 +51,7 @@ $(MAXOUTFILE): | |||
49 | @cat $(MAXINFILE) | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - > $(MAXOUTFILE) | 51 | @cat $(MAXINFILE) | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - > $(MAXOUTFILE) |
50 | @rm $(MAXINFILE) | 52 | @rm $(MAXINFILE) |
51 | 53 | ||
52 | $(OBJDIR)/bootbox.elf : $(OBJS) $(LINKFILE) $(DEPFILE) | 54 | $(OBJDIR)/bootbox.elf : $(OBJS) $(LINKFILE) $(DEPFILE) $(LIBROCKBOX) |
53 | @echo "LD bootbox.elf" | 55 | @echo "LD bootbox.elf" |
54 | $(CC) $(GCCOPTS) -Wl,--gc-sections -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -L$(BUILDDIR)/firmware -lrockbox -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/bootbox.map | 56 | $(CC) $(GCCOPTS) -Wl,--gc-sections -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -L$(BUILDDIR)/firmware -lrockbox -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/bootbox.map |
55 | 57 | ||