Merge branch 'u-boot/master' into 'u-boot-arm/master'

Conflicts:
	common/cmd_fpga.c
	drivers/usb/host/ohci-at91.c

1 files changed, 77 insertions, 0 deletions

diff --git a/arch/openrisc/cpu/u-boot.lds b/arch/openrisc/cpu/u-boot.lds
new file mode 100644
index 0000000..d9bb7b7
--- /dev/null
+++ b/arch/openrisc/cpu/u-boot.lds
@@ -0,0 +1,77 @@
+#include <config.h>
+OUTPUT_ARCH(or32)
+__DYNAMIC  =  0;
+
+MEMORY
+{
+	vectors	: ORIGIN = 0, LENGTH = 0x2000
+	ram	: ORIGIN = CONFIG_SYS_MONITOR_BASE,
+		  LENGTH = CONFIG_SYS_MONITOR_LEN
+}
+
+SECTIONS
+{
+	.vectors :
+	{
+		*(.vectors)
+	} > vectors
+
+	__start = .;
+	.text : AT (__start) {
+		_stext = .;
+		*(.text)
+		_etext = .;
+		*(.lit)
+		*(.shdata)
+		_endtext = .;
+	}  > ram
+
+
+	 . = ALIGN(4);
+	 .u_boot_list : {
+		KEEP(*(SORT(.u_boot_list*)));
+	 } > ram
+
+	.rodata : {
+		*(.rodata);
+		*(.rodata.*)
+	} > ram
+
+	.shbss :
+	{
+		*(.shbss)
+	} > ram
+
+	.talias :
+	{
+	}  > ram
+
+	.data : {
+		sdata = .;
+		_sdata = .;
+		*(.data)
+		edata = .;
+		_edata = .;
+	} > ram
+
+	.bss :
+	{
+		_bss_start = .;
+		*(.bss)
+		*(COMMON)
+		_bss_end = .;
+	} > ram
+	__end = .;
+
+	/* No stack specification - done manually */
+
+	.stab  0 (NOLOAD) :
+	{
+		[ .stab ]
+	}
+
+	.stabstr  0 (NOLOAD) :
+	{
+		[ .stabstr ]
+	}
+}