diff options
Diffstat (limited to 'bootloader')
-rw-r--r-- | bootloader/Makefile | 7 | ||||
-rw-r--r-- | bootloader/bootloader.make | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/bootloader/Makefile b/bootloader/Makefile index 07f347ee16..3e606cdc68 100644 --- a/bootloader/Makefile +++ b/bootloader/Makefile | |||
@@ -78,7 +78,7 @@ $(MAXOUTFILE): | |||
78 | 78 | ||
79 | build-bitmapsmono: | 79 | build-bitmapsmono: |
80 | $(call PRINTS,MAKE in bitmaps/mono)$(MAKE) -C ../apps/bitmaps/mono OBJDIR=$(OBJDIR)/bitmaps/mono | 80 | $(call PRINTS,MAKE in bitmaps/mono)$(MAKE) -C ../apps/bitmaps/mono OBJDIR=$(OBJDIR)/bitmaps/mono |
81 | 81 | ||
82 | build-bitmapsnative: | 82 | build-bitmapsnative: |
83 | $(call PRINTS,MAKE in bitmaps/native)$(MAKE) -C ../apps/bitmaps/native OBJDIR=$(OBJDIR)/bitmaps/native | 83 | $(call PRINTS,MAKE in bitmaps/native)$(MAKE) -C ../apps/bitmaps/native OBJDIR=$(OBJDIR)/bitmaps/native |
84 | 84 | ||
@@ -96,16 +96,13 @@ $(OBJDIR)/bootloader.elf : $(OBJS) $(LINKFILE) $(DEPFILE) $(LIBROCKBOX) $(BITMAP | |||
96 | $(OBJDIR)/bootloader.bin : $(OBJDIR)/bootloader.elf | 96 | $(OBJDIR)/bootloader.bin : $(OBJDIR)/bootloader.elf |
97 | $(call PRINTS,OBJCOPY $(@F))$(OC) $(if $(filter yes, $(USE_ELF)), -S -x, -O binary) $< $@ | 97 | $(call PRINTS,OBJCOPY $(@F))$(OC) $(if $(filter yes, $(USE_ELF)), -S -x, -O binary) $< $@ |
98 | 98 | ||
99 | $(OBJDIR)/bootloader.asm: $(OBJDIR)/bootloader.bin | ||
100 | $(TOOLSDIR)/sh2d -sh1 $< > $@ | ||
101 | |||
102 | $(BUILDDIR)/$(BINARY) : $(OBJDIR)/bootloader.bin | 99 | $(BUILDDIR)/$(BINARY) : $(OBJDIR)/bootloader.bin |
103 | $(call PRINTS,Build bootloader file)$(MKFIRMWARE) $< $@ | 100 | $(call PRINTS,Build bootloader file)$(MKFIRMWARE) $< $@ |
104 | 101 | ||
105 | include $(TOOLSDIR)/make.inc | 102 | include $(TOOLSDIR)/make.inc |
106 | 103 | ||
107 | clean: | 104 | clean: |
108 | $(call PRINTS,cleaning bootloader)-rm -f $(OBJS) $(BUILDDIR)/$(BINARY) $(OBJDIR)/bootloader.asm \ | 105 | $(call PRINTS,cleaning bootloader)-rm -f $(OBJS) $(BUILDDIR)/$(BINARY) \ |
109 | $(OBJDIR)/bootloader.bin $(OBJDIR)/bootloader.elf $(OBJDIR)/*.map \ | 106 | $(OBJDIR)/bootloader.bin $(OBJDIR)/bootloader.elf $(OBJDIR)/*.map \ |
110 | $(LINKFILE) $(MAXOUTFILE) $(DEPFILE) | 107 | $(LINKFILE) $(MAXOUTFILE) $(DEPFILE) |
111 | $(SILENT)$(MAKE) -C bitmaps/mono clean OBJDIR=$(OBJDIR)/bitmaps/mono | 108 | $(SILENT)$(MAKE) -C bitmaps/mono clean OBJDIR=$(OBJDIR)/bitmaps/mono |
diff --git a/bootloader/bootloader.make b/bootloader/bootloader.make index d1f580a52e..75ad082f84 100644 --- a/bootloader/bootloader.make +++ b/bootloader/bootloader.make | |||
@@ -32,9 +32,5 @@ $(BUILDDIR)/bootloader.elf: $$(OBJ) $(FIRMLIB) $(CORE_LIBS) $$(BOOTLINK) | |||
32 | $(BUILDDIR)/bootloader.bin : $(BUILDDIR)/bootloader.elf | 32 | $(BUILDDIR)/bootloader.bin : $(BUILDDIR)/bootloader.elf |
33 | $(call PRINTS,OC $(@F))$(call objcopy,$<,$@) | 33 | $(call PRINTS,OC $(@F))$(call objcopy,$<,$@) |
34 | 34 | ||
35 | $(BUILDDIR)/bootloader.asm: $(BUILDDIR)/bootloader.bin | ||
36 | $(TOOLSDIR)/sh2d -sh1 $< > $@ | ||
37 | |||
38 | $(BUILDDIR)/$(BINARY) : $(BUILDDIR)/bootloader.bin | 35 | $(BUILDDIR)/$(BINARY) : $(BUILDDIR)/bootloader.bin |
39 | $(call PRINTS,Build bootloader file)$(MKFIRMWARE) $< $@ | 36 | $(call PRINTS,Build bootloader file)$(MKFIRMWARE) $< $@ |
40 | |||