From b0eebe4a53906fa2d005495297c86fac36607032 Mon Sep 17 00:00:00 2001
From: jmallett <jmallett@FreeBSD.org>
Date: Mon, 27 Sep 2010 19:45:34 +0000
Subject: [PATCH] Use a single program header to fix loading 64-bit kernels on
 old versions of U-Boot.

---
 sys/conf/ldscript.mips.octeon1.64 | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/sys/conf/ldscript.mips.octeon1.64 b/sys/conf/ldscript.mips.octeon1.64
index aaef94579c04..ab2cef0dfea5 100644
--- a/sys/conf/ldscript.mips.octeon1.64
+++ b/sys/conf/ldscript.mips.octeon1.64
@@ -7,24 +7,29 @@ ENTRY(_start)
    __DYNAMIC = 0;
 PROVIDE (_DYNAMIC = 0);
 
+PHDRS {
+	text PT_LOAD FLAGS(0x7);
+}
+
 SECTIONS {
 	. = KERNLOADADDR + SIZEOF_HEADERS;
 
-	.text . : {
+	.text : {
 	    	*(.text)
 		*(.dynamic)
 		etext = .;
 		_etext = .;
 		. = ALIGN(0x2000);
-	}
+	} : text
 
-	.rodata ALIGN(0x2000) : {
+	. = ALIGN(0x2000);
+	.rodata : {
 		_fdata = .;
 	    	*(.rodata)
 		. = ALIGN(32);
 	}
 	
-	.data . : {
+	.data : {
                 _rwdata = .;
 	    	*(.data)
 		. = ALIGN(32);
@@ -33,15 +38,15 @@ SECTIONS {
 
 	_gp = (. + 0x8000);
 
-	.sdata . : {
+	.sdata : {
                 _small_start = .;
 		*(.sdata)
 		. = ALIGN(32);
 		edata = .;
 		_edata = .;
-	}
+	} : text
 
-	.sbss . : {
+	.sbss : {
 		__bss_start = .;
 		_fbss = .;
 		*(.sbss) *(.scommon)
@@ -49,7 +54,7 @@ SECTIONS {
 		. = ALIGN(32);
 	}
 
-	.bss . : {
+	.bss : {
 		*(.bss)
 		*(COMMON)
 		. = ALIGN(32);