summaryrefslogtreecommitdiffstats
path: root/bootloader
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2011-06-19 17:23:18 +0000
committerJens Arnold <amiconn@rockbox.org>2011-06-19 17:23:18 +0000
commit91ce4b2a60c4cbe8e3568f79c3a73572461ff40d (patch)
tree863cf4142841fee4dd53e2849d060d2c559cca55 /bootloader
parente9e0cf59085cb3b3d77c8a2962fd8b80ac4d0c9d (diff)
downloadrockbox-91ce4b2a60c4cbe8e3568f79c3a73572461ff40d.tar.gz
rockbox-91ce4b2a60c4cbe8e3568f79c3a73572461ff40d.tar.bz2
rockbox-91ce4b2a60c4cbe8e3568f79c3a73572461ff40d.zip
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
Diffstat (limited to 'bootloader')
-rw-r--r--bootloader/bootloader.make3
-rw-r--r--bootloader/iaudio_coldfire.c16
2 files changed, 10 insertions, 9 deletions
diff --git a/bootloader/bootloader.make b/bootloader/bootloader.make
index 0118235bb7..78b8b438c4 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))
diff --git a/bootloader/iaudio_coldfire.c b/bootloader/iaudio_coldfire.c
index 5639a0e59b..9c829c4a34 100644
--- a/bootloader/iaudio_coldfire.c
+++ b/bootloader/iaudio_coldfire.c
@@ -123,6 +123,10 @@ void check_battery(void)
}
}
+#if defined(IAUDIO_M5) || defined(IAUDIO_X5)
+int initial_gpio_read;
+#endif
+
void main(void)
{
int i;
@@ -144,17 +148,13 @@ void main(void)
if ((GPIO_READ & 0x80000000) == 0)
rc_on_button = true;
#elif defined(IAUDIO_M5) || defined(IAUDIO_X5)
- int data;
-
or_l(0x0e000000, &GPIO_FUNCTION); /* main Hold & Power, remote Play */
and_l(~0x0e000000, &GPIO_ENABLE);
-
- data = GPIO_READ;
-
- if ((data & 0x04000000) == 0)
+
+ if ((initial_gpio_read & 0x04000000) == 0)
on_button = true;
-
- if ((data & 0x02000000) == 0)
+
+ if ((initial_gpio_read & 0x02000000) == 0)
rc_on_button = true;
#endif