diff options
| author | Tom Rini <trini@konsulko.com> | 2016-12-23 18:41:32 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-12-23 18:41:32 -0500 |
| commit | 7ceae0eac04154a651caf2b1c8399fefd3de308d (patch) | |
| tree | 79b088e26b9ad6db58bb05c9a009f87978f3223b /include | |
| parent | 0683e7e0f3cf9e5e1d02c9a0bb57eecb203ab800 (diff) | |
| parent | cb71c6d85409715f541261f0bdda4a8060128689 (diff) | |
| download | u-boot-7ceae0eac04154a651caf2b1c8399fefd3de308d.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/digsy_mtc.h | 6 | ||||
| -rw-r--r-- | include/configs/gplugd.h | 9 |
2 files changed, 1 insertions, 14 deletions
diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h index b2120b9b33..ae0d3d412a 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -216,12 +216,6 @@ #define CONFIG_BOOTCOMMAND "run mtcb_start" /* - * SPI configuration - */ -#define CONFIG_HARD_SPI 1 -#define CONFIG_MPC52XX_SPI 1 - -/* * I2C configuration */ #define CONFIG_HARD_I2C 1 diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h index c1b43fd0fe..92e211713c 100644 --- a/include/configs/gplugd.h +++ b/include/configs/gplugd.h @@ -72,11 +72,6 @@ /* GPIO Configuration for PHY */ #define CONFIG_SYS_GPIO_PHY_RST 104 /* GPIO104 */ -/* SPI Support */ -#define CONFIG_ARMADA100_SPI -#define CONFIG_ENV_SPI_CS 110 -#define CONFIG_SYS_SSP_PORT 2 - /* Flash Support */ /* @@ -95,10 +90,8 @@ /* * Environment variables configurations */ -#define CONFIG_ENV_IS_IN_SPI_FLASH -#define CONFIG_ENV_SECT_SIZE 0x4000 +#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE 0x4000 -#define CONFIG_ENV_OFFSET 0x07C000 #ifdef CONFIG_CMD_USB #define CONFIG_USB_EHCI |