diff options
Diffstat (limited to 'board/csb272')
| -rw-r--r-- | board/csb272/csb272.c | 4 | ||||
| -rw-r--r-- | board/csb272/init.S | 4 | ||||
| -rw-r--r-- | board/csb272/u-boot.lds | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/board/csb272/csb272.c b/board/csb272/csb272.c index 5a585ae..11596d2 100644 --- a/board/csb272/csb272.c +++ b/board/csb272/csb272.c @@ -51,9 +51,9 @@ uchar pll_fs6377_regs[16] = { */ int pll_init(void) { - i2c_init(CFG_I2C_SPEED, CFG_I2C_SLAVE); + i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); - return i2c_write(CFG_I2C_PLL_ADDR, 0, 1, + return i2c_write(CONFIG_SYS_I2C_PLL_ADDR, 0, 1, (uchar *) pll_fs6377_regs, sizeof(pll_fs6377_regs)); } diff --git a/board/csb272/init.S b/board/csb272/init.S index e00ebf8..ab371f2 100644 --- a/board/csb272/init.S +++ b/board/csb272/init.S @@ -82,11 +82,11 @@ ext_bus_cntlr_init: mflr r3 /* get address of ..getAddr */ /* Calculate number of cache lines for this function */ - addi r4, 0, (((.Lfe0 - ..getAddr) / CFG_CACHELINE_SIZE) + 2) + addi r4, 0, (((.Lfe0 - ..getAddr) / CONFIG_SYS_CACHELINE_SIZE) + 2) mtctr r4 ..ebcloop: icbt r0, r3 /* prefetch cache line for addr in r3*/ - addi r3, r3, CFG_CACHELINE_SIZE /* move to next cache line */ + addi r3, r3, CONFIG_SYS_CACHELINE_SIZE /* move to next cache line */ bdnz ..ebcloop /* continue for $CTR cache lines */ /******************************************************************** diff --git a/board/csb272/u-boot.lds b/board/csb272/u-boot.lds index 947fbd6..af87188 100644 --- a/board/csb272/u-boot.lds +++ b/board/csb272/u-boot.lds @@ -68,7 +68,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - cpu/ppc4xx/4xx_enet.o (.text) + drivers/net/4xx_enet.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) @@ -76,7 +76,7 @@ SECTIONS lib_ppc/board.o (.text) lib_generic/zlib.o (.text) /* . = env_offset;*/ -/* common/environment.o(.text)*/ +/* common/env_embedded.o(.text)*/ *(.text) *(.fixup) @@ -147,6 +147,7 @@ SECTIONS *(.dynbss) *(.bss) *(COMMON) + . = ALIGN(4); } _end = . ; PROVIDE (end = .); |