diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-06-14 09:29:53 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-06-14 09:29:53 +0200 |
| commit | 6191ef93b25edbd75caec9213db3665f486ee433 (patch) | |
| tree | f3388170400caf66681a5fc38fd7610ce9a29a1b | |
| parent | 442f6346d2c52259f618b0f7b2025ea8fb5ab336 (diff) | |
| parent | 8aa6600365a384cc7d5fa82277a9b762fbb41e88 (diff) | |
| download | barebox-6191ef93b25edbd75caec9213db3665f486ee433.tar.gz barebox-6191ef93b25edbd75caec9213db3665f486ee433.tar.xz | |
Merge branch 'for-next/mips'
| -rw-r--r-- | arch/mips/boot/start-pbl.S | 1 | ||||
| -rw-r--r-- | arch/mips/boot/start.S | 3 | ||||
| -rw-r--r-- | arch/mips/lib/barebox.lds.S | 6 |
3 files changed, 2 insertions, 8 deletions
diff --git a/arch/mips/boot/start-pbl.S b/arch/mips/boot/start-pbl.S index b6d127a039..d6e8231a73 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 1ddce9533e..e937e89af1 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 8057634ddb..899f62b968 100644 --- a/arch/mips/lib/barebox.lds.S +++ b/arch/mips/lib/barebox.lds.S @@ -27,10 +27,9 @@ SECTIONS . = ALIGN(4); .text : { - _start = .; - *(.text_entry*) _stext = .; _text = .; + *(.text_entry*) __bare_init_start = .; *(.text_bare_init*) __bare_init_end = .; @@ -51,9 +50,6 @@ SECTIONS .barebox_imd : { BAREBOX_IMD } - . = ALIGN(4); - .got : { *(.got*) } - . = .; __barebox_cmd_start = .; .barebox_cmd : { BAREBOX_CMDS } |