summaryrefslogtreecommitdiffstats
path: root/arch/nios2
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-11-29 20:52:03 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-11-29 20:52:03 +0100
commit7631e76c0b472e95c908866d26883b019657636d (patch)
treec177100f2ed9f13ca33ec159bbf69b6114d0c23b /arch/nios2
parente0f4fb2c982d66210dfd5ffaf92912bf1c6c6586 (diff)
parent7766c288ff6e6defd7565af73a3407c3c414eb94 (diff)
downloadbarebox-7631e76c0b472e95c908866d26883b019657636d.tar.gz
barebox-7631e76c0b472e95c908866d26883b019657636d.tar.xz
Merge branch 'work/magicvars' into next
Diffstat (limited to 'arch/nios2')
-rw-r--r--arch/nios2/cpu/barebox.lds.S4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/nios2/cpu/barebox.lds.S b/arch/nios2/cpu/barebox.lds.S
index 2b626fb51e..934eaf7cac 100644
--- a/arch/nios2/cpu/barebox.lds.S
+++ b/arch/nios2/cpu/barebox.lds.S
@@ -56,6 +56,10 @@ SECTIONS
.barebox_cmd : { BAREBOX_CMDS }
__barebox_cmd_end = .;
+ __barebox_magicvar_start = .;
+ .barebox_magicvar : { BAREBOX_MAGICVARS }
+ __barebox_magicvar_end = .;
+
__barebox_initcalls_start = .;
.barebox_initcalls : { INITCALLS }
__barebox_initcalls_end = .;