diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2014-01-16 21:23:55 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2014-01-16 21:23:55 +0100 |
| commit | 14a2bdbd75854ba597c012c42197e929f4b03739 (patch) | |
| tree | 48e73556abd50af654609a66a7b9320f91cb8600 | |
| parent | b5dda7dbdee587523800443209a0ab0a840e55cc (diff) | |
config: remove further SPI-Flash related stuff
| -rw-r--r-- | include/configs/colibri-imx6.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/include/configs/colibri-imx6.h b/include/configs/colibri-imx6.h index 982b31a30b..11f0de1b1f 100644 --- a/include/configs/colibri-imx6.h +++ b/include/configs/colibri-imx6.h @@ -39,11 +39,11 @@ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE -#define CONFIG_CMD_SF +//TODO #define CONFIG_CMD_SF #ifdef CONFIG_CMD_SF #define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SST -//TODO #define CONFIG_MXC_SPI +#define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS (0|(IMX_GPIO_NR(3, 19)<<8)) #define CONFIG_SF_DEFAULT_SPEED 25000000 @@ -321,22 +321,11 @@ #define CONFIG_ENV_SIZE (8 * 1024) -#if defined(CONFIG_SABRELITE) #define CONFIG_ENV_IS_IN_MMC -#else -#define CONFIG_ENV_IS_IN_SPI_FLASH -#endif #if defined(CONFIG_ENV_IS_IN_MMC) -#define CONFIG_ENV_OFFSET (6 * 64 * 1024) +#define CONFIG_ENV_OFFSET ((1024 * 1024) - (2 * CONFIG_ENV_SIZE)) #define CONFIG_SYS_MMC_ENV_DEV 0 -#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH) -#define CONFIG_ENV_OFFSET (768 * 1024) -#define CONFIG_ENV_SECT_SIZE (8 * 1024) -#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS -#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS -#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #endif #define CONFIG_OF_LIBFDT |