From c6b3d38a156dd624760a8eb1bb374affd43b4f2a Mon Sep 17 00:00:00 2001
From: Björn Stenberg <bjorn@haxx.se>
Date: Thu, 20 Nov 2008 11:27:31 +0000
Subject: 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
---
 bootloader/bootloader.make | 37 +++++++++++++++++++++++++++++++++++++
 bootloader/show_logo.c     |  2 +-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 bootloader/bootloader.make

(limited to 'bootloader')

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 @@
+#             __________               __   ___.
+#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+#   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+#                     \/            \/     \/    \/            \/
+# $Id: Makefile 19082 2008-11-10 23:54:24Z zagor $
+#
+
+INCLUDES += -I$(APPSDIR)
+SRC += $(call preprocess, $(APPSDIR)/SOURCES)
+
+BOOTLDS := $(FIRMDIR)/target/$(CPU)/$(MANUFACTURER)/boot.lds
+BOOTLINK := $(BUILDDIR)/boot.link
+
+CLEANOBJS += $(BUILDDIR)/bootloader.*
+
+.SECONDEXPANSION:
+
+$(BOOTLINK): $(BOOTLDS)
+	$(call PRINTS,PP $(@F))
+	$(call preprocess2file,$<,$@,-DLOADADDRESS=$(LOADADDRESS))
+
+$(BUILDDIR)/bootloader.elf: $$(OBJ) $$(FIRMLIB) $$(BOOTLINK)
+	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \
+		$(FIRMLIB) -lgcc -L$(BUILDDIR)/firmware -T$(BOOTLINK) \
+		 -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map
+
+$(BUILDDIR)/bootloader.bin : $(BUILDDIR)/bootloader.elf
+	$(call PRINTS,OBJCOPY $(@F))$(OC) $(if $(filter yes, $(USE_ELF)), -S -x, -O binary) $< $@
+
+$(BUILDDIR)/bootloader.asm: $(BUILDDIR)/bootloader.bin
+	$(TOOLSDIR)/sh2d -sh1 $< > $@
+
+$(BUILDDIR)/$(BINARY) : $(BUILDDIR)/bootloader.bin
+	$(call PRINTS,Build bootloader file)$(MKFIRMWARE) $< $@
+
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 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "rockboxlogo.h"
+#include "bitmaps/rockboxlogo.h"
 
 #if LCD_WIDTH <= 128
 #define BOOT_VERSION ("Boot " APPSVERSION)
-- 
cgit v1.2.3