diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-03-21 22:15:49 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-03-21 22:15:49 +0100 |
| commit | ee1702d75a30d076139d1841383a1fa7220a0e11 (patch) | |
| tree | b008c231b7d5e4e52ac49aec9a49bc73413aaf30 /board/esd/pci405 | |
| parent | e60beb13cf0135dc71c541021487b5ccc4d269cb (diff) | |
| parent | faac4fd852e39cb1d7a740801b060e41aeacef1f (diff) | |
Merge branch 'next' of ../next
Diffstat (limited to 'board/esd/pci405')
| -rw-r--r-- | board/esd/pci405/pci405.c | 8 | ||||
| -rw-r--r-- | board/esd/pci405/u-boot.lds | 19 |
2 files changed, 5 insertions, 22 deletions
diff --git a/board/esd/pci405/pci405.c b/board/esd/pci405/pci405.c index 0602abf9c4..8973f97095 100644 --- a/board/esd/pci405/pci405.c +++ b/board/esd/pci405/pci405.c @@ -338,17 +338,17 @@ int checkboard (void) } /* ------------------------------------------------------------------------- */ +#define UART1_MCR 0xef600404 int wpeeprom(int wp) { int wp_state = wp; - volatile unsigned char *uart1_mcr = (volatile unsigned char *)0xef600404; if (wp == 1) { - *uart1_mcr &= ~0x02; + out_8((void *)UART1_MCR, in_8((void *)UART1_MCR) & ~0x02); } else if (wp == 0) { - *uart1_mcr |= 0x02; + out_8((void *)UART1_MCR, in_8((void *)UART1_MCR) | 0x02); } else { - if (*uart1_mcr & 0x02) { + if (in_8((void *)UART1_MCR) & 0x02) { wp_state = 0; } else { wp_state = 1; diff --git a/board/esd/pci405/u-boot.lds b/board/esd/pci405/u-boot.lds index 9697cc6b35..8c010162f0 100644 --- a/board/esd/pci405/u-boot.lds +++ b/board/esd/pci405/u-boot.lds @@ -57,22 +57,7 @@ SECTIONS .plt : { *(.plt) } .text : { - /* WARNING - the following is hand-optimized to fit within */ - /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/ppc4xx/start.o (.text) - cpu/ppc4xx/traps.o (.text) - cpu/ppc4xx/interrupts.o (.text) - cpu/ppc4xx/4xx_uart.o (.text) - cpu/ppc4xx/cpu_init.o (.text) - cpu/ppc4xx/speed.o (.text) - common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) - lib_generic/zlib.o (.text) - -/* . = env_offset;*/ -/* common/env_embedded.o(.text)*/ *(.text) *(.fixup) @@ -82,10 +67,8 @@ SECTIONS PROVIDE (etext = .); .rodata : { - *(.rodata) - *(.rodata1) - *(.rodata.str1.4) *(.eh_frame) + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } .fini : { *(.fini) } =0 .ctors : { *(.ctors) } |