diff options
| author | Tom Rini | 2017-07-29 11:44:08 -0400 |
|---|---|---|
| committer | Tom Rini | 2017-07-29 11:44:08 -0400 |
| commit | 19d1f1a2f3ccfbf85125150f7876ce22714b38bd (patch) | |
| tree | c356513a5bc27efa0ebf5c98026d7ebe2d675a8d /include | |
| parent | 211aaf309cde193918f9a19b0b010acebfd80a82 (diff) | |
| parent | 9af91b7c4041a455de5f3e3da4e36644768bff68 (diff) | |
Merge git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/astro_mcf5373l.h | 2 | ||||
| -rw-r--r-- | include/configs/socfpga_common.h | 6 | ||||
| -rw-r--r-- | include/configs/theadorable.h | 2 |
3 files changed, 1 insertions, 9 deletions
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 723bc154b3b..7e373a2ca4d 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -192,10 +192,8 @@ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_FPGA_COUNT 1 -#define CONFIG_FPGA #define CONFIG_FPGA_XILINX #define CONFIG_FPGA_SPARTAN3 -#define CONFIG_FPGA_ALTERA #define CONFIG_FPGA_CYCLON2 #define CONFIG_SYS_FPGA_PROG_FEEDBACK #define CONFIG_SYS_FPGA_WAIT 1000 diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 7e63b558296..2c23ae50734 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -103,14 +103,10 @@ /* * FPGA Driver */ -#ifdef CONFIG_TARGET_SOCFPGA_GEN5 #ifdef CONFIG_CMD_FPGA -#define CONFIG_FPGA -#define CONFIG_FPGA_ALTERA -#define CONFIG_FPGA_SOCFPGA #define CONFIG_FPGA_COUNT 1 #endif -#endif + /* * L4 OSC1 Timer 0 */ diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 3f9b69aeda2..e5edd5e8fd0 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -86,8 +86,6 @@ #define CONFIG_SYS_MEM_TOP_HIDE 0x80000 /* FPGA programming support */ -#define CONFIG_FPGA -#define CONFIG_FPGA_ALTERA #define CONFIG_FPGA_STRATIX_V /* |