imx233: Make bootloader compile, fix up remanining warnings

Change-Id: Ie87d178c56455b93364dffa656ebbee9cd7a4bad

4 files changed, 8 insertions, 9 deletions

diff --git a/firmware/export/config/creativezenv.h b/firmware/export/config/creativezenv.h
index b103c34f20..27624a9b8f 100644
--- a/firmware/export/config/creativezenv.h
+++ b/firmware/export/config/creativezenv.h
@@ -25,8 +25,6 @@
    explicitly if different */
 #define INPUT_SRC_CAPS SRC_CAP_MIC
 
-
-
 /* define this if you have a colour LCD */
 #define HAVE_LCD_COLOR
 
@@ -161,7 +159,7 @@
 #define CURRENT_MAX_CHG   200
 
 /* Define this to the CPU frequency */
-#define CPU_FREQ      454000000
+#define CPU_FREQ      200000000
 
 /* Type of LCD */
 #define CONFIG_LCD LCD_CREATIVEZENV
@@ -188,5 +186,3 @@
 #define BOOTDIR "/.rockbox"
 
 #define INCLUDE_TIMEOUT_API
-
- 
diff --git a/firmware/target/arm/imx233/emi-imx233.c b/firmware/target/arm/imx233/emi-imx233.c
index d026e951f7..74fb05de57 100644
--- a/firmware/target/arm/imx233/emi-imx233.c
+++ b/firmware/target/arm/imx233/emi-imx233.c
@@ -40,6 +40,7 @@ struct emi_reg_t
  * Values from IMX233 manual, for Mobile DDR 7.5ns (133 MHz and 64MHz)
  * Make sure the last value is written to register 40. */
 
+#if IMX233_SUBTARGET >= 3700
 static struct emi_reg_t settings_60M[15] ICONST_ATTR =
 {
     {4, 0x01000101}, /* DLL bypass mode, concurrent auto-precharge and bank split */
@@ -82,7 +83,6 @@ static struct emi_reg_t settings_155M[15] ICONST_ATTR __attribute__((alias("sett
 
 static void set_frequency(unsigned long freq) ICODE_ATTR;
 
-#if IMX233_SUBTARGET >= 3700
 static void set_frequency(unsigned long freq)
 {
     /** WARNING all restriction of imx233_emi_set_frequency apply here !! */
@@ -217,4 +217,4 @@ struct imx233_emi_info_t imx233_emi_get_info(void)
     info.size = 2 * (1 << (info.rows + info.columns)) * info.chips * info.banks;
 #endif
     return info;
-}
\ No newline at end of file
+}
diff --git a/firmware/target/arm/imx233/ssp-imx233.c b/firmware/target/arm/imx233/ssp-imx233.c
index c11d09ce5b..e2efab5e9f 100644
--- a/firmware/target/arm/imx233/ssp-imx233.c
+++ b/firmware/target/arm/imx233/ssp-imx233.c
@@ -8,7 +8,7 @@
  * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
@@ -262,9 +262,9 @@ void imx233_ssp_setup_ssp2_sd_mmc_pins(bool enable_pullups, unsigned bus_width)
 {
     (void) enable_pullups;
     (void) bus_width;
+#ifdef VPIN_SSP2_CMD
     unsigned clk_drive = PINCTRL_DRIVE_8mA;
     unsigned dat_drive = PINCTRL_DRIVE_4mA;
-#ifdef VPIN_SSP2_CMD
     /* SSP_{CMD,SCK} */
     imx233_pinctrl_setup_vpin(VPIN_SSP2_CMD, "ssp2_cmd", dat_drive, enable_pullups);
     imx233_pinctrl_setup_vpin(VPIN_SSP2_SCK, "ssp2_sck", clk_drive, false);
diff --git a/firmware/target/arm/imx233/system-target.h b/firmware/target/arm/imx233/system-target.h
index 45dc58698a..bab76752df 100644
--- a/firmware/target/arm/imx233/system-target.h
+++ b/firmware/target/arm/imx233/system-target.h
@@ -35,6 +35,7 @@
 #define IMX233_CPUFREQ_454_MHz  454740000
 #define IMX233_CPUFREQ_320_MHz  320000000
 #define IMX233_CPUFREQ_261_MHz  261820000
+#define IMX233_CPUFREQ_200_MHz  200000000
 #define IMX233_CPUFREQ_64_MHz    64000000
 #define IMX233_CPUFREQ_24_MHz    24000000
 
@@ -44,6 +45,8 @@
 #define CPUFREQ_MAX         IMX233_CPUFREQ_454_MHz
 #elif IMX233_SUBTARGET >= 3700
 #define CPUFREQ_MAX         IMX233_CPUFREQ_320_MHz
+#else
+#define CPUFREQ_MAX         IMX233_CPUFREQ_200_MHz
 #endif
 #define CPUFREQ_SLEEP       IMX233_CPUFREQ_64_MHz