From 91ce4b2a60c4cbe8e3568f79c3a73572461ff40d Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Sun, 19 Jun 2011 17:23:18 +0000 Subject: Optional dual-boot support in iAudio X5 and M5 bootloader, based on FS#5289. In order to enable it, #define HAVE_DUALBOOT when building the bootloader. Do not use the automatically created x5_fw.bin or m5_fw.bin, but use mkboot to create a new firmware file from an OF x5_fw.bin resp. m5_fw.bin and bootloader.bin. The dual-boot bootloader boots the OF when pressing Play (main or remote) for more than 3 seconds. Hold it a bit longer because the OF also checks buttons. Short press boots rockbox. As a bonus, the Play button read (for hold check) is done a bit earlier for single-boot mode as well. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30018 a1c6a512-1295-4272-9138-f99709370657 --- bootloader/bootloader.make | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bootloader/bootloader.make') diff --git a/bootloader/bootloader.make b/bootloader/bootloader.make index 0118235..78b8b43 100644 --- a/bootloader/bootloader.make +++ b/bootloader/bootloader.make @@ -10,6 +10,7 @@ INCLUDES += -I$(APPSDIR) SRC += $(call preprocess, $(APPSDIR)/SOURCES) +CONFIGFILE := $(FIRMDIR)/export/config/$(MODELNAME).h BOOTLDS := $(FIRMDIR)/target/$(CPU)/$(MANUFACTURER)/boot.lds BOOTLINK := $(BUILDDIR)/boot.link @@ -17,7 +18,7 @@ CLEANOBJS += $(BUILDDIR)/bootloader.* .SECONDEXPANSION: -$(BOOTLINK): $(BOOTLDS) +$(BOOTLINK): $(BOOTLDS) $(CONFIGFILE) $(call PRINTS,PP $(@F)) $(call preprocess2file,$<,$@,-DLOADADDRESS=$(LOADADDRESS)) -- cgit v1.1