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
/
siemens
/
SCM
/
fpga_scm.c
diff --git
a/board/siemens/SCM/fpga_scm.c
b/board/siemens/SCM/fpga_scm.c
index
661bf66
..
acd9c15
100644
(file)
--- a/
board/siemens/SCM/fpga_scm.c
+++ b/
board/siemens/SCM/fpga_scm.c
@@
-28,18
+28,18
@@
#include "../common/fpga.h"
fpga_t fpga_list[] = {
#include "../common/fpga.h"
fpga_t fpga_list[] = {
- {"FIOX", C
FG
_FIOX_BASE,
- C
FG_PD_FIOX_INIT, CFG_PD_FIOX_PROG, CFG
_PD_FIOX_DONE}
+ {"FIOX", C
ONFIG_SYS
_FIOX_BASE,
+ C
ONFIG_SYS_PD_FIOX_INIT, CONFIG_SYS_PD_FIOX_PROG, CONFIG_SYS
_PD_FIOX_DONE}
,
,
- {"FDOHM", C
FG
_FDOHM_BASE,
- C
FG_PD_FDOHM_INIT, CFG_PD_FDOHM_PROG, CFG
_PD_FDOHM_DONE}
+ {"FDOHM", C
ONFIG_SYS
_FDOHM_BASE,
+ C
ONFIG_SYS_PD_FDOHM_INIT, CONFIG_SYS_PD_FDOHM_PROG, CONFIG_SYS
_PD_FDOHM_DONE}
};
int fpga_count = sizeof (fpga_list) / sizeof (fpga_t);
ulong fpga_control (fpga_t * fpga, int cmd)
{
};
int fpga_count = sizeof (fpga_list) / sizeof (fpga_t);
ulong fpga_control (fpga_t * fpga, int cmd)
{
- volatile immap_t *immr = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *immr = (immap_t *) C
ONFIG_SYS
_IMMR;
switch (cmd) {
case FPGA_INIT_IS_HIGH:
switch (cmd) {
case FPGA_INIT_IS_HIGH:
@@
-74,11
+74,11
@@
ulong fpga_control (fpga_t * fpga, int cmd)
break;
case FPGA_GET_ID:
break;
case FPGA_GET_ID:
- if (fpga->conf_base == C
FG
_FIOX_BASE) {
+ if (fpga->conf_base == C
ONFIG_SYS
_FIOX_BASE) {
ulong ver =
*(volatile ulong *) (fpga->conf_base + 0x10);
return ((ver >> 10) & 0xf) + ((ver >> 2) & 0xf0);
ulong ver =
*(volatile ulong *) (fpga->conf_base + 0x10);
return ((ver >> 10) & 0xf) + ((ver >> 2) & 0xf0);
- } else if (fpga->conf_base == C
FG
_FDOHM_BASE) {
+ } else if (fpga->conf_base == C
ONFIG_SYS
_FDOHM_BASE) {
return (*(volatile ushort *) fpga->conf_base) & 0xff;
} else {
return *(volatile ulong *) fpga->conf_base;
return (*(volatile ushort *) fpga->conf_base) & 0xff;
} else {
return *(volatile ulong *) fpga->conf_base;