projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix crash on sequoia in ppc_4xx_eth_init
[oweals/u-boot.git]
/
common
/
ACEX1K.c
diff --git
a/common/ACEX1K.c
b/common/ACEX1K.c
index 2a421e2da9c44df38a7698fff482a29299546bed..76dc1664385b8ea9da322101adfa082706fc2762 100644
(file)
--- a/
common/ACEX1K.c
+++ b/
common/ACEX1K.c
@@
-28,7
+28,7
@@
#include <common.h> /* core U-Boot definitions */
#include <ACEX1K.h> /* ACEX device family */
#include <common.h> /* core U-Boot definitions */
#include <ACEX1K.h> /* ACEX device family */
-#if
(CONFIG_FPGA & (CFG_ALTERA | CFG_ACEX1K)
)
+#if
defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ALTERA) && defined(CONFIG_FPGA_ACEX1K
)
/* Define FPGA_DEBUG to get debug printf's */
#ifdef FPGA_DEBUG
/* Define FPGA_DEBUG to get debug printf's */
#ifdef FPGA_DEBUG
@@
-363,4
+363,4
@@
static int ACEX1K_ps_reloc (Altera_desc * desc, ulong reloc_offset)
}
}
-#endif /*
(CONFIG_FPGA & (CFG_ALTERA | CFG_ACEX1K))
*/
+#endif /*
CONFIG_FPGA && CONFIG_FPGA_ALTERA && CONFIG_FPGA_ACEX1K
*/