len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-11 06:05:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30112 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Amaury Pouly 2011-07-02 02:21:06 +00:00
parent 82ecc75e68
commit 88f75d096e
4 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
firmware/SOURCES
View file

@ -1447,8 +1447,10 @@ target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S
#ifdef SANSA_FUZEPLUS #ifdef SANSA_FUZEPLUS
#ifndef SIMULATOR #ifndef SIMULATOR
#ifndef BOOTLOADER
drivers/generic_i2c.c drivers/generic_i2c.c
drivers/synaptics-rmi.c drivers/synaptics-rmi.c
#endif
target/arm/imx233/sansa-fuzeplus/backlight-fuzeplus.c target/arm/imx233/sansa-fuzeplus/backlight-fuzeplus.c
target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c
target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c

12
firmware/export/config/sansafuzeplus.h
View file

@ -116,9 +116,13 @@
#define HAVE_FLASH_STORAGE #define HAVE_FLASH_STORAGE
/* define this if the flash memory uses the SecureDigital Memory Card protocol */ /* define this if the flash memory uses the SecureDigital Memory Card protocol */
#ifdef BOOTLOADER
# define CONFIG_STORAGE STORAGE_MMC
#else
# define CONFIG_STORAGE (STORAGE_SD | STORAGE_MMC) # define CONFIG_STORAGE (STORAGE_SD | STORAGE_MMC)
# define NUM_DRIVES 2 # define NUM_DRIVES 2
# define HAVE_HOTSWAP
#endif
/* todo */ /* todo */
#define BATTERY_CAPACITY_DEFAULT 550 /* default battery capacity */ #define BATTERY_CAPACITY_DEFAULT 550 /* default battery capacity */
@ -158,12 +162,6 @@
#define FIRMWARE_OFFSET_FILE_CRC 0x0 #define FIRMWARE_OFFSET_FILE_CRC 0x0
#define FIRMWARE_OFFSET_FILE_DATA 0x8 #define FIRMWARE_OFFSET_FILE_DATA 0x8
#ifndef BOOTLOADER
#define HAVE_MULTIDRIVE
#define NUM_DRIVES 2
#define HAVE_HOTSWAP
#endif
/* USB On-the-go */ /* USB On-the-go */
#define CONFIG_USBOTG USBOTG_ARC #define CONFIG_USBOTG USBOTG_ARC

2
firmware/target/arm/imx233/mmc-imx233.c
View file

@ -69,7 +69,7 @@ int mmc_init(void)
imx233_ssp_set_bus_width(MMC_SSP, 1); imx233_ssp_set_bus_width(MMC_SSP, 1);
imx233_ssp_set_block_size(MMC_SSP, 9); imx233_ssp_set_block_size(MMC_SSP, 9);
/* go to idle state */ /* 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) if(ret != 0)
return -1; return -1;
/* send op cond until the card respond with busy bit set; it must complete within 1sec */ /* send op cond until the card respond with busy bit set; it must complete within 1sec */

9
firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c
View file

@ -27,6 +27,7 @@
#include "lcd.h" #include "lcd.h"
#include "string.h" #include "string.h"
#ifndef BOOTLOADER
static void i2c_scl_dir(bool out) static void i2c_scl_dir(bool out)
{ {
imx233_enable_gpio_output(0, 30, 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); 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 button_read_device(void)
{ {
int res = 0; int res = 0;