Module Name: src Committed By: thorpej Date: Thu Jan 18 04:07:38 UTC 2024
Modified Files: src/sys/arch/news68k/conf: files.news68k src/sys/arch/news68k/include: cpu.h src/sys/arch/news68k/news68k: machdep.c machid.h pmap_bootstrap.c Log Message: Don't put the news1[27]00 model defines into INDENT, make them defflag options and put them in opt_newsconf.h. Make these options depend on the appropriate M680x0 option (M68030 for each) so that the CPU option appears correctly in opt_m68k_arch.h. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/arch/news68k/conf/files.news68k cvs rdiff -u -r1.51 -r1.52 src/sys/arch/news68k/include/cpu.h cvs rdiff -u -r1.113 -r1.114 src/sys/arch/news68k/news68k/machdep.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/news68k/news68k/machid.h cvs rdiff -u -r1.42 -r1.43 src/sys/arch/news68k/news68k/pmap_bootstrap.c 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/news68k/conf/files.news68k diff -u src/sys/arch/news68k/conf/files.news68k:1.39 src/sys/arch/news68k/conf/files.news68k:1.40 --- src/sys/arch/news68k/conf/files.news68k:1.39 Mon Jan 15 00:35:23 2024 +++ src/sys/arch/news68k/conf/files.news68k Thu Jan 18 04:07:37 2024 @@ -1,4 +1,4 @@ -# $NetBSD: files.news68k,v 1.39 2024/01/15 00:35:23 thorpej Exp $ +# $NetBSD: files.news68k,v 1.40 2024/01/18 04:07:37 thorpej Exp $ # NEWS68K-specific configuration info @@ -7,6 +7,10 @@ maxpartitions 8 maxusers 2 8 64 +# System configuration options. +defflag opt_newsconf.h news1200: M68030 +defflag opt_newsconf.h news1700: M68030 + device mainbus { [systype = -1] } attach mainbus at root Index: src/sys/arch/news68k/include/cpu.h diff -u src/sys/arch/news68k/include/cpu.h:1.51 src/sys/arch/news68k/include/cpu.h:1.52 --- src/sys/arch/news68k/include/cpu.h:1.51 Mon Jan 15 20:21:50 2024 +++ src/sys/arch/news68k/include/cpu.h Thu Jan 18 04:07:37 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.51 2024/01/15 20:21:50 thorpej Exp $ */ +/* $NetBSD: cpu.h,v 1.52 2024/01/18 04:07:37 thorpej Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -44,6 +44,7 @@ #if defined(_KERNEL_OPT) #include "opt_lockdebug.h" #include "opt_m68k_arch.h" +#include "opt_newsconf.h" #endif /* @@ -130,9 +131,6 @@ extern volatile u_char *ctrl_ast; do { astpending++; *ctrl_ast = 0xff; } while (/* CONSTCOND */0) #if defined(news1700) || defined(news1200) -#ifndef M68030 -#define M68030 -#endif #define M68K_MMU_MOTOROLA #endif Index: src/sys/arch/news68k/news68k/machdep.c diff -u src/sys/arch/news68k/news68k/machdep.c:1.113 src/sys/arch/news68k/news68k/machdep.c:1.114 --- src/sys/arch/news68k/news68k/machdep.c:1.113 Mon Jan 15 20:21:51 2024 +++ src/sys/arch/news68k/news68k/machdep.c Thu Jan 18 04:07:38 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.113 2024/01/15 20:21:51 thorpej Exp $ */ +/* $NetBSD: machdep.c,v 1.114 2024/01/18 04:07:38 thorpej Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -39,11 +39,12 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.113 2024/01/15 20:21:51 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.114 2024/01/18 04:07:38 thorpej Exp $"); #include "opt_ddb.h" #include "opt_compat_netbsd.h" #include "opt_modular.h" +#include "opt_newsconf.h" #include <sys/param.h> #include <sys/systm.h> Index: src/sys/arch/news68k/news68k/machid.h diff -u src/sys/arch/news68k/news68k/machid.h:1.4 src/sys/arch/news68k/news68k/machid.h:1.5 --- src/sys/arch/news68k/news68k/machid.h:1.4 Sun Dec 11 12:18:23 2005 +++ src/sys/arch/news68k/news68k/machid.h Thu Jan 18 04:07:38 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: machid.h,v 1.4 2005/12/11 12:18:23 christos Exp $ */ +/* $NetBSD: machid.h,v 1.5 2024/01/18 04:07:38 thorpej Exp $ */ /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -86,6 +86,8 @@ #define NWB235A 236 #define NWXRES 255 +#include "opt_newsconf.h" + #if defined(news700) || defined(news800) || defined(news1700) || defined(news1800) struct oidrom { /*00*/ unsigned char id_model; Index: src/sys/arch/news68k/news68k/pmap_bootstrap.c diff -u src/sys/arch/news68k/news68k/pmap_bootstrap.c:1.42 src/sys/arch/news68k/news68k/pmap_bootstrap.c:1.43 --- src/sys/arch/news68k/news68k/pmap_bootstrap.c:1.42 Sun Oct 8 03:57:47 2023 +++ src/sys/arch/news68k/news68k/pmap_bootstrap.c Thu Jan 18 04:07:38 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_bootstrap.c,v 1.42 2023/10/08 03:57:47 tsutsui Exp $ */ +/* $NetBSD: pmap_bootstrap.c,v 1.43 2024/01/18 04:07:38 thorpej Exp $ */ /* * Copyright (c) 1991, 1993 @@ -39,9 +39,10 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.42 2023/10/08 03:57:47 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.43 2024/01/18 04:07:38 thorpej Exp $"); #include "opt_m68k_arch.h" +#include "opt_newsconf.h" #include <sys/param.h> #include <uvm/uvm_extern.h>