Index: firmware/export/config-gigabeat-s.h
===================================================================
--- firmware/export/config-gigabeat-s.h	(révision 15835)
+++ firmware/export/config-gigabeat-s.h	(copie de travail)
@@ -6,7 +6,7 @@
 #define TOSHIBA_GIGABEAT_S 1
 
 /* For Rolo and boot loader */
-#define MODEL_NUMBER 19
+#define MODEL_NUMBER 21
 
 /* define this if you have a bitmap LCD display */
 #define HAVE_LCD_BITMAP
Index: firmware/target/arm/imx31/gigabeat-s/system-target.h
===================================================================
--- firmware/target/arm/imx31/gigabeat-s/system-target.h	(révision 15835)
+++ firmware/target/arm/imx31/gigabeat-s/system-target.h	(copie de travail)
@@ -30,6 +30,8 @@
     while (EPITCNT1 > stop);
 }
 
+#define __dbg_hw_info(...) 0
+#define __dbg_ports(...) 0
 
 #define HAVE_INVALIDATE_ICACHE
 static inline void invalidate_icache(void)
Index: firmware/app.lds
===================================================================
--- firmware/app.lds	(révision 15835)
+++ firmware/app.lds	(copie de travail)
@@ -70,7 +70,7 @@
 #define IRAMORIG 0x00000000
 #define IRAMSIZE 0x4000
 #elif CONFIG_CPU==IMX31L
-#define DRAMORIG (0x80000000 + STUBOFFSET)
+#define DRAMORIG (0x88000000 + STUBOFFSET)
 #define IRAMORIG 0x1FFFC000
 #define IRAMSIZE 0x4000
 #else
Index: bootloader/gigabeat-s.c
===================================================================
--- bootloader/gigabeat-s.c	(révision 15835)
+++ bootloader/gigabeat-s.c	(copie de travail)
@@ -47,6 +47,7 @@
 #include <stdarg.h>
 
 char version[] = APPSVERSION;
+int (*kernel_entry)(void);
 
 void main(void)
 {
@@ -72,14 +73,14 @@
     }
 
     printf("Congratulations!");
-    while(1);
 
-#if 0
     printf("Loading firmware");
 
-    loadbuffer = (unsigned char*) 0x100;
-    buffer_size = (unsigned char*)0x400000 - loadbuffer;
+    unsigned char *loadbuffer = (unsigned char *)0x88000000;
+    int buffer_size = 1024*1024;
 
+#undef BOOTFILE
+#define BOOTFILE "/Content/0b00/00/05"
     rc = load_firmware(loadbuffer, BOOTFILE, buffer_size);
     if(rc < 0)
         error(EBOOTFILE, rc);
@@ -89,6 +90,7 @@
         kernel_entry = (void*) loadbuffer;
         rc = kernel_entry();
     }
-#endif
+
+    while (1);
 }