diff options
| author | Stefano Babic <sbabic@denx.de> | 2015-07-10 09:21:44 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-07-10 09:21:44 +0200 |
| commit | 1254ff97abb7606ccd0d7bdcd9f22581c50fe535 (patch) | |
| tree | 61b31e61173154abd38aaa6584e84ea77314b861 /include/configs/ls1021aqds.h | |
| parent | 54e0f96f764f662be186baae7d6c2c97423bc29d (diff) | |
| parent | f3edfd30541d6f245d7dfa6fa7354cc916cc53e1 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'include/configs/ls1021aqds.h')
| -rw-r--r-- | include/configs/ls1021aqds.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index ca913b0671..8a5a707d3b 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -7,8 +7,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#include <config_cmd_default.h> - #define CONFIG_LS102XA #define CONFIG_SYS_GENERIC_BOARD @@ -409,16 +407,24 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMD_FAT #define CONFIG_DOS_PARTITION -/* QSPI */ +/* SPI */ #ifdef CONFIG_QSPI_BOOT +/* QSPI */ #define CONFIG_FSL_QSPI #define QSPI0_AMBA_BASE 0x40000000 #define FSL_QSPI_FLASH_SIZE (1 << 24) #define FSL_QSPI_FLASH_NUM 2 +#define CONFIG_SPI_FLASH_SPANSION + +/* DSPI */ +#define CONFIG_FSL_DSPI +/* DM SPI */ +#if defined(CONFIG_FSL_DSPI) || defined(CONFIG_FSL_QSPI) #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_SPANSION +#define CONFIG_DM_SPI_FLASH +#define CONFIG_SPI_FLASH_DATAFLASH +#endif #endif /* @@ -539,12 +545,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMDLINE_TAG #define CONFIG_CMDLINE_EDITING -#ifdef CONFIG_QSPI_BOOT -#undef CONFIG_CMD_IMLS -#else -#define CONFIG_CMD_IMLS -#endif - #define CONFIG_ARMV7_NONSEC #define CONFIG_ARMV7_VIRT #define CONFIG_PEN_ADDR_BIG_ENDIAN @@ -587,7 +587,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_CMD_ENV_EXISTS #define CONFIG_CMD_GREPENV #define CONFIG_CMD_MEMINFO #define CONFIG_CMD_MEMTEST |