From 02a90890343a75ca71169f601605613607e450ea Mon Sep 17 00:00:00 2001 From: Marcin Bukat Date: Thu, 24 Jan 2013 13:04:57 +0100 Subject: 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 --- firmware/export/config/gogearhdd1630.h | 2 ++ firmware/export/config/ipod4g.h | 2 ++ firmware/export/config/ipodcolor.h | 2 ++ firmware/export/config/ipodmini1g.h | 2 ++ firmware/export/config/ipodmini2g.h | 2 ++ firmware/export/config/ipodvideo.h | 2 ++ firmware/export/config/iriverh10.h | 2 ++ firmware/export/config/iriverh10_5gb.h | 2 ++ firmware/export/config/mrobe100.h | 2 ++ firmware/export/config/samsungyh820.h | 2 ++ firmware/export/config/samsungyh920.h | 2 ++ firmware/export/config/samsungyh925.h | 2 ++ firmware/export/config/tatungtpj1022.h | 2 ++ firmware/export/config/vibe500.h | 2 ++ 14 files changed, 28 insertions(+) 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 @@ /* 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 cb753b27a3..3ec15b7d8c 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 665ea153c2..b844f61ec4 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 16fb08ade1..238c3a66d7 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 dbbd3e4d66..12f63f9e11 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 7f449eb8cf..707c7d973b 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 44cbe538ac..d88de1cb6c 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 305550d468..5df47c9f96 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 2e0ff39607..dd1062b51b 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 50db85a7a7..2f60683a55 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 0512e87dc7..e64af8ff89 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 509e1b344a..c397c8fee2 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 8e658d1d21..eb75b1ce61 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 75804b2a33..29f8da995c 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 -- cgit v1.2.3