Module Name: src
Committed By: mrg
Date: Tue Sep 15 08:14:31 UTC 2020
Modified Files:
src/etc/etc.macppc: Makefile.inc
src/sys/arch/ofppc/stand/ofwboot: boot.c
Log Message:
partial port to powerpc64.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/etc/etc.macppc/Makefile.inc
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/ofppc/stand/ofwboot/boot.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.macppc/Makefile.inc
diff -u src/etc/etc.macppc/Makefile.inc:1.11 src/etc/etc.macppc/Makefile.inc:1.12
--- src/etc/etc.macppc/Makefile.inc:1.11 Tue Feb 19 23:46:33 2019
+++ src/etc/etc.macppc/Makefile.inc Tue Sep 15 08:14:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.11 2019/02/19 23:46:33 sevan Exp $
+# $NetBSD: Makefile.inc,v 1.12 2020/09/15 08:14:31 mrg Exp $
#
# etc.macppc/Makefile.inc -- macppc-specific etc Makefile targets
#
@@ -6,9 +6,11 @@
# If you change the list of distributed kernels, don't forget
# to update the release documentation in distrib/notes/common/contents
+.if ${MACHINE_ARCH} != "powerpc64"
KERNEL_SETS= GENERIC GENERIC.MP GENERIC_601 POWERMAC_G5 \
POWERMAC_G5.MP
BUILD_KERNELS+= INSTALL INSTALL_601 GENERIC_MD
INSTALLATION_DIRS+= installation/floppy
+.endif
Index: src/sys/arch/ofppc/stand/ofwboot/boot.c
diff -u src/sys/arch/ofppc/stand/ofwboot/boot.c:1.24 src/sys/arch/ofppc/stand/ofwboot/boot.c:1.25
--- src/sys/arch/ofppc/stand/ofwboot/boot.c:1.24 Sat Jun 11 06:35:38 2016
+++ src/sys/arch/ofppc/stand/ofwboot/boot.c Tue Sep 15 08:14:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.24 2016/06/11 06:35:38 dholland Exp $ */
+/* $NetBSD: boot.c,v 1.25 2020/09/15 08:14:31 mrg Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -292,8 +292,8 @@ main(void)
esym = (void *)marks[MARK_END];
printf(" start=0x%x\n", entry);
- __syncicache((void *) entry, (u_int) ssym - (u_int) entry);
- chain((boot_entry_t) entry, bootline, ssym, esym);
+ __syncicache((void *)(uintptr_t)entry, (uintptr_t) ssym - entry);
+ chain((boot_entry_t)(uintptr_t)entry, bootline, ssym, esym);
OF_exit();
}
