summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Bukat <marcin.bukat@gmail.com>2013-01-24 13:04:57 +0100
committerMarcin Bukat <marcin.bukat@gmail.com>2013-01-24 13:04:57 +0100
commit02a90890343a75ca71169f601605613607e450ea (patch)
tree54c4d70aecd3ac2692dbd83584d8188c55c4299d
parentd118f47d24a1791e4d97b7c09cc1188fab0d880e (diff)
downloadrockbox-02a90890343a75ca71169f601605613607e450ea.tar.gz
rockbox-02a90890343a75ca71169f601605613607e450ea.zip
PP: Do not use ATA DMA in bootloader
The build of bootloader with HAVE_ATA_DMA fails because of missing commit_discard_dcache(). This seems to be bigger problem as bootloader builds don't call cache_init() also which seems wrong. but I know too little about the PP platform to judge. For now use ATA DMA only in regular builds. Change-Id: I82873cb1771f5a95ebfbef91ce26744e3abd743c
-rw-r--r--firmware/export/config/gogearhdd1630.h2
-rw-r--r--firmware/export/config/ipod4g.h2
-rw-r--r--firmware/export/config/ipodcolor.h2
-rw-r--r--firmware/export/config/ipodmini1g.h2
-rw-r--r--firmware/export/config/ipodmini2g.h2
-rw-r--r--firmware/export/config/ipodvideo.h2
-rw-r--r--firmware/export/config/iriverh10.h2
-rw-r--r--firmware/export/config/iriverh10_5gb.h2
-rw-r--r--firmware/export/config/mrobe100.h2
-rw-r--r--firmware/export/config/samsungyh820.h2
-rw-r--r--firmware/export/config/samsungyh920.h2
-rw-r--r--firmware/export/config/samsungyh925.h2
-rw-r--r--firmware/export/config/tatungtpj1022.h2
-rw-r--r--firmware/export/config/vibe500.h2
14 files changed, 28 insertions, 0 deletions
diff --git a/firmware/export/config/gogearhdd1630.h b/firmware/export/config/gogearhdd1630.h
index 4a79369f76..6379c26801 100644
--- a/firmware/export/config/gogearhdd1630.h
+++ b/firmware/export/config/gogearhdd1630.h
@@ -204,7 +204,9 @@
204/* DMA is used only for reading on PP502x because although reads are ~8x faster 204/* DMA is used only for reading on PP502x because although reads are ~8x faster
205 * writes appear to be ~25% slower. 205 * writes appear to be ~25% slower.
206 */ 206 */
207#ifndef BOOTLOADER
207#define HAVE_ATA_DMA 208#define HAVE_ATA_DMA
209#endif
208 210
209/* Define this if a programmable hotkey is mapped */ 211/* Define this if a programmable hotkey is mapped */
210#define HAVE_HOTKEY 212#define HAVE_HOTKEY
diff --git a/firmware/export/config/ipod4g.h b/firmware/export/config/ipod4g.h
index cb753b27a3..3ec15b7d8c 100644
--- a/firmware/export/config/ipod4g.h
+++ b/firmware/export/config/ipod4g.h
@@ -228,7 +228,9 @@
228/* DMA is used only for reading on PP502x because although reads are ~8x faster 228/* DMA is used only for reading on PP502x because although reads are ~8x faster
229 * writes appear to be ~25% slower. 229 * writes appear to be ~25% slower.
230 */ 230 */
231#ifndef BOOTLOADER
231#define HAVE_ATA_DMA 232#define HAVE_ATA_DMA
233#endif
232 234
233/* Define this, if you can switch on/off the lineout */ 235/* Define this, if you can switch on/off the lineout */
234#define HAVE_LINEOUT_POWEROFF 236#define HAVE_LINEOUT_POWEROFF
diff --git a/firmware/export/config/ipodcolor.h b/firmware/export/config/ipodcolor.h
index 665ea153c2..b844f61ec4 100644
--- a/firmware/export/config/ipodcolor.h
+++ b/firmware/export/config/ipodcolor.h
@@ -213,7 +213,9 @@
213/* DMA is used only for reading on PP502x because although reads are ~8x faster 213/* DMA is used only for reading on PP502x because although reads are ~8x faster
214 * writes appear to be ~25% slower. 214 * writes appear to be ~25% slower.
215 */ 215 */
216#ifndef BOOTLOADER
216#define HAVE_ATA_DMA 217#define HAVE_ATA_DMA
218#endif
217 219
218/* Define this, if you can switch on/off the lineout */ 220/* Define this, if you can switch on/off the lineout */
219#define HAVE_LINEOUT_POWEROFF 221#define HAVE_LINEOUT_POWEROFF
diff --git a/firmware/export/config/ipodmini1g.h b/firmware/export/config/ipodmini1g.h
index 16fb08ade1..238c3a66d7 100644
--- a/firmware/export/config/ipodmini1g.h
+++ b/firmware/export/config/ipodmini1g.h
@@ -215,7 +215,9 @@
215/* DMA is used only for reading on PP502x because although reads are ~8x faster 215/* DMA is used only for reading on PP502x because although reads are ~8x faster
216 * writes appear to be ~25% slower. 216 * writes appear to be ~25% slower.
217 */ 217 */
218#ifndef BOOTLOADER
218#define HAVE_ATA_DMA 219#define HAVE_ATA_DMA
220#endif
219 221
220/* Define this if a programmable hotkey is mapped */ 222/* Define this if a programmable hotkey is mapped */
221#define HAVE_HOTKEY 223#define HAVE_HOTKEY
diff --git a/firmware/export/config/ipodmini2g.h b/firmware/export/config/ipodmini2g.h
index dbbd3e4d66..12f63f9e11 100644
--- a/firmware/export/config/ipodmini2g.h
+++ b/firmware/export/config/ipodmini2g.h
@@ -218,7 +218,9 @@
218/* DMA is used only for reading on PP502x because although reads are ~8x faster 218/* DMA is used only for reading on PP502x because although reads are ~8x faster
219 * writes appear to be ~25% slower. 219 * writes appear to be ~25% slower.
220 */ 220 */
221#ifndef BOOTLOADER
221#define HAVE_ATA_DMA 222#define HAVE_ATA_DMA
223#endif
222 224
223/* Define this if a programmable hotkey is mapped */ 225/* Define this if a programmable hotkey is mapped */
224#define HAVE_HOTKEY 226#define HAVE_HOTKEY
diff --git a/firmware/export/config/ipodvideo.h b/firmware/export/config/ipodvideo.h
index 7f449eb8cf..707c7d973b 100644
--- a/firmware/export/config/ipodvideo.h
+++ b/firmware/export/config/ipodvideo.h
@@ -239,7 +239,9 @@
239/* DMA is used only for reading on PP502x because although reads are ~8x faster 239/* DMA is used only for reading on PP502x because although reads are ~8x faster
240 * writes appear to be ~25% slower. 240 * writes appear to be ~25% slower.
241 */ 241 */
242#ifndef BOOTLOADER
242#define HAVE_ATA_DMA 243#define HAVE_ATA_DMA
244#endif
243 245
244/* Define this if a programmable hotkey is mapped */ 246/* Define this if a programmable hotkey is mapped */
245#define HAVE_HOTKEY 247#define HAVE_HOTKEY
diff --git a/firmware/export/config/iriverh10.h b/firmware/export/config/iriverh10.h
index 44cbe538ac..d88de1cb6c 100644
--- a/firmware/export/config/iriverh10.h
+++ b/firmware/export/config/iriverh10.h
@@ -193,7 +193,9 @@
193/* DMA is used only for reading on PP502x because although reads are ~8x faster 193/* DMA is used only for reading on PP502x because although reads are ~8x faster
194 * writes appear to be ~25% slower. 194 * writes appear to be ~25% slower.
195 */ 195 */
196#ifndef BOOTLOADER
196#define HAVE_ATA_DMA 197#define HAVE_ATA_DMA
198#endif
197 199
198/* Define this if a programmable hotkey is mapped */ 200/* Define this if a programmable hotkey is mapped */
199#define HAVE_HOTKEY 201#define HAVE_HOTKEY
diff --git a/firmware/export/config/iriverh10_5gb.h b/firmware/export/config/iriverh10_5gb.h
index 305550d468..5df47c9f96 100644
--- a/firmware/export/config/iriverh10_5gb.h
+++ b/firmware/export/config/iriverh10_5gb.h
@@ -181,7 +181,9 @@
181/* DMA is used only for reading on PP502x because although reads are ~8x faster 181/* DMA is used only for reading on PP502x because although reads are ~8x faster
182 * writes appear to be ~25% slower. 182 * writes appear to be ~25% slower.
183 */ 183 */
184#ifndef BOOTLOADER
184#define HAVE_ATA_DMA 185#define HAVE_ATA_DMA
186#endif
185 187
186/* Define this if a programmable hotkey is mapped */ 188/* Define this if a programmable hotkey is mapped */
187#define HAVE_HOTKEY 189#define HAVE_HOTKEY
diff --git a/firmware/export/config/mrobe100.h b/firmware/export/config/mrobe100.h
index 2e0ff39607..dd1062b51b 100644
--- a/firmware/export/config/mrobe100.h
+++ b/firmware/export/config/mrobe100.h
@@ -204,7 +204,9 @@
204/* DMA is used only for reading on PP502x because although reads are ~8x faster 204/* DMA is used only for reading on PP502x because although reads are ~8x faster
205 * writes appear to be ~25% slower. 205 * writes appear to be ~25% slower.
206 */ 206 */
207#ifndef BOOTLOADER
207#define HAVE_ATA_DMA 208#define HAVE_ATA_DMA
209#endif
208 210
209/* Define this if a programmable hotkey is mapped */ 211/* Define this if a programmable hotkey is mapped */
210#define HAVE_HOTKEY 212#define HAVE_HOTKEY
diff --git a/firmware/export/config/samsungyh820.h b/firmware/export/config/samsungyh820.h
index 50db85a7a7..2f60683a55 100644
--- a/firmware/export/config/samsungyh820.h
+++ b/firmware/export/config/samsungyh820.h
@@ -185,7 +185,9 @@
185/* DMA is used only for reading on PP502x because although reads are ~8x faster 185/* DMA is used only for reading on PP502x because although reads are ~8x faster
186 * writes appear to be ~25% slower. 186 * writes appear to be ~25% slower.
187 */ 187 */
188#ifndef BOOTLOADER
188#define HAVE_ATA_DMA 189#define HAVE_ATA_DMA
190#endif
189 191
190/* Define this if a programmable hotkey is mapped */ 192/* Define this if a programmable hotkey is mapped */
191#define HAVE_HOTKEY 193#define HAVE_HOTKEY
diff --git a/firmware/export/config/samsungyh920.h b/firmware/export/config/samsungyh920.h
index 0512e87dc7..e64af8ff89 100644
--- a/firmware/export/config/samsungyh920.h
+++ b/firmware/export/config/samsungyh920.h
@@ -191,7 +191,9 @@
191/* DMA is used only for reading on PP502x because although reads are ~8x faster 191/* DMA is used only for reading on PP502x because although reads are ~8x faster
192 * writes appear to be ~25% slower. 192 * writes appear to be ~25% slower.
193 */ 193 */
194#ifndef BOOTLOADER
194#define HAVE_ATA_DMA 195#define HAVE_ATA_DMA
196#endif
195 197
196/* Define this if a programmable hotkey is mapped */ 198/* Define this if a programmable hotkey is mapped */
197#define HAVE_HOTKEY 199#define HAVE_HOTKEY
diff --git a/firmware/export/config/samsungyh925.h b/firmware/export/config/samsungyh925.h
index 509e1b344a..c397c8fee2 100644
--- a/firmware/export/config/samsungyh925.h
+++ b/firmware/export/config/samsungyh925.h
@@ -189,7 +189,9 @@
189/* DMA is used only for reading on PP502x because although reads are ~8x faster 189/* DMA is used only for reading on PP502x because although reads are ~8x faster
190 * writes appear to be ~25% slower. 190 * writes appear to be ~25% slower.
191 */ 191 */
192#ifndef BOOTLOADER
192#define HAVE_ATA_DMA 193#define HAVE_ATA_DMA
194#endif
193 195
194/* Define this if a programmable hotkey is mapped */ 196/* Define this if a programmable hotkey is mapped */
195#define HAVE_HOTKEY 197#define HAVE_HOTKEY
diff --git a/firmware/export/config/tatungtpj1022.h b/firmware/export/config/tatungtpj1022.h
index 8e658d1d21..eb75b1ce61 100644
--- a/firmware/export/config/tatungtpj1022.h
+++ b/firmware/export/config/tatungtpj1022.h
@@ -141,7 +141,9 @@
141/* DMA is used only for reading on PP502x because although reads are ~8x faster 141/* DMA is used only for reading on PP502x because although reads are ~8x faster
142 * writes appear to be ~25% slower. 142 * writes appear to be ~25% slower.
143 */ 143 */
144#ifndef BOOTLOADER
144#define HAVE_ATA_DMA 145#define HAVE_ATA_DMA
146#endif
145 147
146/* Define this if a programmable hotkey is mapped */ 148/* Define this if a programmable hotkey is mapped */
147//#define HAVE_HOTKEY 149//#define HAVE_HOTKEY
diff --git a/firmware/export/config/vibe500.h b/firmware/export/config/vibe500.h
index 75804b2a33..29f8da995c 100644
--- a/firmware/export/config/vibe500.h
+++ b/firmware/export/config/vibe500.h
@@ -199,7 +199,9 @@
199/* DMA is used only for reading on PP502x because although reads are ~8x faster 199/* DMA is used only for reading on PP502x because although reads are ~8x faster
200 * writes appear to be ~25% slower. 200 * writes appear to be ~25% slower.
201 */ 201 */
202#ifndef BOOTLOADER
202#define HAVE_ATA_DMA 203#define HAVE_ATA_DMA
204#endif
203 205
204/* Define this if a programmable hotkey is mapped */ 206/* Define this if a programmable hotkey is mapped */
205#define HAVE_HOTKEY 207#define HAVE_HOTKEY