Skip to content

Commit

Permalink
sh: allow romImage data between head.S and the zero page
Browse files Browse the repository at this point in the history
Extend the romImage code to allow putting data between
the head.S file and the empty_zero_page. Needed in the
case of more advanced loader code in a separate C file.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Magnus Damm authored and Paul Mundt committed May 31, 2010
1 parent 1238c68 commit b34bce4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
12 changes: 9 additions & 3 deletions arch/sh/boot/romimage/head.S
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ romstart:
#include <mach/romimage.h>

/* copy the empty_zero_page contents to where vmlinux expects it */
mova empty_zero_page_src, r0
mova extra_data_pos, r0
mov.l extra_data_size, r1
add r1, r0
mov.l empty_zero_page_dst, r1
mov #(PAGE_SHIFT - 4), r4
mov #1, r3
Expand All @@ -37,12 +39,16 @@ romstart:
mov #PAGE_SHIFT, r4
mov #1, r1
shld r4, r1
mova empty_zero_page_src, r0
mova extra_data_pos, r0
add r1, r0
mov.l extra_data_size, r1
add r1, r0
jmp @r0
nop

.align 2
empty_zero_page_dst:
.long _text
empty_zero_page_src:
extra_data_pos:
extra_data_size:
.long zero_page_pos - extra_data_pos
1 change: 1 addition & 0 deletions arch/sh/boot/romimage/vmlinux.scr
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
SECTIONS
{
.text : {
zero_page_pos = .;
*(.data)
}
}

0 comments on commit b34bce4

Please sign in to comment.