diff --git a/arch/mips/boot/start-pbl.S b/arch/mips/boot/start-pbl.S
index b6d127a..d6e8231 100644
--- a/arch/mips/boot/start-pbl.S
+++ b/arch/mips/boot/start-pbl.S
@@ -25,7 +25,6 @@
 #include <board/board_pbl_start.h>
 
 	.set noreorder
-	.text
 	.section ".text_head_entry"
 	.align 4
 
diff --git a/arch/mips/boot/start.S b/arch/mips/boot/start.S
index 1ddce95..e937e89 100644
--- a/arch/mips/boot/start.S
+++ b/arch/mips/boot/start.S
@@ -20,8 +20,7 @@
 #include <asm/pbl_macros.h>
 
 	.set noreorder
-	.text
-	.section ".text_bare_init"
+	.section ".text_entry"
 	.align 4
 
 EXPORT(_start)
diff --git a/arch/mips/lib/barebox.lds.S b/arch/mips/lib/barebox.lds.S
index 8057634..899f62b 100644
--- a/arch/mips/lib/barebox.lds.S
+++ b/arch/mips/lib/barebox.lds.S
@@ -27,10 +27,9 @@
 	. = ALIGN(4);
 	.text      :
 	{
-		_start = .;
-		*(.text_entry*)
 		_stext = .;
 		_text = .;
+		*(.text_entry*)
 		__bare_init_start = .;
 		*(.text_bare_init*)
 		__bare_init_end = .;
@@ -51,9 +50,6 @@
 
 	.barebox_imd : { BAREBOX_IMD }
 
-	. = ALIGN(4);
-	.got : { *(.got*) }
-
 	. = .;
 	__barebox_cmd_start = .;
 	.barebox_cmd : { BAREBOX_CMDS }