summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2010-04-13 15:50:08 +0000
committerRafaël Carré <rafael.carre@gmail.com>2010-04-13 15:50:08 +0000
commit680fcd827d1449fdfcb555f54c11d553b8f9f581 (patch)
treea31c6424c1fcb4529d641218dc0a1ab7bec503f0
parentd0af7f9601f9f1c9fe59829f1c8c402c04200b2f (diff)
downloadrockbox-680fcd827d1449fdfcb555f54c11d553b8f9f581.tar.gz
rockbox-680fcd827d1449fdfcb555f54c11d553b8f9f581.zip
Move CACHEALIGN_BITS to cpu headers
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25633 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/export/pp5002.h3
-rw-r--r--firmware/export/pp5020.h2
-rw-r--r--firmware/export/s5l8700.h2
-rw-r--r--firmware/target/arm/s5l8700/system-target.h1
-rw-r--r--firmware/target/arm/system-target.h1
5 files changed, 7 insertions, 2 deletions
diff --git a/firmware/export/pp5002.h b/firmware/export/pp5002.h
index b0c31d9474..95cc8d5058 100644
--- a/firmware/export/pp5002.h
+++ b/firmware/export/pp5002.h
@@ -22,6 +22,9 @@
22#define __PP5002_H__ 22#define __PP5002_H__
23 23
24/* Much info gleaned and/or copied from the iPodLinux project. */ 24/* Much info gleaned and/or copied from the iPodLinux project. */
25
26#define CACHEALIGN_BITS (4) /* 2^4 = 16 bytes */
27
25#define DRAM_START 0x28000000 28#define DRAM_START 0x28000000
26 29
27/* LCD bridge */ 30/* LCD bridge */
diff --git a/firmware/export/pp5020.h b/firmware/export/pp5020.h
index 2d8d0e1802..5b5864f4e1 100644
--- a/firmware/export/pp5020.h
+++ b/firmware/export/pp5020.h
@@ -23,6 +23,8 @@
23 23
24/* All info gleaned and/or copied from the iPodLinux project. */ 24/* All info gleaned and/or copied from the iPodLinux project. */
25 25
26#define CACHEALIGN_BITS (4) /* 2^4 = 16 bytes */
27
26/* PCM addresses for obtaining buffers will be what DMA is using (physical) */ 28/* PCM addresses for obtaining buffers will be what DMA is using (physical) */
27#define HAVE_PCM_DMA_ADDRESS 29#define HAVE_PCM_DMA_ADDRESS
28 30
diff --git a/firmware/export/s5l8700.h b/firmware/export/s5l8700.h
index ff8daf044a..71ba071365 100644
--- a/firmware/export/s5l8700.h
+++ b/firmware/export/s5l8700.h
@@ -27,6 +27,8 @@
27 27
28#define TIMER_FREQ 47923200L 28#define TIMER_FREQ 47923200L
29 29
30#define CACHEALIGN_BITS (4) /* 2^4 = 16 bytes */
31
30/* 04. CALMADM2E */ 32/* 04. CALMADM2E */
31 33
32/* Following registers are mapped on IO Area in data memory area of Calm. */ 34/* Following registers are mapped on IO Area in data memory area of Calm. */
diff --git a/firmware/target/arm/s5l8700/system-target.h b/firmware/target/arm/s5l8700/system-target.h
index 5f91032d9e..fd45ee1a13 100644
--- a/firmware/target/arm/s5l8700/system-target.h
+++ b/firmware/target/arm/s5l8700/system-target.h
@@ -29,7 +29,6 @@
29#define CPUFREQ_NORMAL 47923200 29#define CPUFREQ_NORMAL 47923200
30#define CPUFREQ_MAX 191692800 30#define CPUFREQ_MAX 191692800
31 31
32#define CACHEALIGN_BITS (4) /* 2^4 = 16 bytes */
33#define WANTS_STORAGE_ALIGN 32#define WANTS_STORAGE_ALIGN
34 33
35#define inl(a) (*(volatile unsigned long *) (a)) 34#define inl(a) (*(volatile unsigned long *) (a))
diff --git a/firmware/target/arm/system-target.h b/firmware/target/arm/system-target.h
index 157a450743..5d20c397f8 100644
--- a/firmware/target/arm/system-target.h
+++ b/firmware/target/arm/system-target.h
@@ -161,7 +161,6 @@ static inline void wake_core(int core)
161/* Certain data needs to be out of the way of cache line interference 161/* Certain data needs to be out of the way of cache line interference
162 * such as data for COP use or for use with UNCACHED_ADDR */ 162 * such as data for COP use or for use with UNCACHED_ADDR */
163#define PROC_NEEDS_CACHEALIGN 163#define PROC_NEEDS_CACHEALIGN
164#define CACHEALIGN_BITS (4) /* 2^4 = 16 bytes */
165 164
166#if defined(CPU_PP502x) && defined(HAVE_ATA_DMA) 165#if defined(CPU_PP502x) && defined(HAVE_ATA_DMA)
167#define STORAGE_WANTS_ALIGN 166#define STORAGE_WANTS_ALIGN