diff options
| author | Jesper Nilsson <jesper.nilsson@axis.com> | 2010-08-02 11:48:31 -0400 |
|---|---|---|
| committer | Jesper Nilsson <jesper.nilsson@axis.com> | 2010-08-04 06:59:43 -0400 |
| commit | b4973ae9dac3397499f5576c591d5c5bf51c68c6 (patch) | |
| tree | 0bda0181f61cb50f8fd4c3507932e3b9f0b106dc | |
| parent | d77eab8cb18dc4b8adfa82088e95b48c654c66b9 (diff) | |
CRIS: Correct address of the romfs in boot image
The romfs should land after __init_end
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| -rw-r--r-- | arch/cris/arch-v10/kernel/head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v10/kernel/head.S b/arch/cris/arch-v10/kernel/head.S index fc4577102933..a1f2014b4e3b 100644 --- a/arch/cris/arch-v10/kernel/head.S +++ b/arch/cris/arch-v10/kernel/head.S | |||
| @@ -280,7 +280,7 @@ _no_romfs_in_flash: | |||
| 280 | ;; the "rom fs" we'll possibly use in 2.4 if not JFFS (which does | 280 | ;; the "rom fs" we'll possibly use in 2.4 if not JFFS (which does |
| 281 | ;; not need this mechanism anyway) | 281 | ;; not need this mechanism anyway) |
| 282 | 282 | ||
| 283 | move.d __vmlinux_end, $r0; the image will be after the vmlinux end address | 283 | move.d __init_end, $r0; the image will be after the end of init |
| 284 | move.d [$r0], $r1 ; cramfs assumes same endian on host/target | 284 | move.d [$r0], $r1 ; cramfs assumes same endian on host/target |
| 285 | cmp.d CRAMFS_MAGIC, $r1; magic value in cramfs superblock | 285 | cmp.d CRAMFS_MAGIC, $r1; magic value in cramfs superblock |
| 286 | bne 2f | 286 | bne 2f |