projects
/
oweals
/
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
[oweals/u-boot.git]
/
board
/
freescale
/
common
/
cadmus.c
diff --git
a/board/freescale/common/cadmus.c
b/board/freescale/common/cadmus.c
index 5f86de5af22ff4129bf36898f65d25d7208b557e..db54bc4d51dd329b93d7b0054f415f15e16c4f70 100644
(file)
--- a/
board/freescale/common/cadmus.c
+++ b/
board/freescale/common/cadmus.c
@@
-27,8
+27,8
@@
/*
* CADMUS Board System Registers
*/
/*
* CADMUS Board System Registers
*/
-#ifndef C
FG
_CADMUS_BASE_REG
-#define C
FG_CADMUS_BASE_REG
(CADMUS_BASE_ADDR + 0x4000)
+#ifndef C
ONFIG_SYS
_CADMUS_BASE_REG
+#define C
ONFIG_SYS_CADMUS_BASE_REG
(CADMUS_BASE_ADDR + 0x4000)
#endif
typedef struct cadmus_reg {
#endif
typedef struct cadmus_reg {
@@
-47,7
+47,7
@@
typedef struct cadmus_reg {
unsigned int
get_board_version(void)
{
unsigned int
get_board_version(void)
{
- volatile cadmus_reg_t *cadmus = (cadmus_reg_t *)C
FG
_CADMUS_BASE_REG;
+ volatile cadmus_reg_t *cadmus = (cadmus_reg_t *)C
ONFIG_SYS
_CADMUS_BASE_REG;
return cadmus->cm_ver;
}
return cadmus->cm_ver;
}
@@
-56,7
+56,7
@@
get_board_version(void)
unsigned long
get_clock_freq(void)
{
unsigned long
get_clock_freq(void)
{
- volatile cadmus_reg_t *cadmus = (cadmus_reg_t *)C
FG
_CADMUS_BASE_REG;
+ volatile cadmus_reg_t *cadmus = (cadmus_reg_t *)C
ONFIG_SYS
_CADMUS_BASE_REG;
uint pci1_speed = (cadmus->cm_pci >> 2) & 0x3; /* PSPEED in [4:5] */
uint pci1_speed = (cadmus->cm_pci >> 2) & 0x3; /* PSPEED in [4:5] */
@@
-74,7
+74,7
@@
get_clock_freq(void)
unsigned int
get_pci_slot(void)
{
unsigned int
get_pci_slot(void)
{
- volatile cadmus_reg_t *cadmus = (cadmus_reg_t *)C
FG
_CADMUS_BASE_REG;
+ volatile cadmus_reg_t *cadmus = (cadmus_reg_t *)C
ONFIG_SYS
_CADMUS_BASE_REG;
/*
* PCI slot in USER bits CSR[6:7] by convention.
/*
* PCI slot in USER bits CSR[6:7] by convention.
@@
-86,7
+86,7
@@
get_pci_slot(void)
unsigned int
get_pci_dual(void)
{
unsigned int
get_pci_dual(void)
{
- volatile cadmus_reg_t *cadmus = (cadmus_reg_t *)C
FG
_CADMUS_BASE_REG;
+ volatile cadmus_reg_t *cadmus = (cadmus_reg_t *)C
ONFIG_SYS
_CADMUS_BASE_REG;
/*
* PCI DUAL in CM_PCI[3]
/*
* PCI DUAL in CM_PCI[3]