diff options
Diffstat (limited to 'firmware/target')
-rw-r--r-- | firmware/target/arm/system-arm.h | 8 | ||||
-rw-r--r-- | firmware/target/arm/system-target.h | 7 |
2 files changed, 6 insertions, 9 deletions
diff --git a/firmware/target/arm/system-arm.h b/firmware/target/arm/system-arm.h index aeb90df399..c3af652ebc 100644 --- a/firmware/target/arm/system-arm.h +++ b/firmware/target/arm/system-arm.h | |||
@@ -22,14 +22,6 @@ | |||
22 | #define nop \ | 22 | #define nop \ |
23 | asm volatile ("nop") | 23 | asm volatile ("nop") |
24 | 24 | ||
25 | //#define outw(v,a) *(volatile unsigned short *)(a+PHY_IO_BASE) = (v) | ||
26 | #ifndef outw | ||
27 | #define outw(v,p) (*((unsigned short*)(p + PHY_IO_BASE)) = v) | ||
28 | #endif | ||
29 | |||
30 | #ifndef inw | ||
31 | #define inw(p) (*((unsigned short*)(p + PHY_IO_BASE))) | ||
32 | #endif | ||
33 | 25 | ||
34 | /* This gets too complicated otherwise with all the ARM variation and would | 26 | /* This gets too complicated otherwise with all the ARM variation and would |
35 | have conflicts with another system-target.h elsewhere so include a | 27 | have conflicts with another system-target.h elsewhere so include a |
diff --git a/firmware/target/arm/system-target.h b/firmware/target/arm/system-target.h index 5cfd02840c..4e7228415d 100644 --- a/firmware/target/arm/system-target.h +++ b/firmware/target/arm/system-target.h | |||
@@ -22,7 +22,7 @@ | |||
22 | 22 | ||
23 | #include "system-arm.h" | 23 | #include "system-arm.h" |
24 | 24 | ||
25 | #if (CONFIG_CPU == PP5002) || (CONFIG_CPU == PP5022) || (CONFIG_CPU == PP5024) | 25 | #ifdef CPU_PP |
26 | /* TODO: This header is actually portalplayer specific, and should be | 26 | /* TODO: This header is actually portalplayer specific, and should be |
27 | * moved into an appropriate subdir (or even split in 2). */ | 27 | * moved into an appropriate subdir (or even split in 2). */ |
28 | 28 | ||
@@ -91,6 +91,11 @@ static inline void flush_icache(void) | |||
91 | } | 91 | } |
92 | 92 | ||
93 | #endif /* CONFIG_CPU */ | 93 | #endif /* CONFIG_CPU */ |
94 | #else /* CPU_CONFIG == DM320 */ | ||
95 | |||
96 | #define inw(p) (*((unsigned short*)(p + PHY_IO_BASE))) | ||
97 | #define outw(v,p) (*((unsigned short*)(p + PHY_IO_BASE)) = v) | ||
98 | |||
94 | #endif | 99 | #endif |
95 | 100 | ||
96 | #endif /* SYSTEM_TARGET_H */ | 101 | #endif /* SYSTEM_TARGET_H */ |