From 607296c9d5bf0f9d73d06af3c670e287171ee66e Mon Sep 17 00:00:00 2001
From: Laurent Vivier <Laurent@lvivier.info>
Date: Tue, 25 May 2004 23:16:56 +0000
Subject: [PATCH] arch_init must be before init_memory_map, console_init can be
 the first call

---
 second/head.S | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/second/head.S b/second/head.S
index cd2b6ef..7b72725 100644
--- a/second/head.S
+++ b/second/head.S
@@ -12,7 +12,7 @@
 
 	.global _start
 _start:
-	jmp	setup(%pc)
+	bra	setup
 
 	.word	cmdline_length		/* size of command line buffer */
 
@@ -26,17 +26,17 @@ setup:
 
 	bsr	relocate
 
-	/* memory map */
+	/* initialize console, so we can debug ;-) */
 
-	bsr	init_memory_map@PLTPC
+	bsr	console_init@PLTPC
 
 	/* identify system */
 
 	bsr	arch_init@PLTPC
 
-	/* initialize console, so we can debug ;-) */
+	/* memory map */
 
-	bsr	console_init@PLTPC
+	bsr	init_memory_map@PLTPC
 
 	/* retrieve machine info */
 
@@ -80,9 +80,9 @@ relocate:
 got_loop:
 	move.l	(%a0), %d1
 
-	cmp.l	#__bss_start, %d1
+	cmp.l	#__bss_start.l, %d1
 	blt	other_section
-	cmp.l	#_end, %d1
+	cmp.l	#_end.l, %d1
 	bgt	other_section
 
 	/* symbol in section BSS */