projects
/
oweals
/
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-2020-01-rc2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
[oweals/u-boot.git]
/
include
/
configs
/
gw_ventana.h
diff --git
a/include/configs/gw_ventana.h
b/include/configs/gw_ventana.h
index 93608e5aec4d15d7b4773b6608c225fd34690334..e543061bff6d630d2b3249dd0ccc9226c3e2101b 100644
(file)
--- a/
include/configs/gw_ventana.h
+++ b/
include/configs/gw_ventana.h
@@
-47,15
+47,7
@@
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART2_BASE
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART2_BASE
-#ifdef CONFIG_SPI_FLASH
-
-/* SPI */
-#ifdef CONFIG_CMD_SF
- #define CONFIG_SPI_FLASH_MTD
- /* GPIO 3-19 (21248) */
-#endif
-
-#elif defined(CONFIG_SPL_NAND_SUPPORT)
+#if !defined(CONFIG_SPI_FLASH) && defined(CONFIG_SPL_NAND_SUPPORT)
/* Enable NAND support */
#ifdef CONFIG_CMD_NAND
#define CONFIG_SYS_MAX_NAND_DEVICE 1
/* Enable NAND support */
#ifdef CONFIG_CMD_NAND
#define CONFIG_SYS_MAX_NAND_DEVICE 1
@@
-81,9
+73,6
@@
/* MMC Configs */
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
/* MMC Configs */
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
-/* eMMC Configs */
-#define CONFIG_SUPPORT_EMMC_BOOT
-
/*
* SATA Configs
*/
/*
* SATA Configs
*/
@@
-141,7
+130,6
@@
/* Miscellaneous configurable options */
#define CONFIG_HWCONFIG
/* Miscellaneous configurable options */
#define CONFIG_HWCONFIG
-#define CONFIG_PREBOOT
/* Memory configuration */
#define CONFIG_SYS_MEMTEST_START 0x10000000
/* Memory configuration */
#define CONFIG_SYS_MEMTEST_START 0x10000000