Merge git://git.denx.de/u-boot-sh

bd95e655 · Tom Rini · f72b96ec · f40ad66f · bd95e655
隐藏空白更改
内联并排

Showing with 5 addition and 4 deletion

arch/sh/cpu/u-boot.lds arch/sh/cpu/u-boot.lds +5 -4

未找到文件。
--- a/arch/sh/cpu/u-boot.lds
+++ b/arch/sh/cpu/u-boot.lds
@@ -9,7 +9,12 @@

 #include "config.h"

+#ifdef CONFIG_SYS_BIG_ENDIAN
+OUTPUT_FORMAT("elf32-shbig-linux", "elf32-shbig-linux", "elf32-sh-linux")
+#else
 OUTPUT_FORMAT("elf32-sh-linux", "elf32-sh-linux", "elf32-sh-linux")
+#endif
+
 OUTPUT_ARCH(sh)

 MEMORY
@@ -33,10 +38,6 @@ SECTIONS
 		KEEP(CONFIG_BOARDDIR/lowlevel_init.o	(.text .spiboot1.text))
 		KEEP(*(.spiboot2.text))
 		. = ALIGN(8192);
-		env/embedded.o	(.ppcenv)
-		. = ALIGN(8192);
-		env/embedded.o	(.ppcenvr)
-		. = ALIGN(8192);
 		*(.text)
 		. = ALIGN(4);
 	} >ram =0xFF