imx233/fuze+: don't compile {touchpad code,sd} in bootloader mode, fix style in mmc

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30112 a1c6a512-1295-4272-9138-f99709370657

4 files changed, 19 insertions, 10 deletions

diff --git a/firmware/SOURCES b/firmware/SOURCES
index 85d9a28f1b..12774b051f 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -1447,8 +1447,10 @@ target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S
 
 #ifdef SANSA_FUZEPLUS
 #ifndef SIMULATOR
+#ifndef BOOTLOADER
 drivers/generic_i2c.c
 drivers/synaptics-rmi.c
+#endif
 target/arm/imx233/sansa-fuzeplus/backlight-fuzeplus.c
 target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c
 target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c
diff --git a/firmware/export/config/sansafuzeplus.h b/firmware/export/config/sansafuzeplus.h
index 5a78d37056..491867ec63 100644
--- a/firmware/export/config/sansafuzeplus.h
+++ b/firmware/export/config/sansafuzeplus.h
@@ -116,9 +116,13 @@
 #define HAVE_FLASH_STORAGE
 
 /* define this if the flash memory uses the SecureDigital Memory Card protocol */
-#define CONFIG_STORAGE (STORAGE_SD | STORAGE_MMC)
-
-#define NUM_DRIVES 2
+#ifdef BOOTLOADER
+# define CONFIG_STORAGE STORAGE_MMC
+#else
+# define CONFIG_STORAGE (STORAGE_SD | STORAGE_MMC)
+# define NUM_DRIVES 2
+# define HAVE_HOTSWAP
+#endif
 
 /* todo */
 #define BATTERY_CAPACITY_DEFAULT 550    /* default battery capacity */
@@ -158,12 +162,6 @@
 #define FIRMWARE_OFFSET_FILE_CRC    0x0
 #define FIRMWARE_OFFSET_FILE_DATA   0x8
 
-#ifndef BOOTLOADER
-#define HAVE_MULTIDRIVE
-#define NUM_DRIVES 2
-#define HAVE_HOTSWAP
-#endif
-
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_ARC
 
diff --git a/firmware/target/arm/imx233/mmc-imx233.c b/firmware/target/arm/imx233/mmc-imx233.c
index dafe63f3d3..b0f1f36c26 100644
--- a/firmware/target/arm/imx233/mmc-imx233.c
+++ b/firmware/target/arm/imx233/mmc-imx233.c
@@ -69,7 +69,7 @@ int mmc_init(void)
     imx233_ssp_set_bus_width(MMC_SSP, 1);
     imx233_ssp_set_block_size(MMC_SSP, 9);
     /* go to idle state */
-    int ret = imx233_ssp_sd_mmc_transfer(MMC_SSP, SD_GO_IDLE_STATE, 0, SSP_NO_RESP, NULL, 0, false, false, NULL);
+    int ret = imx233_ssp_sd_mmc_transfer(MMC_SSP, 0, 0, SSP_NO_RESP, NULL, 0, false, false, NULL);
     if(ret != 0)
         return -1;
     /* send op cond until the card respond with busy bit set; it must complete within 1sec */
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c
index b6de9f73d8..f6efe6d6a8 100644
--- a/firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c
+++ b/firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c
@@ -27,6 +27,7 @@
 #include "lcd.h"
 #include "string.h"
 
+#ifndef BOOTLOADER
 static void i2c_scl_dir(bool out)
 {
     imx233_enable_gpio_output(0, 30, out);
@@ -251,6 +252,14 @@ void button_init_device(void)
         RMI_2D_GESTURE_FLICK_TIME_700MS << RMI_2D_GESTURE_FLICK_TIME_BP);
 }
 
+#else
+
+void button_init_device(void)
+{
+}
+
+#endif
+
 int button_read_device(void)
 {
     int res = 0;