diff options
author | Tom Rini <trini@konsulko.com> | 2016-08-26 07:41:54 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-08-26 07:41:54 -0400 |
commit | c733c18e35c161fefdd4141bdce7a69b1bcfd302 (patch) | |
tree | 7d6cb30cca33890009e0b08804a457f08b3db89c /include/configs | |
parent | 4832c7f5f79feebf8549f33c7257dec47c336470 (diff) | |
parent | bdf58c73ca406e31be49ad875969b2f9aacb9b65 (diff) | |
download | u-boot-imx-c733c18e35c161fefdd4141bdce7a69b1bcfd302.zip u-boot-imx-c733c18e35c161fefdd4141bdce7a69b1bcfd302.tar.gz u-boot-imx-c733c18e35c161fefdd4141bdce7a69b1bcfd302.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot-marvell
Diffstat (limited to 'include/configs')
-rw-r--r-- | include/configs/clearfog.h | 2 | ||||
-rw-r--r-- | include/configs/db-88f6720.h | 2 | ||||
-rw-r--r-- | include/configs/db-88f6820-gp.h | 2 | ||||
-rw-r--r-- | include/configs/db-mv784mp-gp.h | 2 | ||||
-rw-r--r-- | include/configs/ds414.h | 2 | ||||
-rw-r--r-- | include/configs/maxbcm.h | 2 | ||||
-rw-r--r-- | include/configs/theadorable.h | 2 |
7 files changed, 0 insertions, 14 deletions
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index ffaeedb..6cbdee2 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -133,8 +133,6 @@ #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD -#define CONFIG_SPL_SPI_BUS 0 -#define CONFIG_SPL_SPI_CS 0 #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS #endif diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h index 01c7895..4e00812 100644 --- a/include/configs/db-88f6720.h +++ b/include/configs/db-88f6720.h @@ -100,8 +100,6 @@ #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD -#define CONFIG_SPL_SPI_BUS 0 -#define CONFIG_SPL_SPI_CS 0 #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 3539a62..88614b3 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -134,8 +134,6 @@ #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD -#define CONFIG_SPL_SPI_BUS 0 -#define CONFIG_SPL_SPI_CS 0 #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x24000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS #endif diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index d6acbbc..5cdfd1c 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -125,8 +125,6 @@ #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD -#define CONFIG_SPL_SPI_BUS 0 -#define CONFIG_SPL_SPI_CS 0 #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 23373cd..ff188e2 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -132,8 +132,6 @@ #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD -#define CONFIG_SPL_SPI_BUS 0 -#define CONFIG_SPL_SPI_CS 0 #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x24000 /* DS414 bus width is 32bits */ diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index fed310f..47d2948 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -93,8 +93,6 @@ #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD -#define CONFIG_SPL_SPI_BUS 0 -#define CONFIG_SPL_SPI_CS 0 #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 /* Enable DDR support in SPL (DDR3 training from Marvell bin_hdr) */ diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 1caa858..8bbf879 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -158,8 +158,6 @@ #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD -#define CONFIG_SPL_SPI_BUS 0 -#define CONFIG_SPL_SPI_CS 0 #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x1a000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS |