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
/
sandburst
/
common
/
sb_common.c
diff --git
a/board/sandburst/common/sb_common.c
b/board/sandburst/common/sb_common.c
index
51b1c75
..
f6ea16f
100644
(file)
--- a/
board/sandburst/common/sb_common.c
+++ b/
board/sandburst/common/sb_common.c
@@
-43,7
+43,7
@@
int sbcommon_get_master(void)
{
ppc440_gpio_regs_t *gpio_regs;
{
ppc440_gpio_regs_t *gpio_regs;
- gpio_regs = (ppc440_gpio_regs_t *)C
FG
_GPIO_BASE;
+ gpio_regs = (ppc440_gpio_regs_t *)C
ONFIG_SYS
_GPIO_BASE;
if (gpio_regs->in & SBCOMMON_GPIO_PRI_N) {
return 0;
if (gpio_regs->in & SBCOMMON_GPIO_PRI_N) {
return 0;
@@
-63,7
+63,7
@@
int sbcommon_secondary_present(void)
{
ppc440_gpio_regs_t *gpio_regs;
{
ppc440_gpio_regs_t *gpio_regs;
- gpio_regs = (ppc440_gpio_regs_t *)C
FG
_GPIO_BASE;
+ gpio_regs = (ppc440_gpio_regs_t *)C
ONFIG_SYS
_GPIO_BASE;
if (gpio_regs->in & SBCOMMON_GPIO_SEC_PRES)
return 0;
if (gpio_regs->in & SBCOMMON_GPIO_SEC_PRES)
return 0;
@@
-84,7
+84,7
@@
unsigned short sbcommon_get_serial_number(void)
/* Get the board serial number from eeprom */
/* Initialize I2C */
/* Get the board serial number from eeprom */
/* Initialize I2C */
- i2c_init (C
FG_I2C_SPEED, CFG
_I2C_SLAVE);
+ i2c_init (C
ONFIG_SYS_I2C_SPEED, CONFIG_SYS
_I2C_SLAVE);
/* Read 256 bytes in EEPROM */
i2c_read (0x50, 0, 1, buff, 0x100);
/* Read 256 bytes in EEPROM */
i2c_read (0x50, 0, 1, buff, 0x100);
@@
-218,11
+218,11
@@
phys_size_t initdram (int board_type)
*
*
************************************************************************/
*
*
************************************************************************/
-#if defined(C
FG
_DRAM_TEST)
+#if defined(C
ONFIG_SYS
_DRAM_TEST)
int testdram (void)
{
int testdram (void)
{
- uint *pstart = (uint *) C
FG
_MEMTEST_START;
- uint *pend = (uint *) C
FG
_MEMTEST_END;
+ uint *pstart = (uint *) C
ONFIG_SYS
_MEMTEST_START;
+ uint *pend = (uint *) C
ONFIG_SYS
_MEMTEST_END;
uint *p;
printf("Testing SDRAM: ");
uint *p;
printf("Testing SDRAM: ");
@@
-340,7
+340,7
@@
int pci_pre_init(struct pci_controller * hose )
* may not be sufficient for a given board.
*
************************************************************************/
* may not be sufficient for a given board.
*
************************************************************************/
-#if defined(CONFIG_PCI) && defined(C
FG
_PCI_TARGET_INIT)
+#if defined(CONFIG_PCI) && defined(C
ONFIG_SYS
_PCI_TARGET_INIT)
void pci_target_init(struct pci_controller * hose )
{
/*--------------------------------------------------------------------------+
void pci_target_init(struct pci_controller * hose )
{
/*--------------------------------------------------------------------------+
@@
-355,7
+355,7
@@
void pci_target_init(struct pci_controller * hose )
* Map all of SDRAM to PCI address 0x0000_0000. Note that the 440 strapping
* options to not support sizes such as 128/256 MB.
*--------------------------------------------------------------------------*/
* Map all of SDRAM to PCI address 0x0000_0000. Note that the 440 strapping
* options to not support sizes such as 128/256 MB.
*--------------------------------------------------------------------------*/
- out32r( PCIX0_PIM0LAL, C
FG
_SDRAM_BASE );
+ out32r( PCIX0_PIM0LAL, C
ONFIG_SYS
_SDRAM_BASE );
out32r( PCIX0_PIM0LAH, 0 );
out32r( PCIX0_PIM0SA, ~(gd->ram_size - 1) | 1 );
out32r( PCIX0_PIM0LAH, 0 );
out32r( PCIX0_PIM0SA, ~(gd->ram_size - 1) | 1 );
@@
-364,12
+364,12
@@
void pci_target_init(struct pci_controller * hose )
/*--------------------------------------------------------------------------+
* Program the board's subsystem id/vendor id
*--------------------------------------------------------------------------*/
/*--------------------------------------------------------------------------+
* Program the board's subsystem id/vendor id
*--------------------------------------------------------------------------*/
- out16r( PCIX0_SBSYSVID, C
FG
_PCI_SUBSYS_VENDORID );
- out16r( PCIX0_SBSYSID, C
FG
_PCI_SUBSYS_DEVICEID );
+ out16r( PCIX0_SBSYSVID, C
ONFIG_SYS
_PCI_SUBSYS_VENDORID );
+ out16r( PCIX0_SBSYSID, C
ONFIG_SYS
_PCI_SUBSYS_DEVICEID );
out16r( PCIX0_CMD, in16r(PCIX0_CMD) | PCI_COMMAND_MEMORY );
}
out16r( PCIX0_CMD, in16r(PCIX0_CMD) | PCI_COMMAND_MEMORY );
}
-#endif /* defined(CONFIG_PCI) && defined(C
FG
_PCI_TARGET_INIT) */
+#endif /* defined(CONFIG_PCI) && defined(C
ONFIG_SYS
_PCI_TARGET_INIT) */
/*************************************************************************
/*************************************************************************
@@
-405,7
+405,7
@@
void board_get_enetaddr (uchar * enet)
if (0 == macaddr_idx) {
/* Initialize I2C */
if (0 == macaddr_idx) {
/* Initialize I2C */
- i2c_init (C
FG_I2C_SPEED, CFG
_I2C_SLAVE);
+ i2c_init (C
ONFIG_SYS_I2C_SPEED, CONFIG_SYS
_I2C_SLAVE);
/* Read 256 bytes in EEPROM */
i2c_read (0x50, 0, 1, buff, 0x100);
/* Read 256 bytes in EEPROM */
i2c_read (0x50, 0, 1, buff, 0x100);