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 'master' of git://git.denx.de/u-boot-nand-flash
[platform/kernel/u-boot.git]
/
include
/
fpga.h
diff --git
a/include/fpga.h
b/include/fpga.h
index
52d93b1
..
a48b89b
100644
(file)
--- a/
include/fpga.h
+++ b/
include/fpga.h
@@
-40,13
+40,13
@@
#endif
/* CONFIG_FPGA bit assignments */
#endif
/* CONFIG_FPGA bit assignments */
-#define C
FG_FPGA_MAN(x)
(x)
-#define C
FG_FPGA_DEV(x)
((x) << 8 )
-#define C
FG_FPGA_IF(x)
((x) << 16 )
+#define C
ONFIG_SYS_FPGA_MAN(x)
(x)
+#define C
ONFIG_SYS_FPGA_DEV(x)
((x) << 8 )
+#define C
ONFIG_SYS_FPGA_IF(x)
((x) << 16 )
/* FPGA Manufacturer bits in CONFIG_FPGA */
/* FPGA Manufacturer bits in CONFIG_FPGA */
-#define C
FG_FPGA_XILINX CFG
_FPGA_MAN( 0x1 )
-#define C
FG_FPGA_ALTERA CFG
_FPGA_MAN( 0x2 )
+#define C
ONFIG_SYS_FPGA_XILINX CONFIG_SYS
_FPGA_MAN( 0x1 )
+#define C
ONFIG_SYS_FPGA_ALTERA CONFIG_SYS
_FPGA_MAN( 0x2 )
/* fpga_xxxx function return value definitions */
/* fpga_xxxx function return value definitions */