From f34024d4a328e6edd906456da98d2c537155c4f7 Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@denx.de>
Date: Wed, 12 Sep 2007 00:48:57 +0200
Subject: [PATCH] Fix memory corruption problem on STX GP3 SSA Board.

Signed-off-by: Wolfgang Denk <wd@denx.de>
---
 board/stxssa/stxssa.c   | 4 +++-
 board/stxssa/u-boot.lds | 1 +
 net/net.c               | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/board/stxssa/stxssa.c b/board/stxssa/stxssa.c
index 9a2bfbef8..9bacb98d8 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 95ecf66a8..65e1bcfb1 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 c47610e74..cde26801b 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);