diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-09-12 00:48:57 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-09-12 00:48:57 +0200 |
| commit | f34024d4a328e6edd906456da98d2c537155c4f7 (patch) | |
| tree | ffb2156471629c6c7312cf2c24a59ecf11cf06ea | |
| parent | 38ad82da0c1180ecdeb212a8f4245e945bcc546e (diff) | |
Fix memory corruption problem on STX GP3 SSA Board.
Signed-off-by: Wolfgang Denk <wd@denx.de>
| -rw-r--r-- | board/stxssa/stxssa.c | 4 | ||||
| -rw-r--r-- | board/stxssa/u-boot.lds | 1 | ||||
| -rw-r--r-- | net/net.c | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/board/stxssa/stxssa.c b/board/stxssa/stxssa.c index 9a2bfbef8e4..9bacb98d865 100644 --- a/board/stxssa/stxssa.c +++ b/board/stxssa/stxssa.c @@ -381,9 +381,11 @@ static struct pci_config_table pci_stxgp3_config_table[] = { static struct pci_controller hose[] = { #ifndef CONFIG_PCI_PNP { config_table: pci_stxgp3_config_table,}, -#ifdef CONFIG_MPC85XX_PCI2 +#else {}, #endif +#ifdef CONFIG_MPC85XX_PCI2 + {}, #endif }; diff --git a/board/stxssa/u-boot.lds b/board/stxssa/u-boot.lds index 95ecf66a8d1..65e1bcfb122 100644 --- a/board/stxssa/u-boot.lds +++ b/board/stxssa/u-boot.lds @@ -145,6 +145,7 @@ SECTIONS . = ALIGN(256); __init_end = .; + . = .; __bss_start = .; .bss : { diff --git a/net/net.c b/net/net.c index c47610e7455..cde26801b38 100644 --- a/net/net.c +++ b/net/net.c @@ -541,11 +541,11 @@ restart: case NETLOOP_SUCCESS: if (NetBootFileXferSize > 0) { - char buf[10]; + char buf[20]; printf("Bytes transferred = %ld (%lx hex)\n", NetBootFileXferSize, NetBootFileXferSize); - sprintf(buf, "%lx", NetBootFileXferSize); + sprintf(buf, "%lX", NetBootFileXferSize); setenv("filesize", buf); sprintf(buf, "%lX", (unsigned long)load_addr); |