diff options
Diffstat (limited to 'firmware/target/mips/ingenic_jz47xx/system-target.h')
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/system-target.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/firmware/target/mips/ingenic_jz47xx/system-target.h b/firmware/target/mips/ingenic_jz47xx/system-target.h index 1c2e7d7173..9720d3a80c 100644 --- a/firmware/target/mips/ingenic_jz47xx/system-target.h +++ b/firmware/target/mips/ingenic_jz47xx/system-target.h | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <inttypes.h> | 25 | #include <inttypes.h> |
26 | 26 | ||
27 | #include "config.h" | 27 | #include "config.h" |
28 | #include "jz4740.h" | 28 | #include "cpu.h" |
29 | #include "mipsregs.h" | 29 | #include "mipsregs.h" |
30 | 30 | ||
31 | #define CACHE_SIZE 16*1024 | 31 | #define CACHE_SIZE 16*1024 |
@@ -35,6 +35,8 @@ | |||
35 | /* no optimized byteswap functions implemented for mips, yet */ | 35 | /* no optimized byteswap functions implemented for mips, yet */ |
36 | #define NEED_GENERIC_BYTESWAPS | 36 | #define NEED_GENERIC_BYTESWAPS |
37 | 37 | ||
38 | #define STORAGE_WANTS_ALIGN | ||
39 | |||
38 | /* This one returns the old status */ | 40 | /* This one returns the old status */ |
39 | static inline int set_interrupt_status(int status, int mask) | 41 | static inline int set_interrupt_status(int status, int mask) |
40 | { | 42 | { |
@@ -86,10 +88,18 @@ void mdelay(unsigned int msec); | |||
86 | void dma_enable(void); | 88 | void dma_enable(void); |
87 | void dma_disable(void); | 89 | void dma_disable(void); |
88 | 90 | ||
91 | #if CONFIG_CPU == JZ4732 | ||
89 | #define DMA_AIC_TX_CHANNEL 0 | 92 | #define DMA_AIC_TX_CHANNEL 0 |
90 | #define DMA_NAND_CHANNEL 1 | 93 | #define DMA_NAND_CHANNEL 1 |
91 | #define DMA_USB_CHANNEL 2 | 94 | #define DMA_USB_CHANNEL 2 |
92 | #define DMA_LCD_CHANNEL 3 | 95 | #define DMA_LCD_CHANNEL 3 |
96 | #elif CONFIG_CPU == JZ4760B | ||
97 | #define DMA_AIC_TX_CHANNEL 0 | ||
98 | #define DMA_NAND_CHANNEL 1 | ||
99 | #define DMA_USB_CHANNEL 2 | ||
100 | #define DMA_SD_RX_CHANNEL 3 | ||
101 | #define DMA_SD_TX_CHANNEL 4 | ||
102 | #endif | ||
93 | 103 | ||
94 | #define XDMA_CALLBACK(n) DMA ## n | 104 | #define XDMA_CALLBACK(n) DMA ## n |
95 | #define DMA_CALLBACK(n) XDMA_CALLBACK(n) | 105 | #define DMA_CALLBACK(n) XDMA_CALLBACK(n) |
@@ -103,7 +113,7 @@ void dma_disable(void); | |||
103 | */ | 113 | */ |
104 | static inline void core_sleep(void) | 114 | static inline void core_sleep(void) |
105 | { | 115 | { |
106 | #if CONFIG_CPU == JZ4732 | 116 | #if CONFIG_CPU == JZ4732 || CONFIG_CPU == JZ4760B |
107 | __cpm_idle_mode(); | 117 | __cpm_idle_mode(); |
108 | #endif | 118 | #endif |
109 | asm volatile(".set mips32r2 \n" | 119 | asm volatile(".set mips32r2 \n" |