summaryrefslogtreecommitdiffstats
path: root/arch/x86/lib/barebox.lds.S
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-04-11 09:08:49 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-04-11 09:08:49 +0200
commitfdc889de61fb67dcecadf850fb1f534c786668e9 (patch)
tree4f4015accd8dcc83351f45f8489587b38f53e709 /arch/x86/lib/barebox.lds.S
parent7541ec644df5ecaf890c8be74fbff59581717aa1 (diff)
parent32e630d182a5479e5da60906523b74a19cf5caab (diff)
downloadbarebox-fdc889de61fb67dcecadf850fb1f534c786668e9.tar.gz
barebox-fdc889de61fb67dcecadf850fb1f534c786668e9.tar.xz
Merge branch 'master' into next
Diffstat (limited to 'arch/x86/lib/barebox.lds.S')
-rw-r--r--arch/x86/lib/barebox.lds.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/lib/barebox.lds.S b/arch/x86/lib/barebox.lds.S
index 9798ed5c61..3315be2554 100644
--- a/arch/x86/lib/barebox.lds.S
+++ b/arch/x86/lib/barebox.lds.S
@@ -144,6 +144,7 @@ SECTIONS
.text : AT ( LOADADDR(.bootstrapping) + SIZEOF(.bootstrapping) ) {
/* do not align here! It may fails with the LOADADDR! */
_stext = .;
+ _text = .;
*(.text_entry*)
__bare_init_start = .;
*(.text_bare_init*)