summaryrefslogtreecommitdiff
path: root/sys/arch/evbarm
diff options
context:
space:
mode:
authorjmcneill <jmcneill@NetBSD.org>2022-10-29 13:59:57 +0000
committerjmcneill <jmcneill@NetBSD.org>2022-10-29 13:59:57 +0000
commit4e4233dee082f359bb8bc436835197f8748ada4c (patch)
tree670b3ca5f84b76abfea6797ddc2a92e4cb898aba /sys/arch/evbarm
parentf86da3c02e9287cd057f7e419b78488e9f3d1612 (diff)
No need for SOC_VIRT, the default arm platform will take care of things.
Diffstat (limited to 'sys/arch/evbarm')
-rw-r--r--sys/arch/evbarm/conf/GENERIC3
-rw-r--r--sys/arch/evbarm/conf/GENERIC643
-rw-r--r--sys/arch/evbarm/conf/files.generic3
-rw-r--r--sys/arch/evbarm/conf/files.generic643
4 files changed, 4 insertions, 8 deletions
diff --git a/sys/arch/evbarm/conf/GENERIC b/sys/arch/evbarm/conf/GENERIC
index 91271a3e761..9a9587f9413 100644
--- a/sys/arch/evbarm/conf/GENERIC
+++ b/sys/arch/evbarm/conf/GENERIC
@@ -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
diff --git a/sys/arch/evbarm/conf/GENERIC64 b/sys/arch/evbarm/conf/GENERIC64
index 7d89f6b64fe..da77d3af879 100644
--- a/sys/arch/evbarm/conf/GENERIC64
+++ b/sys/arch/evbarm/conf/GENERIC64
@@ -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
diff --git a/sys/arch/evbarm/conf/files.generic b/sys/arch/evbarm/conf/files.generic
index 15ffdb5fab8..001ca560cfa 100644
--- a/sys/arch/evbarm/conf/files.generic
+++ b/sys/arch/evbarm/conf/files.generic
@@ -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"
#
diff --git a/sys/arch/evbarm/conf/files.generic64 b/sys/arch/evbarm/conf/files.generic64
index 007c80639e1..4ef90f05e76 100644
--- a/sys/arch/evbarm/conf/files.generic64
+++ b/sys/arch/evbarm/conf/files.generic64
@@ -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"
#