diff options
author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-02-09 10:02:38 +0000 |
---|---|---|
committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-02-09 10:02:38 +0000 |
commit | 04c7379ac585d1e79fd454cf860a8592db25c67f (patch) | |
tree | 0c42a1f0379d4282ab793f5f23ebde86d25e9e80 /firmware/export | |
parent | f7a06dd6fc2022876c392e186bcf5037dd5a34bf (diff) | |
download | rockbox-04c7379ac585d1e79fd454cf860a8592db25c67f.tar.gz rockbox-04c7379ac585d1e79fd454cf860a8592db25c67f.zip |
Onda VX747: commit some parts to get apps/ to compile (more will follow)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19954 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/config-ondavx747.h | 16 | ||||
-rw-r--r-- | firmware/export/config-ondavx747p.h | 3 | ||||
-rw-r--r-- | firmware/export/config-ondavx767.h | 3 | ||||
-rw-r--r-- | firmware/export/jz4740.h | 12 | ||||
-rw-r--r-- | firmware/export/mipsregs.h | 23 |
5 files changed, 18 insertions, 39 deletions
diff --git a/firmware/export/config-ondavx747.h b/firmware/export/config-ondavx747.h index 3646156ede..a7df97068c 100644 --- a/firmware/export/config-ondavx747.h +++ b/firmware/export/config-ondavx747.h | |||
@@ -31,13 +31,13 @@ | |||
31 | #define MODEL_NAME "Onda VX747" | 31 | #define MODEL_NAME "Onda VX747" |
32 | 32 | ||
33 | /* For Rolo and boot loader */ | 33 | /* For Rolo and boot loader */ |
34 | #define MODEL_NUMBER 35 | 34 | #define MODEL_NUMBER 45 |
35 | 35 | ||
36 | //#define HAVE_ATA_SD | 36 | //#define HAVE_ATA_SD |
37 | //#define HAVE_HOTSWAP | 37 | //#define HAVE_HOTSWAP |
38 | 38 | ||
39 | //#define CONFIG_STORAGE (STORAGE_NAND | STORAGE_SD) | 39 | //#define CONFIG_STORAGE (STORAGE_NAND | STORAGE_SD) |
40 | #define CONFIG_STORAGE STORAGE_NAND /* Multivolume currently handled at firmware/target/ level */ | 40 | #define CONFIG_STORAGE STORAGE_SD /* Multivolume currently handled at firmware/target/ level */ |
41 | 41 | ||
42 | #define CONFIG_NAND NAND_CC | 42 | #define CONFIG_NAND NAND_CC |
43 | 43 | ||
@@ -115,10 +115,10 @@ | |||
115 | SAMPR_CAP_11)*/ | 115 | SAMPR_CAP_11)*/ |
116 | 116 | ||
117 | #define BATTERY_CAPACITY_DEFAULT 1250 /* default battery capacity */ | 117 | #define BATTERY_CAPACITY_DEFAULT 1250 /* default battery capacity */ |
118 | #define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */ | 118 | #define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */ |
119 | #define BATTERY_CAPACITY_MAX 2500 /* max. capacity selectable */ | 119 | #define BATTERY_CAPACITY_MAX 2500 /* max. capacity selectable */ |
120 | #define BATTERY_CAPACITY_INC 100 /* capacity increment */ | 120 | #define BATTERY_CAPACITY_INC 100 /* capacity increment */ |
121 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | 121 | #define BATTERY_TYPES_COUNT 1 /* only one type */ |
122 | 122 | ||
123 | /* Hardware controlled charging with monitoring */ | 123 | /* Hardware controlled charging with monitoring */ |
124 | #define CONFIG_CHARGING CHARGING_MONITOR | 124 | #define CONFIG_CHARGING CHARGING_MONITOR |
@@ -132,7 +132,8 @@ | |||
132 | #define HAVE_POWEROFF_WHILE_CHARGING | 132 | #define HAVE_POWEROFF_WHILE_CHARGING |
133 | 133 | ||
134 | /* Define this to the CPU frequency */ | 134 | /* Define this to the CPU frequency */ |
135 | #define CPU_FREQ 3686400 | 135 | #define CPU_FREQ 336000000 /* CPU clock: 336 MHz */ |
136 | #define CFG_EXTAL 12000000 /* EXT clock: 12 Mhz */ | ||
136 | 137 | ||
137 | /* define this if you have a flash memory storage */ | 138 | /* define this if you have a flash memory storage */ |
138 | #define HAVE_FLASH_STORAGE | 139 | #define HAVE_FLASH_STORAGE |
@@ -151,6 +152,7 @@ | |||
151 | 152 | ||
152 | /* Define this if you have adjustable CPU frequency */ | 153 | /* Define this if you have adjustable CPU frequency */ |
153 | /* #define HAVE_ADJUSTABLE_CPU_FREQ */ | 154 | /* #define HAVE_ADJUSTABLE_CPU_FREQ */ |
155 | #define CPUFREQ_NORMAL 336000000 /* CPU clock: 336 MHz */ | ||
154 | 156 | ||
155 | #define BOOTFILE_EXT "vx747" | 157 | #define BOOTFILE_EXT "vx747" |
156 | #define BOOTFILE "rockbox." BOOTFILE_EXT | 158 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
diff --git a/firmware/export/config-ondavx747p.h b/firmware/export/config-ondavx747p.h index 2cd06d3323..bb16a6a53f 100644 --- a/firmware/export/config-ondavx747p.h +++ b/firmware/export/config-ondavx747p.h | |||
@@ -132,7 +132,8 @@ | |||
132 | #define HAVE_POWEROFF_WHILE_CHARGING | 132 | #define HAVE_POWEROFF_WHILE_CHARGING |
133 | 133 | ||
134 | /* Define this to the CPU frequency */ | 134 | /* Define this to the CPU frequency */ |
135 | #define CPU_FREQ 3686400 | 135 | #define CPU_FREQ 336000000 /* CPU clock: 336 MHz */ |
136 | #define CFG_EXTAL 12000000 /* EXT clock: 12 Mhz */ | ||
136 | 137 | ||
137 | /* define this if you have a flash memory storage */ | 138 | /* define this if you have a flash memory storage */ |
138 | #define HAVE_FLASH_STORAGE | 139 | #define HAVE_FLASH_STORAGE |
diff --git a/firmware/export/config-ondavx767.h b/firmware/export/config-ondavx767.h index cb44de9e6e..1f481432f2 100644 --- a/firmware/export/config-ondavx767.h +++ b/firmware/export/config-ondavx767.h | |||
@@ -130,7 +130,8 @@ | |||
130 | #define HAVE_POWEROFF_WHILE_CHARGING | 130 | #define HAVE_POWEROFF_WHILE_CHARGING |
131 | 131 | ||
132 | /* Define this to the CPU frequency */ | 132 | /* Define this to the CPU frequency */ |
133 | #define CPU_FREQ 3686400 | 133 | #define CPU_FREQ 336000000 /* CPU clock: 336 MHz */ |
134 | #define CFG_EXTAL 12000000 /* EXT clock: 12 Mhz */ | ||
134 | 135 | ||
135 | /* define this if you have a flash memory storage */ | 136 | /* define this if you have a flash memory storage */ |
136 | #define HAVE_FLASH_STORAGE | 137 | #define HAVE_FLASH_STORAGE |
diff --git a/firmware/export/jz4740.h b/firmware/export/jz4740.h index 8f308fdb8f..5642dc8464 100644 --- a/firmware/export/jz4740.h +++ b/firmware/export/jz4740.h | |||
@@ -3365,15 +3365,13 @@ do { \ | |||
3365 | #define __cpm_suspend_usbhost() (REG_CPM_SCR |= CPM_SCR_USBHOST_SUSPEND) | 3365 | #define __cpm_suspend_usbhost() (REG_CPM_SCR |= CPM_SCR_USBHOST_SUSPEND) |
3366 | #define __cpm_enable_osc_in_sleep() (REG_CPM_SCR |= CPM_SCR_OSC_ENABLE) | 3366 | #define __cpm_enable_osc_in_sleep() (REG_CPM_SCR |= CPM_SCR_OSC_ENABLE) |
3367 | 3367 | ||
3368 | |||
3369 | #define CFG_EXTAL (12000000) | ||
3370 | |||
3371 | #ifdef CFG_EXTAL | 3368 | #ifdef CFG_EXTAL |
3372 | #define JZ_EXTAL CFG_EXTAL | 3369 | #define JZ_EXTAL CFG_EXTAL |
3373 | #else | 3370 | #else |
3374 | #define JZ_EXTAL (3686400) | 3371 | #define JZ_EXTAL 3686400 |
3372 | #warning Default EXTCLK is used! | ||
3375 | #endif | 3373 | #endif |
3376 | #define JZ_EXTAL2 (32768) /* RTC clock */ | 3374 | #define JZ_EXTAL2 32768 /* RTC clock */ |
3377 | 3375 | ||
3378 | /* PLL output frequency */ | 3376 | /* PLL output frequency */ |
3379 | static __inline__ unsigned int __cpm_get_pllout(void) | 3377 | static __inline__ unsigned int __cpm_get_pllout(void) |
@@ -3487,7 +3485,7 @@ static __inline__ unsigned int __cpm_get_rtcclk(void) | |||
3487 | /* | 3485 | /* |
3488 | * Output 24MHz for SD and 16MHz for MMC. | 3486 | * Output 24MHz for SD and 16MHz for MMC. |
3489 | */ | 3487 | */ |
3490 | static inline void __cpm_select_msc_clk(int sd) | 3488 | static __inline__ void __cpm_select_msc_clk(int sd) |
3491 | { | 3489 | { |
3492 | unsigned int pllout2 = __cpm_get_pllout2(); | 3490 | unsigned int pllout2 = __cpm_get_pllout2(); |
3493 | unsigned int div = 0; | 3491 | unsigned int div = 0; |
@@ -3503,7 +3501,7 @@ static inline void __cpm_select_msc_clk(int sd) | |||
3503 | /* | 3501 | /* |
3504 | * Output 48MHz for SD and 16MHz for MMC. | 3502 | * Output 48MHz for SD and 16MHz for MMC. |
3505 | */ | 3503 | */ |
3506 | static inline void __cpm_select_msc_hs_clk(int sd) | 3504 | static __inline__ void __cpm_select_msc_hs_clk(int sd) |
3507 | { | 3505 | { |
3508 | unsigned int pllout2 = __cpm_get_pllout2(); | 3506 | unsigned int pllout2 = __cpm_get_pllout2(); |
3509 | unsigned int div = 0; | 3507 | unsigned int div = 0; |
diff --git a/firmware/export/mipsregs.h b/firmware/export/mipsregs.h index 8898bbd478..0ae9bce4d7 100644 --- a/firmware/export/mipsregs.h +++ b/firmware/export/mipsregs.h | |||
@@ -13,29 +13,6 @@ | |||
13 | #ifndef _ASM_MIPSREGS_H | 13 | #ifndef _ASM_MIPSREGS_H |
14 | #define _ASM_MIPSREGS_H | 14 | #define _ASM_MIPSREGS_H |
15 | 15 | ||
16 | //#include <linux/config.h> | ||
17 | //#include <linux/linkage.h> | ||
18 | |||
19 | /* | ||
20 | * The following macros are especially useful for __asm__ | ||
21 | * inline assembler. | ||
22 | */ | ||
23 | #ifndef __STR | ||
24 | #define __STR(x) #x | ||
25 | #endif | ||
26 | #ifndef STR | ||
27 | #define STR(x) __STR(x) | ||
28 | #endif | ||
29 | |||
30 | /* | ||
31 | * Configure language | ||
32 | */ | ||
33 | #ifdef __ASSEMBLY__ | ||
34 | #define _ULCAST_ | ||
35 | #else | ||
36 | #define _ULCAST_ (unsigned long) | ||
37 | #endif | ||
38 | |||
39 | /* | 16 | /* |
40 | * Coprocessor 0 register names | 17 | * Coprocessor 0 register names |
41 | */ | 18 | */ |