diff options
author | Björn Stenberg <bjorn@haxx.se> | 2008-11-20 11:27:31 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2008-11-20 11:27:31 +0000 |
commit | c6b3d38a156dd624760a8eb1bb374affd43b4f2a (patch) | |
tree | 493eba929e2396d86cf4f077709aa09fe172cd35 /bootloader | |
parent | f66c30346783a400a029bedcd60ab67c81c34a07 (diff) | |
download | rockbox-c6b3d38a156dd624760a8eb1bb374affd43b4f2a.tar.gz rockbox-c6b3d38a156dd624760a8eb1bb374affd43b4f2a.zip |
New makefile solution: A single invocation of 'make' to build the entire tree. Fully controlled dependencies give faster and more correct recompiles.
Many #include lines adjusted to conform to the new standards.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19146 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader')
-rw-r--r-- | bootloader/bootloader.make | 37 | ||||
-rw-r--r-- | bootloader/show_logo.c | 2 |
2 files changed, 38 insertions, 1 deletions
diff --git a/bootloader/bootloader.make b/bootloader/bootloader.make new file mode 100644 index 0000000000..736425e3ac --- /dev/null +++ b/bootloader/bootloader.make | |||
@@ -0,0 +1,37 @@ | |||
1 | # __________ __ ___. | ||
2 | # Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
3 | # Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
4 | # Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
5 | # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
6 | # \/ \/ \/ \/ \/ | ||
7 | # $Id: Makefile 19082 2008-11-10 23:54:24Z zagor $ | ||
8 | # | ||
9 | |||
10 | INCLUDES += -I$(APPSDIR) | ||
11 | SRC += $(call preprocess, $(APPSDIR)/SOURCES) | ||
12 | |||
13 | BOOTLDS := $(FIRMDIR)/target/$(CPU)/$(MANUFACTURER)/boot.lds | ||
14 | BOOTLINK := $(BUILDDIR)/boot.link | ||
15 | |||
16 | CLEANOBJS += $(BUILDDIR)/bootloader.* | ||
17 | |||
18 | .SECONDEXPANSION: | ||
19 | |||
20 | $(BOOTLINK): $(BOOTLDS) | ||
21 | $(call PRINTS,PP $(@F)) | ||
22 | $(call preprocess2file,$<,$@,-DLOADADDRESS=$(LOADADDRESS)) | ||
23 | |||
24 | $(BUILDDIR)/bootloader.elf: $$(OBJ) $$(FIRMLIB) $$(BOOTLINK) | ||
25 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ | ||
26 | $(FIRMLIB) -lgcc -L$(BUILDDIR)/firmware -T$(BOOTLINK) \ | ||
27 | -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map | ||
28 | |||
29 | $(BUILDDIR)/bootloader.bin : $(BUILDDIR)/bootloader.elf | ||
30 | $(call PRINTS,OBJCOPY $(@F))$(OC) $(if $(filter yes, $(USE_ELF)), -S -x, -O binary) $< $@ | ||
31 | |||
32 | $(BUILDDIR)/bootloader.asm: $(BUILDDIR)/bootloader.bin | ||
33 | $(TOOLSDIR)/sh2d -sh1 $< > $@ | ||
34 | |||
35 | $(BUILDDIR)/$(BINARY) : $(BUILDDIR)/bootloader.bin | ||
36 | $(call PRINTS,Build bootloader file)$(MKFIRMWARE) $< $@ | ||
37 | |||
diff --git a/bootloader/show_logo.c b/bootloader/show_logo.c index 0dc2b5ba20..c0627aa423 100644 --- a/bootloader/show_logo.c +++ b/bootloader/show_logo.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <stdio.h> | 24 | #include <stdio.h> |
25 | #include <string.h> | 25 | #include <string.h> |
26 | 26 | ||
27 | #include "rockboxlogo.h" | 27 | #include "bitmaps/rockboxlogo.h" |
28 | 28 | ||
29 | #if LCD_WIDTH <= 128 | 29 | #if LCD_WIDTH <= 128 |
30 | #define BOOT_VERSION ("Boot " APPSVERSION) | 30 | #define BOOT_VERSION ("Boot " APPSVERSION) |