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.zip
rockbox-02a90890343a75ca71169f601605613607e450ea.tar.gz
rockbox-02a90890343a75ca71169f601605613607e450ea.tar.bz2
rockbox-02a90890343a75ca71169f601605613607e450ea.tar.xz
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 4a79369..6379c26 100644
--- a/firmware/export/config/gogearhdd1630.h
+++ b/firmware/export/config/gogearhdd1630.h
@@ -204,7 +204,9 @@
/* DMA is used only for reading on PP502x because although reads are ~8x faster
* writes appear to be ~25% slower.
*/
+#ifndef BOOTLOADER
#define HAVE_ATA_DMA
+#endif
/* Define this if a programmable hotkey is mapped */
#define HAVE_HOTKEY
diff --git a/firmware/export/config/ipod4g.h b/firmware/export/config/ipod4g.h
index cb753b2..3ec15b7 100644
--- a/firmware/export/config/ipod4g.h
+++ b/firmware/export/config/ipod4g.h
@@ -228,7 +228,9 @@
/* DMA is used only for reading on PP502x because although reads are ~8x faster
* writes appear to be ~25% slower.
*/
+#ifndef BOOTLOADER
#define HAVE_ATA_DMA
+#endif
/* Define this, if you can switch on/off the lineout */
#define HAVE_LINEOUT_POWEROFF
diff --git a/firmware/export/config/ipodcolor.h b/firmware/export/config/ipodcolor.h
index 665ea15..b844f61 100644
--- a/firmware/export/config/ipodcolor.h
+++ b/firmware/export/config/ipodcolor.h
@@ -213,7 +213,9 @@
/* DMA is used only for reading on PP502x because although reads are ~8x faster
* writes appear to be ~25% slower.
*/
+#ifndef BOOTLOADER
#define HAVE_ATA_DMA
+#endif
/* Define this, if you can switch on/off the lineout */
#define HAVE_LINEOUT_POWEROFF
diff --git a/firmware/export/config/ipodmini1g.h b/firmware/export/config/ipodmini1g.h
index 16fb08a..238c3a6 100644
--- a/firmware/export/config/ipodmini1g.h
+++ b/firmware/export/config/ipodmini1g.h
@@ -215,7 +215,9 @@
/* DMA is used only for reading on PP502x because although reads are ~8x faster
* writes appear to be ~25% slower.
*/
+#ifndef BOOTLOADER
#define HAVE_ATA_DMA
+#endif
/* Define this if a programmable hotkey is mapped */
#define HAVE_HOTKEY
diff --git a/firmware/export/config/ipodmini2g.h b/firmware/export/config/ipodmini2g.h
index dbbd3e4..12f63f9 100644
--- a/firmware/export/config/ipodmini2g.h
+++ b/firmware/export/config/ipodmini2g.h
@@ -218,7 +218,9 @@
/* DMA is used only for reading on PP502x because although reads are ~8x faster
* writes appear to be ~25% slower.
*/
+#ifndef BOOTLOADER
#define HAVE_ATA_DMA
+#endif
/* Define this if a programmable hotkey is mapped */
#define HAVE_HOTKEY
diff --git a/firmware/export/config/ipodvideo.h b/firmware/export/config/ipodvideo.h
index 7f449eb..707c7d9 100644
--- a/firmware/export/config/ipodvideo.h
+++ b/firmware/export/config/ipodvideo.h
@@ -239,7 +239,9 @@
/* DMA is used only for reading on PP502x because although reads are ~8x faster
* writes appear to be ~25% slower.
*/
+#ifndef BOOTLOADER
#define HAVE_ATA_DMA
+#endif
/* Define this if a programmable hotkey is mapped */
#define HAVE_HOTKEY
diff --git a/firmware/export/config/iriverh10.h b/firmware/export/config/iriverh10.h
index 44cbe53..d88de1c 100644
--- a/firmware/export/config/iriverh10.h
+++ b/firmware/export/config/iriverh10.h
@@ -193,7 +193,9 @@
/* DMA is used only for reading on PP502x because although reads are ~8x faster
* writes appear to be ~25% slower.
*/
+#ifndef BOOTLOADER
#define HAVE_ATA_DMA
+#endif
/* Define this if a programmable hotkey is mapped */
#define HAVE_HOTKEY
diff --git a/firmware/export/config/iriverh10_5gb.h b/firmware/export/config/iriverh10_5gb.h
index 305550d..5df47c9 100644
--- a/firmware/export/config/iriverh10_5gb.h
+++ b/firmware/export/config/iriverh10_5gb.h
@@ -181,7 +181,9 @@
/* DMA is used only for reading on PP502x because although reads are ~8x faster
* writes appear to be ~25% slower.
*/
+#ifndef BOOTLOADER
#define HAVE_ATA_DMA
+#endif
/* Define this if a programmable hotkey is mapped */
#define HAVE_HOTKEY
diff --git a/firmware/export/config/mrobe100.h b/firmware/export/config/mrobe100.h
index 2e0ff39..dd1062b 100644
--- a/firmware/export/config/mrobe100.h
+++ b/firmware/export/config/mrobe100.h
@@ -204,7 +204,9 @@
/* DMA is used only for reading on PP502x because although reads are ~8x faster
* writes appear to be ~25% slower.
*/
+#ifndef BOOTLOADER
#define HAVE_ATA_DMA
+#endif
/* Define this if a programmable hotkey is mapped */
#define HAVE_HOTKEY
diff --git a/firmware/export/config/samsungyh820.h b/firmware/export/config/samsungyh820.h
index 50db85a..2f60683 100644
--- a/firmware/export/config/samsungyh820.h
+++ b/firmware/export/config/samsungyh820.h
@@ -185,7 +185,9 @@
/* DMA is used only for reading on PP502x because although reads are ~8x faster
* writes appear to be ~25% slower.
*/
+#ifndef BOOTLOADER
#define HAVE_ATA_DMA
+#endif
/* Define this if a programmable hotkey is mapped */
#define HAVE_HOTKEY
diff --git a/firmware/export/config/samsungyh920.h b/firmware/export/config/samsungyh920.h
index 0512e87..e64af8f 100644
--- a/firmware/export/config/samsungyh920.h
+++ b/firmware/export/config/samsungyh920.h
@@ -191,7 +191,9 @@
/* DMA is used only for reading on PP502x because although reads are ~8x faster
* writes appear to be ~25% slower.
*/
+#ifndef BOOTLOADER
#define HAVE_ATA_DMA
+#endif
/* Define this if a programmable hotkey is mapped */
#define HAVE_HOTKEY
diff --git a/firmware/export/config/samsungyh925.h b/firmware/export/config/samsungyh925.h
index 509e1b3..c397c8f 100644
--- a/firmware/export/config/samsungyh925.h
+++ b/firmware/export/config/samsungyh925.h
@@ -189,7 +189,9 @@
/* DMA is used only for reading on PP502x because although reads are ~8x faster
* writes appear to be ~25% slower.
*/
+#ifndef BOOTLOADER
#define HAVE_ATA_DMA
+#endif
/* Define this if a programmable hotkey is mapped */
#define HAVE_HOTKEY
diff --git a/firmware/export/config/tatungtpj1022.h b/firmware/export/config/tatungtpj1022.h
index 8e658d1..eb75b1c 100644
--- a/firmware/export/config/tatungtpj1022.h
+++ b/firmware/export/config/tatungtpj1022.h
@@ -141,7 +141,9 @@
/* DMA is used only for reading on PP502x because although reads are ~8x faster
* writes appear to be ~25% slower.
*/
+#ifndef BOOTLOADER
#define HAVE_ATA_DMA
+#endif
/* Define this if a programmable hotkey is mapped */
//#define HAVE_HOTKEY
diff --git a/firmware/export/config/vibe500.h b/firmware/export/config/vibe500.h
index 75804b2..29f8da9 100644
--- a/firmware/export/config/vibe500.h
+++ b/firmware/export/config/vibe500.h
@@ -199,7 +199,9 @@
/* DMA is used only for reading on PP502x because although reads are ~8x faster
* writes appear to be ~25% slower.
*/
+#ifndef BOOTLOADER
#define HAVE_ATA_DMA
+#endif
/* Define this if a programmable hotkey is mapped */
#define HAVE_HOTKEY