From f6bc19158e1bd5f700834a36fb9f6064e444ef9c Mon Sep 17 00:00:00 2001 From: Karl Kurbjun Date: Wed, 17 Oct 2007 05:19:20 +0000 Subject: [PATCH] Turns out you can boot the main build by copying apps/rockbox.bin to /rockbox.mrboot. Something is wrong with the rockbox bootloader, but at least now we can work with the main build. Added in a warning for the core_sleep function git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15162 a1c6a512-1295-4272-9138-f99709370657 --- bootloader/mrobe500.c | 2 +- firmware/target/arm/tms320dm320/spi-dm320.c | 2 +- firmware/thread.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bootloader/mrobe500.c b/bootloader/mrobe500.c index 6a31dc22d0..1d7109c77d 100755 --- a/bootloader/mrobe500.c +++ b/bootloader/mrobe500.c @@ -212,7 +212,7 @@ void main(void) printf("Loading firmware"); loadbuffer = (unsigned char*) 0x00900000; - buffer_size = (unsigned char*)0x04900000 - loadbuffer; + buffer_size = (unsigned char*)0x01900000 - loadbuffer; rc = load_firmware(loadbuffer, BOOTFILE, buffer_size); if(rc < 0) diff --git a/firmware/target/arm/tms320dm320/spi-dm320.c b/firmware/target/arm/tms320dm320/spi-dm320.c index b36456b520..e9dd2e01a3 100644 --- a/firmware/target/arm/tms320dm320/spi-dm320.c +++ b/firmware/target/arm/tms320dm320/spi-dm320.c @@ -31,7 +31,7 @@ #define GIO_TS_ENABLE (1<<2) #define GIO_RTC_ENABLE (1<<12) -struct mutex spi_lock; +struct spinlock spi_lock; struct SPI_info { volatile unsigned short *setreg; diff --git a/firmware/thread.c b/firmware/thread.c index 1265877d68..f9d8e01499 100644 --- a/firmware/thread.c +++ b/firmware/thread.c @@ -608,7 +608,8 @@ static inline void core_sleep(struct thread_entry **waking) #else static inline void core_sleep(struct thread_entry **waking) { - + (void) waking; +#warning core_sleep not implemented, battery life will be decreased } #endif /* CONFIG_CPU == */