diff options
author | Tom Rini <trini@ti.com> | 2013-12-10 09:36:23 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-12-10 09:36:23 -0500 |
commit | 65b7fe28a12bbaccc7a0c076f5f9f213150030e7 (patch) | |
tree | 96be894262501d04c9bb637a837180b7708e49e8 /include/configs | |
parent | e1e3de79515b95712a41f52c86a0181530f2fc03 (diff) | |
parent | ca9a501953ce945da8e76d86a0ddf070a7f729b8 (diff) | |
download | u-boot-imx-65b7fe28a12bbaccc7a0c076f5f9f213150030e7.zip u-boot-imx-65b7fe28a12bbaccc7a0c076f5f9f213150030e7.tar.gz u-boot-imx-65b7fe28a12bbaccc7a0c076f5f9f213150030e7.tar.bz2 |
Merge branch 'spi' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'include/configs')
-rw-r--r-- | include/configs/exynos5250-dt.h | 1 | ||||
-rw-r--r-- | include/configs/sandbox.h | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h index 0155322..1e9c1e3 100644 --- a/include/configs/exynos5250-dt.h +++ b/include/configs/exynos5250-dt.h @@ -276,6 +276,7 @@ #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 50000000 #define EXYNOS5_SPI_NUM_CONTROLLERS 5 +#define CONFIG_OF_SPI #endif #ifdef CONFIG_ENV_IS_IN_SPI_FLASH diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index a4edc62..7e78a23 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -71,6 +71,16 @@ #define CONFIG_ENV_SIZE 8192 #define CONFIG_ENV_IS_NOWHERE +/* SPI */ +#define CONFIG_SANDBOX_SPI +#define CONFIG_CMD_SF +#define CONFIG_CMD_SF_TEST +#define CONFIG_CMD_SPI +#define CONFIG_SPI_FLASH +#define CONFIG_SPI_FLASH_SANDBOX +#define CONFIG_SPI_FLASH_STMICRO +#define CONFIG_SPI_FLASH_WINBOND + /* Memory things - we don't really want a memory test */ #define CONFIG_SYS_LOAD_ADDR 0x00000000 #define CONFIG_SYS_MEMTEST_START 0x00100000 |