diff options
author | Wolfgang Denk <wd@denx.de> | 2008-01-09 21:34:46 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-01-09 21:34:46 +0100 |
commit | 3b93020d74630f0574cbd26d200a82c00dd11eaa (patch) | |
tree | fdf53ce4da01d337ceb71cadf496a9fc8d2fb62c /include/configs/alpr.h | |
parent | c83d7ca4dadd44ae430235077f63b64a11f36f6e (diff) | |
parent | 6007f3251c0967adc13f2ed8be1b924ddc30124d (diff) | |
download | u-boot-imx-3b93020d74630f0574cbd26d200a82c00dd11eaa.zip u-boot-imx-3b93020d74630f0574cbd26d200a82c00dd11eaa.tar.gz u-boot-imx-3b93020d74630f0574cbd26d200a82c00dd11eaa.tar.bz2 |
Merge branch 'master' of /home/wd/git/u-boot/master/
Diffstat (limited to 'include/configs/alpr.h')
-rw-r--r-- | include/configs/alpr.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/configs/alpr.h b/include/configs/alpr.h index aff9823..cfe08c8 100644 --- a/include/configs/alpr.h +++ b/include/configs/alpr.h @@ -296,7 +296,9 @@ /*----------------------------------------------------------------------- * FPGA stuff *-----------------------------------------------------------------------*/ -#define CONFIG_FPGA CFG_ALTERA_CYCLON2 +#define CONFIG_FPGA +#define CONFIG_FPGA_ALTERA +#define CONFIG_FPGA_CYCLON2 #define CFG_FPGA_CHECK_CTRLC #define CFG_FPGA_PROG_FEEDBACK #define CONFIG_FPGA_COUNT 1 /* Ich habe 2 ... aber in |