diff options
Diffstat (limited to 'board/freescale/common/cadmus.c')
| -rw-r--r-- | board/freescale/common/cadmus.c | 12 | 
1 files changed, 6 insertions, 6 deletions
| diff --git a/board/freescale/common/cadmus.c b/board/freescale/common/cadmus.c index 5f86de5af..db54bc4d5 100644 --- a/board/freescale/common/cadmus.c +++ b/board/freescale/common/cadmus.c @@ -27,8 +27,8 @@  /*   * CADMUS Board System Registers   */ -#ifndef CFG_CADMUS_BASE_REG -#define CFG_CADMUS_BASE_REG	(CADMUS_BASE_ADDR + 0x4000) +#ifndef CONFIG_SYS_CADMUS_BASE_REG +#define CONFIG_SYS_CADMUS_BASE_REG	(CADMUS_BASE_ADDR + 0x4000)  #endif  typedef struct cadmus_reg { @@ -47,7 +47,7 @@ typedef struct cadmus_reg {  unsigned int  get_board_version(void)  { -	volatile cadmus_reg_t *cadmus = (cadmus_reg_t *)CFG_CADMUS_BASE_REG; +	volatile cadmus_reg_t *cadmus = (cadmus_reg_t *)CONFIG_SYS_CADMUS_BASE_REG;  	return cadmus->cm_ver;  } @@ -56,7 +56,7 @@ get_board_version(void)  unsigned long  get_clock_freq(void)  { -	volatile cadmus_reg_t *cadmus = (cadmus_reg_t *)CFG_CADMUS_BASE_REG; +	volatile cadmus_reg_t *cadmus = (cadmus_reg_t *)CONFIG_SYS_CADMUS_BASE_REG;  	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)  { -	volatile cadmus_reg_t *cadmus = (cadmus_reg_t *)CFG_CADMUS_BASE_REG; +	volatile cadmus_reg_t *cadmus = (cadmus_reg_t *)CONFIG_SYS_CADMUS_BASE_REG;  	/*  	 * PCI slot in USER bits CSR[6:7] by convention. @@ -86,7 +86,7 @@ get_pci_slot(void)  unsigned int  get_pci_dual(void)  { -	volatile cadmus_reg_t *cadmus = (cadmus_reg_t *)CFG_CADMUS_BASE_REG; +	volatile cadmus_reg_t *cadmus = (cadmus_reg_t *)CONFIG_SYS_CADMUS_BASE_REG;  	/*  	 * PCI DUAL in CM_PCI[3] |