Swap red and yellow for green on r31339's cranky builds.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31340 a1c6a512-1295-4272-9138-f99709370657
diff --git a/bootloader/sansa_as3525.c b/bootloader/sansa_as3525.c
index c384007..c21f51a 100644
--- a/bootloader/sansa_as3525.c
+++ b/bootloader/sansa_as3525.c
@@ -158,7 +158,7 @@
}
kernel_entry = (void*) loadbuffer;
- cpucache_invalidate();
+ commit_discard_idcache();
printf("Executing");
kernel_entry();
printf("ERR: Failed to boot");
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c
index 9261e5b..1698dc2 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c
@@ -230,7 +230,7 @@
DMACOM3 = DMACOM_CLEARBOTHDONE;
DMABASE3 = (uint32_t)buffer;
DMATCNT3 = (size >> 4) - 1;
- clean_dcache();
+ commit_dcache();
DMACOM3 = 4;
}
@@ -239,7 +239,7 @@
long timeout = current_tick + HZ / 50;
while ((DMAALLST & DMAALLST_DMABUSY3))
if (nand_timeout(timeout)) return 1;
- if (!direction) invalidate_dcache();
+ if (!direction) commit_discard_dcache();
if (nand_wait_addrdone()) return 1;
if (!direction) FMCTRL1 = FMCTRL1_CLEARRFIFO | FMCTRL1_CLEARWFIFO;
else FMCTRL1 = FMCTRL1_CLEARRFIFO;
@@ -263,7 +263,7 @@
ECC_UNK1 = size;
ECC_DATA_PTR = (uint32_t)databuffer;
ECC_SPARE_PTR = (uint32_t)sparebuffer;
- clean_dcache();
+ commit_dcache();
ECC_CTRL = type;
}
@@ -272,7 +272,7 @@
long timeout = current_tick + HZ / 50;
while (!(SRCPND & INTMSK_ECC))
if (nand_timeout(timeout)) return ecc_unlock(1);
- invalidate_dcache();
+ commit_discard_dcache();
ECC_INT_CLR = 1;
SRCPND = INTMSK_ECC;
return ecc_unlock(ECC_RESULT);
diff --git a/firmware/target/arm/s5l8700/pcm-s5l8700.c b/firmware/target/arm/s5l8700/pcm-s5l8700.c
index 6d733e0..7b4258f 100644
--- a/firmware/target/arm/s5l8700/pcm-s5l8700.c
+++ b/firmware/target/arm/s5l8700/pcm-s5l8700.c
@@ -127,7 +127,7 @@
DMATCNT0 = nextsize / 2 - 1;
nextsize = 0;
}
- clean_dcache();
+ commit_dcache();
DMACOM0 = 4;
DMACOM0 = 7;
diff --git a/firmware/target/arm/s5l8702/ipod6g/lcd-ipod6g.c b/firmware/target/arm/s5l8702/ipod6g/lcd-ipod6g.c
index 3cc2c9d..e7a9cf4 100644
--- a/firmware/target/arm/s5l8702/ipod6g/lcd-ipod6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/lcd-ipod6g.c
@@ -232,7 +232,7 @@
| (last ? 0x80000000 : 0) | 0x4000000;
data += 0x1ffe;
}
- clean_dcache();
+ commit_dcache();
DMAC0C4CONFIG = 0x88c1;
mutex_unlock(&lcd_mutex);
}
diff --git a/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c b/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c
index 42fa0c2..2952c36 100644
--- a/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c
@@ -333,7 +333,7 @@
SDCI_DMACOUNT = 1;
SDCI_DMAADDR = dest;
SDCI_DCTRL = SDCI_DCTRL_TXFIFORST | SDCI_DCTRL_RXFIFORST;
- invalidate_dcache();
+ commit_discard_dcache();
PASS_RC(mmc_send_command(SDCI_CMD_CMD_NUM(MMC_CMD_CEATA_RW_MULTIPLE_REG)
| SDCI_CMD_CMD_TYPE_ADTC | SDCI_CMD_RES_TYPE_R1
| SDCI_CMD_RES_SIZE_48 | SDCI_CMD_NCR_NID_NCR,
@@ -477,7 +477,7 @@
SDCI_DMAADDR = buf;
SDCI_DMACOUNT = count;
SDCI_DCTRL = SDCI_DCTRL_TXFIFORST | SDCI_DCTRL_RXFIFORST;
- invalidate_dcache();
+ commit_discard_dcache();
PASS_RC(mmc_send_command(SDCI_CMD_CMD_NUM(MMC_CMD_CEATA_RW_MULTIPLE_BLOCK)
| SDCI_CMD_CMD_TYPE_ADTC | cmdtype | responsetype
| SDCI_CMD_RES_SIZE_48 | SDCI_CMD_NCR_NID_NCR,
@@ -883,8 +883,8 @@
if (sector + count > ata_total_sectors) RET_ERR(0);
if (!ata_powered) ata_power_up();
ata_set_active();
- if (ata_dma && write) clean_dcache();
- else if (ata_dma) invalidate_dcache();
+ if (ata_dma && write) commit_dcache();
+ else if (ata_dma) commit_discard_dcache();
if (!ceata) ATA_COMMAND = BIT(1);
while (count)
{
diff --git a/firmware/target/arm/s5l8702/pcm-s5l8702.c b/firmware/target/arm/s5l8702/pcm-s5l8702.c
index 6461418..52a040c 100644
--- a/firmware/target/arm/s5l8702/pcm-s5l8702.c
+++ b/firmware/target/arm/s5l8702/pcm-s5l8702.c
@@ -72,7 +72,7 @@
{
pcm_lli->nextlli = NULL;
pcm_lli->control = 0x75249000;
- clean_dcache();
+ commit_dcache();
return;
}
uint32_t lastsize = MIN(PCM_WATERMARK * 4, pcm_remaining / 2 + 1) & ~1;
@@ -107,7 +107,7 @@
lastlli->nextlli = last ? NULL : pcm_lli;
lastlli->control = (last ? 0xf5249000 : 0x75249000) | (lastsize / 2);
dataptr += lastsize;
- clean_dcache();
+ commit_dcache();
if (!(DMAC0C0CONFIG & 1) && (pcm_lli[0].control & 0xfff))
{
DMAC0C0LLI = pcm_lli[0];
diff --git a/firmware/target/arm/usb-s3c6400x.c b/firmware/target/arm/usb-s3c6400x.c
index af4f0eb..beac237 100644
--- a/firmware/target/arm/usb-s3c6400x.c
+++ b/firmware/target/arm/usb-s3c6400x.c
@@ -176,7 +176,7 @@
if (epints & DEPINT_xfercompl)
{
- invalidate_dcache();
+ commit_discard_dcache();
int bytes = endpoints[ep].size - (DEPTSIZ(ep, out) & (DEPTSIZ_xfersize_bits < DEPTSIZ_xfersize_bitp));
if (endpoints[ep].busy)
{
@@ -204,7 +204,7 @@
if (out && (epints & DOEPINT_setup))
{
- invalidate_dcache();
+ commit_discard_dcache();
if (ep != 0)
panicf("USB: SETUP done on OUT EP%d!?", ep);
@@ -281,7 +281,7 @@
DEPTSIZ(ep, out) = length | (packets << DEPTSIZ0_pkcnt_bitp);
DEPDMA(ep, out) = length ? ptr : NULL;
- clean_dcache();
+ commit_dcache();
DEPCTL(ep, out) |= DEPCTL_epena | DEPCTL_cnak;
}