projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'efi-2019-07-rc5-3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
[platform/kernel/u-boot.git]
/
include
/
configs
/
ls1012aqds.h
diff --git
a/include/configs/ls1012aqds.h
b/include/configs/ls1012aqds.h
index
4e85423
..
fb0d1ba
100644
(file)
--- a/
include/configs/ls1012aqds.h
+++ b/
include/configs/ls1012aqds.h
@@
-74,9
+74,7
@@
/* DSPI */
#define CONFIG_FSL_DSPI1
/* DSPI */
#define CONFIG_FSL_DSPI1
-#define CONFIG_DEFAULT_SPI_BUS 1
-#define CONFIG_CMD_SPI
#define MMAP_DSPI DSPI1_BASE_ADDR
#define CONFIG_SYS_DSPI_CTAR0 1
#define MMAP_DSPI DSPI1_BASE_ADDR
#define CONFIG_SYS_DSPI_CTAR0 1
@@
-99,11
+97,6
@@
DSPI_CTAR_DT(0))
#define CONFIG_SPI_FLASH_EON /* cs3 */
DSPI_CTAR_DT(0))
#define CONFIG_SPI_FLASH_EON /* cs3 */
-#define CONFIG_SF_DEFAULT_SPEED 10000000
-#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
-#define CONFIG_SF_DEFAULT_BUS 1
-#define CONFIG_SF_DEFAULT_CS 0
-
/* MMC */
#ifdef CONFIG_MMC
#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
/* MMC */
#ifdef CONFIG_MMC
#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
@@
-117,6
+110,5
@@
#define CONFIG_SYS_MEMTEST_START 0x80000000
#define CONFIG_SYS_MEMTEST_END 0x9fffffff
#define CONFIG_SYS_MEMTEST_START 0x80000000
#define CONFIG_SYS_MEMTEST_END 0x9fffffff
-#define CONFIG_MISC_INIT_R
-
+#include <asm/fsl_secure_boot.h>
#endif /* __LS1012AQDS_H__ */
#endif /* __LS1012AQDS_H__ */