The branch main has been updated by andrew:
URL:
https://cgit.FreeBSD.org/src/commit/?id=f5c7644378f884dad473011a1f9350fed6fe4e4e
commit f5c7644378f884dad473011a1f9350fed6fe4e4e
Author: Andrew Turner <and...@freebsd.org>
AuthorDate: 2024-07-12 11:28:57 +0000
Commit: Andrew Turner <and...@freebsd.org>
CommitDate: 2024-07-12 11:31:54 +0000
sys/arm: Remove armv6 kernel configs
Only the Raspberry Pi config was supported on armv6. Remove it in
preparation for removing armv6 support from the kernel.
Reviewed by: manu, emaste
Sponsored by: Arm Ltd
Differential Revision: https://reviews.freebsd.org/D45646
---
sys/arm/conf/RPI-B | 109 -------------------------------------------------
sys/arm/conf/std.armv6 | 81 ------------------------------------
2 files changed, 190 deletions(-)
diff --git a/sys/arm/conf/RPI-B b/sys/arm/conf/RPI-B
deleted file mode 100644
index d0a3ee13c367..000000000000
--- a/sys/arm/conf/RPI-B
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# RPI-B -- Custom configuration for the Raspberry Pi
-#
-# For more information on this file, please read the config(5) manual page,
-# and/or the handbook section on Kernel Configuration Files:
-#
-#
https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
-#
-# The handbook is also available locally in /usr/share/doc/handbook
-# if you've installed the doc distribution, otherwise always see the
-# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the
-# latest information.
-#
-# An exhaustive list of options and more detailed explanations of the
-# device lines is also present in the ../../conf/NOTES and NOTES files.
-# If you are in doubt as to the purpose or necessity of a line, check first
-# in NOTES.
-#
-
-ident RPI-B
-
-include "std.armv6"
-include "../broadcom/bcm2835/std.rpi"
-include "../broadcom/bcm2835/std.bcm2835"
-
-options SCHED_4BSD # 4BSD scheduler
-options PLATFORM
-
-# NFS root from boopt/dhcp
-#options BOOTP
-#options BOOTP_NFSROOT
-#options BOOTP_COMPAT
-#options BOOTP_NFSV3
-#options BOOTP_WIRED_TO=ue0
-
-#options ROOTDEVNAME=\"ufs:mmcsd0s2\"
-
-# pseudo devices
-device clk
-device phy
-device hwreset
-device nvmem
-device regulator
-device syscon
-
-device bpf
-device loop
-device ether
-device uart
-device pty
-device snp
-device pl011
-
-# Device mode support
-device usb_template # Control of the gadget
-
-# Comment following lines for boot console on serial port
-device vt
-device kbdmux
-device hkbd
-device ukbd
-
-device sdhci
-device mmc
-device mmcsd
-
-device gpio
-device gpioled
-
-# I2C
-device iic
-device iicbus
-device bcm2835_bsc
-
-device md
-
-# USB support
-device usb
-device dwcotg # DWC OTG controller
-
-# USB storage support
-device scbus
-device da
-device umass
-
-# USB ethernet support
-device smscphy
-device mii
-device smsc
-
-# SPI
-device spibus
-device bcm2835_spi
-
-device vchiq
-device sound
-
-device fdt_pinctrl
-
-# HID support
-device hid # Generic HID support
-
-# Flattened Device Tree
-options FDT # Configure using FDT/DTB data
-# Note: DTB is normally loaded and modified by RPi boot loader, then
-# handed to kernel via U-Boot and ubldr.
-#options FDT_DTB_STATIC
-#makeoptions FDT_DTS_FILE=rpi.dts
-makeoptions MODULES_EXTRA="dtb/rpi rpi_ft5406"
diff --git a/sys/arm/conf/std.armv6 b/sys/arm/conf/std.armv6
deleted file mode 100644
index a24227fc838f..000000000000
--- a/sys/arm/conf/std.armv6
+++ /dev/null
@@ -1,81 +0,0 @@
-# Standard kernel config items for all ARMv6 systems.
-#
-
-options HZ=1000
-options PREEMPTION # Enable kernel thread preemption
-options VIMAGE # Subsystem virtualization, e.g. VNET
-options INET # InterNETworking
-options INET6 # IPv6 communications protocols
-options CC_CUBIC # include CUBIC congestion control
-options TCP_HHOOK # hhook(9) framework for TCP
-device crypto # core crypto support
-options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5
-options NETLINK # netlink(4) support
-options SCTP_SUPPORT # Allow kldload of SCTP
-options FFS # Berkeley Fast Filesystem
-options SOFTUPDATES # Enable FFS soft updates support
-options UFS_ACL # Support for access control lists
-options UFS_DIRHASH # Improve performance on big directories
-options UFS_GJOURNAL # Enable gjournal-based UFS journaling
-options QUOTA # Enable disk quotas for UFS
-options NFSCL # Network Filesystem Client
-options NFSLOCKD # Network Lock Manager
-options NFS_ROOT # NFS usable as /, requires NFSCL
-options MSDOSFS # MSDOS Filesystem
-options CD9660 # ISO 9660 Filesystem
-options PROCFS # Process filesystem (requires PSEUDOFS)
-options PSEUDOFS # Pseudo-filesystem framework
-options TMPFS # Efficient memory filesystem
-options GEOM_PART_GPT # GUID Partition Tables
-options GEOM_PART_BSD # BSD partition scheme
-options GEOM_PART_MBR # MBR partition scheme
-options GEOM_LABEL # Provides labelization
-options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!]
-options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
-options KTRACE # ktrace(1) support
-options STACK # stack(9) support
-options SYSVSHM # SYSV-style shared memory
-options SYSVMSG # SYSV-style message queues
-options SYSVSEM # SYSV-style semaphores
-options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time
extensions
-options PRINTF_BUFR_SIZE=128 # Prevent printf output being
interspersed.
-options KBD_INSTALL_CDEV # install a CDEV entry in /dev
-options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
-options CAPABILITY_MODE # Capsicum capability mode
-options CAPABILITIES # Capsicum capabilites
-options FREEBSD_BOOT_LOADER # Process metadata passed from loader(8)
-options VFP # Enable floating point hardware support
-options MAC # Support for Mandatory Access Control
(MAC)
-
-options COMPAT_FREEBSD10 # Compatible with FreeBSD10
-options COMPAT_FREEBSD11 # Compatible with FreeBSD11
-options COMPAT_FREEBSD12 # Compatible with FreeBSD12
-options COMPAT_FREEBSD13 # Compatible with FreeBSD13
-options COMPAT_FREEBSD14 # Compatible with FreeBSD14
-
-# DTrace support
-options KDTRACE_HOOKS # Kernel DTrace hooks
-options DDB_CTF # all architectures - kernel ELF linker
loads CTF data
-makeoptions WITH_CTF=1
-
-# Debugging support. Always need this:
-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
-options KDB # Enable kernel debugger support.
-options KDB_TRACE # Print a stack trace for a panic.
-
-options USB_DEBUG # Enable usb debug support code
-
-# For full debugger support use (turn off in stable branch):
-include "std.debug"
-
-# Optional extras, never enabled by default:
-#options BOOTVERBOSE
-#options DEBUG # May result in extreme spewage
-#options KTR
-#options KTR_COMPILE=KTR_ALL
-#options KTR_ENTRIES=16384
-#options KTR_MASK=(KTR_SPARE2)
-#options KTR_VERBOSE=0
-#options USB_REQ_DEBUG
-#options USB_VERBOSE
-
