diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/app.lds | 2 | ||||
-rw-r--r-- | firmware/common/disk.c | 7 | ||||
-rw-r--r-- | firmware/export/config-gigabeat-s.h | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/system-target.h | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/firmware/app.lds b/firmware/app.lds index d88ce9fd60..87f3d2ae23 100644 --- a/firmware/app.lds +++ b/firmware/app.lds | |||
@@ -70,7 +70,7 @@ INPUT(target/sh/crt0.o) | |||
70 | #define IRAMORIG 0x00000000 | 70 | #define IRAMORIG 0x00000000 |
71 | #define IRAMSIZE 0x4000 | 71 | #define IRAMSIZE 0x4000 |
72 | #elif CONFIG_CPU==IMX31L | 72 | #elif CONFIG_CPU==IMX31L |
73 | #define DRAMORIG (0x80000000 + STUBOFFSET) | 73 | #define DRAMORIG (0x88000000 + STUBOFFSET) |
74 | #define IRAMORIG 0x1FFFC000 | 74 | #define IRAMORIG 0x1FFFC000 |
75 | #define IRAMSIZE 0x4000 | 75 | #define IRAMSIZE 0x4000 |
76 | #else | 76 | #else |
diff --git a/firmware/common/disk.c b/firmware/common/disk.c index 563bb05ec1..e3cf8391ed 100644 --- a/firmware/common/disk.c +++ b/firmware/common/disk.c | |||
@@ -150,7 +150,12 @@ int disk_mount(int drive) | |||
150 | /* The Elio's hard drive has no partition table and probing for partitions causes | 150 | /* The Elio's hard drive has no partition table and probing for partitions causes |
151 | Rockbox to crash - so we temporarily disable the probing until we fix the | 151 | Rockbox to crash - so we temporarily disable the probing until we fix the |
152 | real problem. */ | 152 | real problem. */ |
153 | for (i=0; volume != -1 && i<4; i++) | 153 | #ifdef TOSHIBA_GIGABEAT_S |
154 | i = 1; /* For the Gigabeat S, we mount the second partition */ | ||
155 | #else | ||
156 | i = 0; | ||
157 | #endif | ||
158 | for (i; volume != -1 && i<4; i++) | ||
154 | { | 159 | { |
155 | #ifdef MAX_LOG_SECTOR_SIZE | 160 | #ifdef MAX_LOG_SECTOR_SIZE |
156 | int j; | 161 | int j; |
diff --git a/firmware/export/config-gigabeat-s.h b/firmware/export/config-gigabeat-s.h index 285b381480..c6de206d8c 100644 --- a/firmware/export/config-gigabeat-s.h +++ b/firmware/export/config-gigabeat-s.h | |||
@@ -6,7 +6,7 @@ | |||
6 | #define TOSHIBA_GIGABEAT_S 1 | 6 | #define TOSHIBA_GIGABEAT_S 1 |
7 | 7 | ||
8 | /* For Rolo and boot loader */ | 8 | /* For Rolo and boot loader */ |
9 | #define MODEL_NUMBER 19 | 9 | #define MODEL_NUMBER 21 |
10 | 10 | ||
11 | /* define this if you have a bitmap LCD display */ | 11 | /* define this if you have a bitmap LCD display */ |
12 | #define HAVE_LCD_BITMAP | 12 | #define HAVE_LCD_BITMAP |
diff --git a/firmware/target/arm/imx31/gigabeat-s/system-target.h b/firmware/target/arm/imx31/gigabeat-s/system-target.h index b1803d01cb..e87b93b13a 100644 --- a/firmware/target/arm/imx31/gigabeat-s/system-target.h +++ b/firmware/target/arm/imx31/gigabeat-s/system-target.h | |||
@@ -30,6 +30,8 @@ static inline void udelay(unsigned int usecs) | |||
30 | while (EPITCNT1 > stop); | 30 | while (EPITCNT1 > stop); |
31 | } | 31 | } |
32 | 32 | ||
33 | #define __dbg_hw_info(...) 0 | ||
34 | #define __dbg_ports(...) 0 | ||
33 | 35 | ||
34 | #define HAVE_INVALIDATE_ICACHE | 36 | #define HAVE_INVALIDATE_ICACHE |
35 | static inline void invalidate_icache(void) | 37 | static inline void invalidate_icache(void) |