Module Name: src
Committed By: jmcneill
Date: Sat Oct 29 13:59:57 UTC 2022
Modified Files:
src/sys/arch/evbarm/conf: GENERIC GENERIC64 files.generic
files.generic64
Removed Files:
src/sys/arch/arm/virt: files.virt virt_platform.c virt_platform.h
Log Message:
No need for SOC_VIRT, the default arm platform will take care of things.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 src/sys/arch/arm/virt/files.virt
cvs rdiff -u -r1.14 -r0 src/sys/arch/arm/virt/virt_platform.c
cvs rdiff -u -r1.2 -r0 src/sys/arch/arm/virt/virt_platform.h
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/evbarm/conf/GENERIC
cvs rdiff -u -r1.205 -r1.206 src/sys/arch/evbarm/conf/GENERIC64
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/files.generic
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/conf/files.generic64
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/evbarm/conf/GENERIC
diff -u src/sys/arch/evbarm/conf/GENERIC:1.111 src/sys/arch/evbarm/conf/GENERIC:1.112
--- src/sys/arch/evbarm/conf/GENERIC:1.111 Fri Oct 28 20:37:47 2022
+++ src/sys/arch/evbarm/conf/GENERIC Sat Oct 29 13:59:57 2022
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC,v 1.111 2022/10/28 20:37:47 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.112 2022/10/29 13:59:57 jmcneill Exp $
#
# GENERIC ARM (aarch32) kernel
#
@@ -29,7 +29,6 @@ options SOC_SUN8I_H3
options SOC_SUN8I_V3S
options SOC_SUN9I_A80
options SOC_TEGRA124
-options SOC_VIRT
options SOC_ZYNQ7000
options MULTIPROCESSOR
Index: src/sys/arch/evbarm/conf/GENERIC64
diff -u src/sys/arch/evbarm/conf/GENERIC64:1.205 src/sys/arch/evbarm/conf/GENERIC64:1.206
--- src/sys/arch/evbarm/conf/GENERIC64:1.205 Tue Aug 23 05:40:46 2022
+++ src/sys/arch/evbarm/conf/GENERIC64 Sat Oct 29 13:59:57 2022
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC64,v 1.205 2022/08/23 05:40:46 ryo Exp $
+# $NetBSD: GENERIC64,v 1.206 2022/10/29 13:59:57 jmcneill Exp $
#
# GENERIC ARM (aarch64) kernel
#
@@ -24,7 +24,6 @@ options SOC_SUN50I_A64
options SOC_SUN50I_H5
options SOC_SUN50I_H6
options SOC_TEGRA210
-options SOC_VIRT
options MULTIPROCESSOR
pseudo-device openfirm # /dev/openfirm
Index: src/sys/arch/evbarm/conf/files.generic
diff -u src/sys/arch/evbarm/conf/files.generic:1.13 src/sys/arch/evbarm/conf/files.generic:1.14
--- src/sys/arch/evbarm/conf/files.generic:1.13 Sat Dec 18 16:31:06 2021
+++ src/sys/arch/evbarm/conf/files.generic Sat Oct 29 13:59:57 2022
@@ -1,4 +1,4 @@
-# $NetBSD: files.generic,v 1.13 2021/12/18 16:31:06 riastradh Exp $
+# $NetBSD: files.generic,v 1.14 2022/10/29 13:59:57 jmcneill Exp $
#
# A generic (aarch32) kernel configuration info
#
@@ -28,7 +28,6 @@ include "arch/arm/samsung/files.exynos"
include "arch/arm/sunxi/files.sunxi"
include "arch/arm/ti/files.ti"
include "arch/arm/vexpress/files.vexpress"
-include "arch/arm/virt/files.virt"
include "arch/arm/xilinx/files.zynq"
#
Index: src/sys/arch/evbarm/conf/files.generic64
diff -u src/sys/arch/evbarm/conf/files.generic64:1.19 src/sys/arch/evbarm/conf/files.generic64:1.20
--- src/sys/arch/evbarm/conf/files.generic64:1.19 Mon Sep 13 23:31:23 2021
+++ src/sys/arch/evbarm/conf/files.generic64 Sat Oct 29 13:59:57 2022
@@ -1,4 +1,4 @@
-# $NetBSD: files.generic64,v 1.19 2021/09/13 23:31:23 jmcneill Exp $
+# $NetBSD: files.generic64,v 1.20 2022/10/29 13:59:57 jmcneill Exp $
#
# A generic (aarch64) kernel configuration info
#
@@ -19,7 +19,6 @@ include "arch/arm/nxp/files.imx"
include "arch/arm/rockchip/files.rockchip"
include "arch/arm/samsung/files.exynos"
include "arch/arm/sunxi/files.sunxi"
-include "arch/arm/virt/files.virt"
include "arch/arm/sociox/files.sociox"
#
