diff options
| author | Terry Lv <r65388@freescale.com> | 2009-06-17 18:46:13 +0800 |
|---|---|---|
| committer | Fred Fan <r01011@freescale.com> | 2009-09-10 17:02:19 +0800 |
| commit | 0557114f39ead28bb9d9b81291970c72728786a4 (patch) | |
| tree | 2a65dcc5454ae2ab52a7d9903933f0ea7b38995e /include | |
| parent | 05a4055d2f48a9941c1b47528dcc015d10e979e5 (diff) | |
| download | u-boot-imx-0557114f39ead28bb9d9b81291970c72728786a4.zip u-boot-imx-0557114f39ead28bb9d9b81291970c72728786a4.tar.gz u-boot-imx-0557114f39ead28bb9d9b81291970c72728786a4.tar.bz2 | |
ENGR00113439: BBG2, enable SPI NOR and MMC in one image.
BBG2, enable SPI NOR and MMC in one image.
Signed-off-by: Terry Lv <r65388@freescale.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-mx51/imx_spi_pmic.h | 6 | ||||
| -rw-r--r-- | include/configs/imx51.h | 16 |
2 files changed, 9 insertions, 13 deletions
diff --git a/include/asm-arm/arch-mx51/imx_spi_pmic.h b/include/asm-arm/arch-mx51/imx_spi_pmic.h index 1c32a9e..acd8cbf 100644 --- a/include/asm-arm/arch-mx51/imx_spi_pmic.h +++ b/include/asm-arm/arch-mx51/imx_spi_pmic.h @@ -25,9 +25,9 @@ #include <linux/types.h> -struct spi_slave *spi_pmic_probe(); -void spi_pmic_free(struct spi_slave *slave); -u32 pmic_reg(struct spi_slave *slave, +extern struct spi_slave *spi_pmic_probe(); +extern void spi_pmic_free(struct spi_slave *slave); +extern u32 pmic_reg(struct spi_slave *slave, u32 reg, u32 val, u32 write); #endif /* _IMX_SPI_PMIC_H_ */ diff --git a/include/configs/imx51.h b/include/configs/imx51.h index 238457e..7bd6c38 100644 --- a/include/configs/imx51.h +++ b/include/configs/imx51.h @@ -68,10 +68,9 @@ #define CONFIG_MX51_UART 1 #define CONFIG_MX51_UART1 1 -#if defined(BOOT_MEDIA_SPI_NOR) /* * SPI Configs - */ + * */ #define CONFIG_FSL_SF 1 #define CONFIG_CMD_SPI #define CONFIG_CMD_SF @@ -80,18 +79,19 @@ #define CONFIG_IMX_SPI #define CONFIG_IMX_SPI_PMIC #define CONFIG_IMX_SPI_PMIC_CS 0 + #define MAX_SPI_BYTES (64 * 4) -#elif defined(BOOT_MEDIA_MMC) /* * MMC Configs - */ + * */ #define CONFIG_FSL_MMC 1 + +#define CONFIG_MMC 1 +#define CONFIG_CMD_MMC #define CONFIG_DOS_PARTITION 1 #define CONFIG_CMD_FAT 1 -#endif - /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 @@ -208,11 +208,7 @@ #if defined(CONFIG_FSL_SF) #define CONFIG_FSL_ENV_IN_SF #elif defined(CONFIG_FSL_MMC) - #define CONFIG_MMC 1 - #define CONFIG_CMD_MMC -/* #define CONFIG_FSL_ENV_IN_MMC -*/ #elif defined(CONFIG_CMD_NAND) #define CONFIG_FSL_ENV_IN_NAND #endif |