diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-17 16:21:32 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-17 16:21:32 +0300 |
| commit | 36c97c4db71769bb11bd1f130f1442e4122728a8 (patch) | |
| tree | af67028bcd669fbbe8436efae774c3bcb57cbdf9 /include/configs | |
| parent | ecb76eff56a312f4a69fd9a8ac839db646256b00 (diff) | |
| parent | 4c96c61216719155b3a1d51f6373e996335861de (diff) | |
| download | u-boot-36c97c4db71769bb11bd1f130f1442e4122728a8.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
- drop non-DM code from ti_qspi
- support spi-mem for ti_qspi
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/am43xx_evm.h | 6 | ||||
| -rw-r--r-- | include/configs/am57xx_evm.h | 5 | ||||
| -rw-r--r-- | include/configs/cm_t43.h | 3 | ||||
| -rw-r--r-- | include/configs/dra7xx_evm.h | 5 |
4 files changed, 0 insertions, 19 deletions
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 5a6080645a..37d058ebbc 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -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> diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index 48999847ee..c14b010550 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.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 */ diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index ffe4a44c86..e4e37e5bbb 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.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 diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 7441f4a69d..f6be6595fe 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -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 |