diff options
| author | Stefan Roese <sr@denx.de> | 2008-01-13 15:04:37 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-01-13 15:04:37 +0100 |
| commit | 8d79953d03e6c5b24215609997dafe4daa623cd6 (patch) | |
| tree | cb9a4246cde2d32fa600461da008c7d59b57cf4b /board/esd/ocrtc | |
| parent | 47cc23cbe9a669c510183f4f049bf703ef445f3b (diff) | |
| parent | 2b2f43ed6a30ece77f76191c845ac95267daa31a (diff) | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'board/esd/ocrtc')
| -rw-r--r-- | board/esd/ocrtc/cmd_ocrtc.c | 2 | ||||
| -rw-r--r-- | board/esd/ocrtc/u-boot.lds | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/board/esd/ocrtc/cmd_ocrtc.c b/board/esd/ocrtc/cmd_ocrtc.c index 4177f68ef4..f83dfe870b 100644 --- a/board/esd/ocrtc/cmd_ocrtc.c +++ b/board/esd/ocrtc/cmd_ocrtc.c @@ -25,7 +25,7 @@ #include <command.h> #include <pci.h> #include <pci_ids.h> -#include <405gp_pci.h> +#include <asm/4xx_pci.h> #if defined(CONFIG_CMD_BSP) diff --git a/board/esd/ocrtc/u-boot.lds b/board/esd/ocrtc/u-boot.lds index 476b4a0550..508c5d23bb 100644 --- a/board/esd/ocrtc/u-boot.lds +++ b/board/esd/ocrtc/u-boot.lds @@ -64,7 +64,7 @@ SECTIONS cpu/ppc4xx/start.o (.text) cpu/ppc4xx/traps.o (.text) cpu/ppc4xx/interrupts.o (.text) - cpu/ppc4xx/serial.o (.text) + cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) common/dlmalloc.o (.text) @@ -138,7 +138,7 @@ SECTIONS __init_end = .; __bss_start = .; - .bss : + .bss (NOLOAD) : { *(.sbss) *(.scommon) *(.dynbss) |