From 76083359e08c85f28874a7c07e5332fda2a5b503 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Sun, 16 Jan 2011 01:40:15 +0000 Subject: e200v1 seems to be ok using USB-enabled bootloader. Also, include the bootloader USB .lds into the boot.lds instead of pasting into every one to keep things sane for now-- commented upon inside. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29062 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/sandisk/boot.lds | 6 ++++++ firmware/target/arm/sandisk/sansa-e200/button-e200.c | 4 ++++ 2 files changed, 10 insertions(+) (limited to 'firmware/target/arm/sandisk') diff --git a/firmware/target/arm/sandisk/boot.lds b/firmware/target/arm/sandisk/boot.lds index c0621b8abf..4b8adc8991 100644 --- a/firmware/target/arm/sandisk/boot.lds +++ b/firmware/target/arm/sandisk/boot.lds @@ -1,5 +1,10 @@ #include "config.h" +/* Can't link all Sansa PP devices the same way at this time */ +#ifdef HAVE_BOOTLOADER_USB_MODE +#include "../boot-pp502x-bl-usb.lds" +#else /* !HAVE_BOOTLOADER_USB_MODE */ + ENTRY(start) OUTPUT_FORMAT(elf32-littlearm) OUTPUT_ARCH(arm) @@ -73,3 +78,4 @@ SECTIONS _end = .; } > DRAM } +#endif /* HAVE_BOOTLOADER_USB_MODE */ diff --git a/firmware/target/arm/sandisk/sansa-e200/button-e200.c b/firmware/target/arm/sandisk/sansa-e200/button-e200.c index 52b8949396..1e952b3882 100644 --- a/firmware/target/arm/sandisk/sansa-e200/button-e200.c +++ b/firmware/target/arm/sandisk/sansa-e200/button-e200.c @@ -272,6 +272,10 @@ void clickwheel_int(void) delta = 0x7ful << 24; } } +#else +void clickwheel_int(void) +{ +} #endif /* BOOTLOADER */ /* device buttons */ -- cgit v1.2.3