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 @@
 #define MODEL_NAME  "Onda VX747"
 
 /* For Rolo and boot loader */
-#define MODEL_NUMBER 35
+#define MODEL_NUMBER 45
 
 //#define HAVE_ATA_SD
 //#define HAVE_HOTSWAP
 
 //#define CONFIG_STORAGE (STORAGE_NAND | STORAGE_SD)
-#define CONFIG_STORAGE STORAGE_NAND /* Multivolume currently handled at firmware/target/ level */
+#define CONFIG_STORAGE STORAGE_SD /* Multivolume currently handled at firmware/target/ level */
 
 #define CONFIG_NAND NAND_CC
 
@@ -115,10 +115,10 @@
     SAMPR_CAP_11)*/
 
 #define BATTERY_CAPACITY_DEFAULT 1250 /* default battery capacity */
-#define BATTERY_CAPACITY_MIN 500        /* min. capacity selectable */
-#define BATTERY_CAPACITY_MAX 2500        /* max. capacity selectable */
-#define BATTERY_CAPACITY_INC 100         /* capacity increment */
-#define BATTERY_TYPES_COUNT  1          /* only one type */
+#define BATTERY_CAPACITY_MIN 500      /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 2500     /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC 100      /* capacity increment */
+#define BATTERY_TYPES_COUNT  1        /* only one type */
 
 /* Hardware controlled charging with monitoring */
 #define CONFIG_CHARGING CHARGING_MONITOR
@@ -132,7 +132,8 @@
 #define HAVE_POWEROFF_WHILE_CHARGING
 
 /* Define this to the CPU frequency */
-#define CPU_FREQ 3686400
+#define CPU_FREQ 336000000    /* CPU clock: 336 MHz */
+#define CFG_EXTAL 12000000    /* EXT clock: 12 Mhz */
 
 /* define this if you have a flash memory storage */
 #define HAVE_FLASH_STORAGE
@@ -151,6 +152,7 @@
 
 /* Define this if you have adjustable CPU frequency */
 /* #define HAVE_ADJUSTABLE_CPU_FREQ */
+#define CPUFREQ_NORMAL 336000000    /* CPU clock: 336 MHz */
 
 #define BOOTFILE_EXT "vx747"
 #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 @@
 #define HAVE_POWEROFF_WHILE_CHARGING
 
 /* Define this to the CPU frequency */
-#define CPU_FREQ 3686400
+#define CPU_FREQ 336000000    /* CPU clock: 336 MHz */
+#define CFG_EXTAL 12000000    /* EXT clock: 12 Mhz */
 
 /* define this if you have a flash memory storage */
 #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 @@
 #define HAVE_POWEROFF_WHILE_CHARGING
 
 /* Define this to the CPU frequency */
-#define CPU_FREQ 3686400
+#define CPU_FREQ 336000000    /* CPU clock: 336 MHz */
+#define CFG_EXTAL 12000000    /* EXT clock: 12 Mhz */
 
 /* define this if you have a flash memory storage */
 #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 {                        \
 #define __cpm_suspend_usbhost()        (REG_CPM_SCR |= CPM_SCR_USBHOST_SUSPEND)
 #define __cpm_enable_osc_in_sleep()    (REG_CPM_SCR |= CPM_SCR_OSC_ENABLE)
 
-
-#define CFG_EXTAL       (12000000)
-
 #ifdef CFG_EXTAL
 #define JZ_EXTAL        CFG_EXTAL
 #else
-#define JZ_EXTAL        (3686400)
+#define JZ_EXTAL        3686400
+#warning Default EXTCLK is used!
 #endif
-#define JZ_EXTAL2       (32768) /* RTC clock */
+#define JZ_EXTAL2       32768 /* RTC clock */
 
 /* PLL output frequency */
 static __inline__ unsigned int __cpm_get_pllout(void)
@@ -3487,7 +3485,7 @@ static __inline__ unsigned int __cpm_get_rtcclk(void)
 /*
  * Output 24MHz for SD and 16MHz for MMC.
  */
-static inline void __cpm_select_msc_clk(int sd)
+static __inline__ void __cpm_select_msc_clk(int sd)
 {
     unsigned int pllout2 = __cpm_get_pllout2();
     unsigned int div = 0;
@@ -3503,7 +3501,7 @@ static inline void __cpm_select_msc_clk(int sd)
 /*
  * Output 48MHz for SD and 16MHz for MMC.
  */
-static inline void __cpm_select_msc_hs_clk(int sd)
+static __inline__ void __cpm_select_msc_hs_clk(int sd)
 {
     unsigned int pllout2 = __cpm_get_pllout2();
     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 @@
 #ifndef _ASM_MIPSREGS_H
 #define _ASM_MIPSREGS_H
 
-//#include <linux/config.h>
-//#include <linux/linkage.h>
-
-/*
- * The following macros are especially useful for __asm__
- * inline assembler.
- */
-#ifndef __STR
-#define __STR(x) #x
-#endif
-#ifndef STR
-#define STR(x) __STR(x)
-#endif
-
-/*
- *  Configure language
- */
-#ifdef __ASSEMBLY__
-#define _ULCAST_
-#else
-#define _ULCAST_ (unsigned long)
-#endif
-
 /*
  * Coprocessor 0 register names
  */