summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Kurbjun <kkurbjun@gmail.com>2007-10-17 05:19:20 +0000
committerKarl Kurbjun <kkurbjun@gmail.com>2007-10-17 05:19:20 +0000
commitf6bc19158e1bd5f700834a36fb9f6064e444ef9c (patch)
tree78d8c4f11aedc31317cd73368c4b1accfb454465
parentc3584c0d636c8c9abbfd5ee6980c21e935bea512 (diff)
downloadrockbox-f6bc19158e1bd5f700834a36fb9f6064e444ef9c.zip
rockbox-f6bc19158e1bd5f700834a36fb9f6064e444ef9c.tar.gz
rockbox-f6bc19158e1bd5f700834a36fb9f6064e444ef9c.tar.bz2
rockbox-f6bc19158e1bd5f700834a36fb9f6064e444ef9c.tar.xz
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
-rwxr-xr-xbootloader/mrobe500.c2
-rw-r--r--firmware/target/arm/tms320dm320/spi-dm320.c2
-rw-r--r--firmware/thread.c3
3 files changed, 4 insertions, 3 deletions
diff --git a/bootloader/mrobe500.c b/bootloader/mrobe500.c
index 6a31dc2..1d7109c 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 b36456b..e9dd2e0 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 1265877..f9d8e01 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 == */