Merge branch 'master' of git://git.denx.de/u-boot-sh

[karo-tx-uboot.git] / board / ms7722se / u-boot.lds

diff --git a/board/ms7722se/u-boot.lds b/board/ms7722se/u-boot.lds
index 692bc62918e48f2ab0088697e1ea127d426e0f48..7dffe008af0b96ad185584c5f7e142317990497b 100644 (file)
--- a/board/ms7722se/u-boot.lds
+++ b/board/ms7722se/u-boot.lds
@@ -49,9 +49,9 @@ SECTIONS
        {
                cpu/sh4/start.o         (.text)
                . = ALIGN(8192);
-               common/environment.o    (.ppcenv)
+               common/env_embedded.o   (.ppcenv)
                . = ALIGN(8192);
-               common/environment.o    (.ppcenvr)
+               common/env_embedded.o   (.ppcenvr)
                . = ALIGN(8192);
                *(.text)
                . = ALIGN(4);
@@ -94,7 +94,7 @@ SECTIONS
 
        PROVIDE (bss_start = .);
        PROVIDE (__bss_start = .);
-       .bss :
+       .bss (NOLOAD) :
        {
                *(.bss)
                . = ALIGN(4);