Merge branch 'master' of git://git.denx.de/u-boot-spi
- drop non-DM code from ti_qspi - support spi-mem for ti_qspi
This commit is contained in:
@@ -120,12 +120,6 @@
|
||||
#define CONFIG_ENV_OFFSET_REDUND 0x120000
|
||||
#endif
|
||||
|
||||
/* SPI */
|
||||
#define CONFIG_TI_SPI_MMAP
|
||||
#define CONFIG_QSPI_SEL_GPIO 48
|
||||
#define CONFIG_QSPI_QUAD_SUPPORT
|
||||
#define CONFIG_TI_EDMA3
|
||||
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
#include <environment/ti/dfu.h>
|
||||
#include <environment/ti/mmc.h>
|
||||
|
||||
@@ -92,11 +92,6 @@
|
||||
#define CONFIG_SYS_SPI_ARGS_SIZE 0x80000
|
||||
|
||||
/* SPI SPL */
|
||||
#define CONFIG_TI_EDMA3
|
||||
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000
|
||||
|
||||
/* SPI */
|
||||
#define CONFIG_TI_SPI_MMAP
|
||||
#define CONFIG_QSPI_QUAD_SUPPORT
|
||||
|
||||
#endif /* __CONFIG_AM57XX_EVM_H */
|
||||
|
||||
@@ -53,9 +53,6 @@
|
||||
#define CONFIG_USB_XHCI_OMAP
|
||||
#define CONFIG_AM437X_USB2PHY2_HOST
|
||||
|
||||
/* SPI Flash support */
|
||||
#define CONFIG_TI_SPI_MMAP
|
||||
|
||||
/* Power */
|
||||
#define CONFIG_POWER
|
||||
#define CONFIG_POWER_I2C
|
||||
|
||||
@@ -72,10 +72,6 @@
|
||||
#define CONFIG_NET_RETRY_COUNT 10
|
||||
#define CONFIG_PHY_TI
|
||||
|
||||
/* SPI */
|
||||
#define CONFIG_TI_SPI_MMAP
|
||||
#define CONFIG_QSPI_QUAD_SUPPORT
|
||||
|
||||
/*
|
||||
* Default to using SPI for environment, etc.
|
||||
* 0x000000 - 0x040000 : QSPI.SPL (256KiB)
|
||||
@@ -98,7 +94,6 @@
|
||||
#endif
|
||||
|
||||
/* SPI SPL */
|
||||
#define CONFIG_TI_EDMA3
|
||||
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000
|
||||
|
||||
#define CONFIG_SUPPORT_EMMC_BOOT
|
||||
|
||||
Reference in New Issue
Block a user