summaryrefslogtreecommitdiff
path: root/common/cyclon2.c
diff options
context:
space:
mode:
authorMatthias Fuchs <matthias.fuchs@esd-electronics.com>2007-12-27 17:12:34 +0100
committerWolfgang Denk <wd@denx.de>2008-01-09 13:34:20 +0100
commit0133502e39ff89b67c26cb4015e0e7e8d9571184 (patch)
tree06bb9976f4f4ef9cb470b57f6271e86c7d09c2fb /common/cyclon2.c
parent95c6bc7d4a3588b452baca610f8c795a83630477 (diff)
downloadu-boot-imx-0133502e39ff89b67c26cb4015e0e7e8d9571184.zip
u-boot-imx-0133502e39ff89b67c26cb4015e0e7e8d9571184.tar.gz
u-boot-imx-0133502e39ff89b67c26cb4015e0e7e8d9571184.tar.bz2
Improve configuration of FPGA subsystem
This patch removes the FPGA subsystem configuration through the CONFIG_FPGA bitmask configuration option. See README for the new options: CONFIG_FPGA, CONFIG_FPGA_<vendor>, CONFIG_FPGA_<family> Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Diffstat (limited to 'common/cyclon2.c')
-rw-r--r--common/cyclon2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cyclon2.c b/common/cyclon2.c
index dce13b5..06f5e8a 100644
--- a/common/cyclon2.c
+++ b/common/cyclon2.c
@@ -27,7 +27,7 @@
#include <altera.h>
#include <ACEX1K.h> /* ACEX device family */
-#if (CONFIG_FPGA & (CFG_ALTERA | CFG_CYCLON2))
+#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ALTERA) && defined(CONFIG_FPGA_CYCLON2)
/* Define FPGA_DEBUG to get debug printf's */
#ifdef FPGA_DEBUG
@@ -302,4 +302,4 @@ static int CYC2_ps_reloc (Altera_desc * desc, ulong reloc_offset)
return ret_val;
}
-#endif /* (CONFIG_FPGA & (CFG_ALTERA | CFG_CYCLON2)) */
+#endif /* CONFIG_FPGA && CONFIG_FPGA_ALTERA && CONFIG_FPGA_CYCLON2 */