projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.denx.de/u-boot-avr32
[platform/kernel/u-boot.git]
/
common
/
cyclon2.c
diff --git
a/common/cyclon2.c
b/common/cyclon2.c
index
dce13b5
..
479bebb
100644
(file)
--- a/
common/cyclon2.c
+++ b/
common/cyclon2.c
@@
-27,8
+27,6
@@
#include <altera.h>
#include <ACEX1K.h> /* ACEX device family */
#include <altera.h>
#include <ACEX1K.h> /* ACEX device family */
-#if (CONFIG_FPGA & (CFG_ALTERA | CFG_CYCLON2))
-
/* Define FPGA_DEBUG to get debug printf's */
#ifdef FPGA_DEBUG
#define PRINTF(fmt,args...) printf (fmt ,##args)
/* Define FPGA_DEBUG to get debug printf's */
#ifdef FPGA_DEBUG
#define PRINTF(fmt,args...) printf (fmt ,##args)
@@
-301,5
+299,3
@@
static int CYC2_ps_reloc (Altera_desc * desc, ulong reloc_offset)
return ret_val;
}
return ret_val;
}
-
-#endif /* (CONFIG_FPGA & (CFG_ALTERA | CFG_CYCLON2)) */