From: Jonathan Gray <jsg@jsg.id.au>
Subject: remove unused arm cpuconf.h
To: tech@openbsd.org
Date: Sun, 24 May 2026 15:04:29 +1000

diff --git sys/arch/arm/arm/bus_space_asm_generic.S sys/arch/arm/arm/bus_space_asm_generic.S
index 97b71a5cecc..f0b6067ad15 100644
--- sys/arch/arm/arm/bus_space_asm_generic.S
+++ sys/arch/arm/arm/bus_space_asm_generic.S
@@ -36,7 +36,6 @@
  */
 
 #include <arm/asm.h>
-#include <arm/cpuconf.h>
 
 /*
  * Generic bus_space functions.
diff --git sys/arch/arm/arm/cpufunc.c sys/arch/arm/arm/cpufunc.c
index 053deb2d0b3..73906507250 100644
--- sys/arch/arm/arm/cpufunc.c
+++ sys/arch/arm/arm/cpufunc.c
@@ -52,7 +52,6 @@
 #include <uvm/uvm_extern.h>
 
 #include <machine/pmap.h>
-#include <arm/cpuconf.h>
 
 #if defined(PERFCTRS)
 struct arm_pmc_funcs *arm_pmc;
diff --git sys/arch/arm/armv7/bus_space_asm_armv7.S sys/arch/arm/armv7/bus_space_asm_armv7.S
index c76ccc01f93..8e509f8d807 100644
--- sys/arch/arm/armv7/bus_space_asm_armv7.S
+++ sys/arch/arm/armv7/bus_space_asm_armv7.S
@@ -36,7 +36,6 @@
  */
 
 #include <arm/asm.h>
-#include <arm/cpuconf.h>
 
 /*
  * Generic bus_space functions.
diff --git sys/arch/arm/include/cpu.h sys/arch/arm/include/cpu.h
index a598a46bca1..f79af4f25a5 100644
--- sys/arch/arm/include/cpu.h
+++ sys/arch/arm/include/cpu.h
@@ -94,8 +94,6 @@
  * Kernel-only definitions
  */
 
-#include <arm/cpuconf.h>
-
 #include <machine/intr.h>
 #include <machine/frame.h>
 #include <machine/pcb.h>
diff --git sys/arch/arm/include/cpuconf.h sys/arch/arm/include/cpuconf.h
deleted file mode 100644
index 132156493b7..00000000000
--- sys/arch/arm/include/cpuconf.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$OpenBSD: cpuconf.h,v 1.20 2024/11/07 08:12:12 miod Exp $	*/
-/*	$NetBSD: cpuconf.h,v 1.7 2003/05/23 00:57:24 ichiro Exp $	*/
-
-/*
- * Copyright (c) 2002 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Jason R. Thorpe for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed for the NetBSD Project by
- *	Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _ARM_CPUCONF_H_
-#define	_ARM_CPUCONF_H_
-
-/*
- * Define which MMU classes are configured:
- *
- *      ARM_MMU_V7		v6/v7 MMU with XP bit enabled subpage
- *				protection is not used, TEX/AP is used instead.
- */
-
-#define ARM_MMU_V7		1
-
-#define	ARM_NMMUS		(ARM_MMU_V7)
-
-#endif /* _ARM_CPUCONF_H_ */
diff --git sys/arch/arm/include/cpufunc.h sys/arch/arm/include/cpufunc.h
index e647641896a..51ebad81618 100644
--- sys/arch/arm/include/cpufunc.h
+++ sys/arch/arm/include/cpufunc.h
@@ -46,7 +46,6 @@
 #ifdef _KERNEL
 
 #include <sys/types.h>
-#include <arm/cpuconf.h>
 
 struct cpu_functions {
 
diff --git sys/arch/arm/include/pmap.h sys/arch/arm/include/pmap.h
index 4d249804ead..0963a16091f 100644
--- sys/arch/arm/include/pmap.h
+++ sys/arch/arm/include/pmap.h
@@ -71,7 +71,6 @@
 
 #ifdef _KERNEL
 
-#include <arm/cpuconf.h>
 #include <arm/pte.h>
 #ifndef _LOCORE
 #include <arm/cpufunc.h>