Fix memory corruption problem on STX GP3 SSA Board.

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --git a/board/stxssa/stxssa.c b/board/stxssa/stxssa.c
index 9a2bfbef8e47e05cea28d720ab4bfbb5eb8391d9..9bacb98d86589a8f02b24c8474179a60f6278be9 100644 (file)
--- 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 95ecf66a8d142e6731b15b15b98304e24a63a236..65e1bcfb122b03f07ed3203bb5f3e00d17df2351 100644 (file)
--- 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 c47610e74554cea5d693830019602dd56cd2f061..cde26801b385b8e29a4e44a5e147514d4112c088 100644 (file)
--- 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);