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
rename CFG_ macros to CONFIG_SYS
[platform/kernel/u-boot.git]
/
board
/
quantum
/
fpga.c
diff --git
a/board/quantum/fpga.c
b/board/quantum/fpga.c
index
75c2658
..
092aaab
100644
(file)
--- a/
board/quantum/fpga.c
+++ b/
board/quantum/fpga.c
@@
-62,11
+62,11
@@
int fpga_boot (unsigned char *fpgadata, int size)
{
int fpga_boot (unsigned char *fpgadata, int size)
{
- volatile immap_t *immr = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *immr = (immap_t *) C
ONFIG_SYS
_IMMR;
int i, index, len;
int count;
int i, index, len;
int count;
-#ifdef C
FG
_FPGA_SPARTAN2
+#ifdef C
ONFIG_SYS
_FPGA_SPARTAN2
int j;
unsigned char data;
#else
int j;
unsigned char data;
#else
@@
-89,7
+89,7
@@
int fpga_boot (unsigned char *fpgadata, int size)
index = 0;
index = 0;
-#ifdef C
FG
_FPGA_SPARTAN2
+#ifdef C
ONFIG_SYS
_FPGA_SPARTAN2
/* search for preamble 0xFFFFFFFF */
while (1) {
if ((fpgadata[index] == 0xff) && (fpgadata[index + 1] == 0xff)
/* search for preamble 0xFFFFFFFF */
while (1) {
if ((fpgadata[index] == 0xff) && (fpgadata[index + 1] == 0xff)
@@
-159,12
+159,12
@@
int fpga_boot (unsigned char *fpgadata, int size)
debug ("write configuration data into fpga\n");
/* write configuration-data into fpga... */
debug ("write configuration data into fpga\n");
/* write configuration-data into fpga... */
-#ifdef C
FG
_FPGA_SPARTAN2
+#ifdef C
ONFIG_SYS
_FPGA_SPARTAN2
/*
* Load uncompressed image into fpga
*/
for (i = index; i < size; i++) {
/*
* Load uncompressed image into fpga
*/
for (i = index; i < size; i++) {
-#ifdef C
FG
_FPGA_PROG_FEEDBACK
+#ifdef C
ONFIG_SYS
_FPGA_PROG_FEEDBACK
if ((i % 1024) == 0)
printf ("%6d out of %6d\r", i, size); /* let them know we are alive */
#endif
if ((i % 1024) == 0)
printf ("%6d out of %6d\r", i, size); /* let them know we are alive */
#endif