aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesper Nilsson <jesper.nilsson@axis.com>2010-08-02 12:23:39 -0400
committerJesper Nilsson <jesper.nilsson@axis.com>2010-08-04 07:00:30 -0400
commit403a1c4f1380b4ec842df5f4aa86e86ba02904f3 (patch)
tree237341d8b8bfe2a57628b167782ba9a74050e343
parent345c52e079001354809c17f84e164827e99f2aaa (diff)
CRIS: v32: Correct address for romfs in the image
Is after __bss_start, not __vmlinux_end Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
-rw-r--r--arch/cris/arch-v32/kernel/head.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/kernel/head.S b/arch/cris/arch-v32/kernel/head.S
index 5fe1513e447a..5d502b9ab56d 100644
--- a/arch/cris/arch-v32/kernel/head.S
+++ b/arch/cris/arch-v32/kernel/head.S
@@ -367,7 +367,7 @@ _no_romfs_in_flash:
367 ;; For jffs2, a jhead is prepended which contains with magic and length. 367 ;; For jffs2, a jhead is prepended which contains with magic and length.
368 ;; The jhead is not part of the jffs2 partition however. 368 ;; The jhead is not part of the jffs2 partition however.
369#ifndef CONFIG_ETRAXFS_SIM 369#ifndef CONFIG_ETRAXFS_SIM
370 move.d __vmlinux_end, $r0 370 move.d __bss_start, $r0
371#else 371#else
372 move.d __end, $r0 372 move.d __end, $r0
373#endif 373#endif