Module Name:    src
Committed By:   andvar
Date:           Sun Sep 24 19:57:10 UTC 2023

Modified Files:
        src/sys/arch/mmeye/mmeye: locore.S

Log Message:
unify ROMIMAGE specific assembler code between evbsh3 and mmeye.

fixes mmeye ROMIMAGE enabled build and in turn MMTAROMNEW kernel config.
patch checked by martin. PR port-mmeye/57627.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mmeye/mmeye/locore.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/mmeye/mmeye/locore.S
diff -u src/sys/arch/mmeye/mmeye/locore.S:1.11 src/sys/arch/mmeye/mmeye/locore.S:1.12
--- src/sys/arch/mmeye/mmeye/locore.S:1.11	Sat Feb 19 10:46:29 2011
+++ src/sys/arch/mmeye/mmeye/locore.S	Sun Sep 24 19:57:10 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.11 2011/02/19 10:46:29 kiyohara Exp $	*/
+/*	$NetBSD: locore.S,v 1.12 2023/09/24 19:57:10 andvar Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -119,7 +119,8 @@ start1:
 #ifdef ROMIMAGE
 	/* Initialize BUS State Control Regs. */
 	mov.l	_ROM_START, r3
-	mov.l	_C_LABEL(ram_start), r4
+	mov.l	XL_ram_start, r4
+	mov.l	@r4, r4
 	sub	r3, r4
 	/* Set Bus State Controller */
 	mov.l	XLInitializeBsc, r0
@@ -140,7 +141,8 @@ start1:
 	add	r3, r1		/* src address */
 	mov.l	___start, r3
 	sub	r2, r3
-	mov.l	_C_LABEL(ram_start), r4
+	mov.l	XL_ram_start, r4
+	mov.l	@r4, r4
 	add	r4, r3		/* dest address */
 1:
 	mov.l	@r1+, r4
@@ -157,6 +159,8 @@ start1:
 	.align	2
 LXstart_in_RAM:
 	.long	start_in_RAM
+XL_ram_start:
+	.long	_C_LABEL(ram_start)
 #else /* ROMIMAGE */
 	/* Set Bus State Controller */
 	mov.l	XLInitializeBsc, r0

Reply via email to