From: Jesper Nilsson Date: Mon, 2 Aug 2010 15:48:31 +0000 (+0200) Subject: CRIS: Correct address of the romfs in boot image X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b4973ae9dac3397499f5576c591d5c5bf51c68c6;p=deliverable%2Flinux.git CRIS: Correct address of the romfs in boot image The romfs should land after __init_end Signed-off-by: Jesper Nilsson --- 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: ;; the "rom fs" we'll possibly use in 2.4 if not JFFS (which does ;; not need this mechanism anyway) - move.d __vmlinux_end, $r0; the image will be after the vmlinux end address + move.d __init_end, $r0; the image will be after the end of init move.d [$r0], $r1 ; cramfs assumes same endian on host/target cmp.d CRAMFS_MAGIC, $r1; magic value in cramfs superblock bne 2f