The branch main has been updated by manu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=ba9f8eeb478975069b644f2228808d5e0c0dc1b1
commit ba9f8eeb478975069b644f2228808d5e0c0dc1b1
Author: Emmanuel Vadot <m...@freebsd.org>
AuthorDate: 2023-03-15 09:26:24 +0000
Commit: Emmanuel Vadot <m...@freebsd.org>
CommitDate: 2023-03-17 12:33:51 +0000
arm: Remove VYBRID specific kernel config
We had GENERIC for a while now so anyone still interested in those boards
should make sure that we can boot on them with it and with upstream DTS
files.
Sponsored by: Beckhoff Automation GmbH & Co. KG
Reviewed by: andrew
Differential Revision: https://reviews.freebsd.org/D39087
---
sys/arm/conf/COLIBRI-VF50 | 28 -----------
sys/arm/conf/COSMIC | 28 -----------
sys/arm/conf/QUARTZ | 28 -----------
sys/arm/conf/VYBRID | 120 ----------------------------------------------
4 files changed, 204 deletions(-)
diff --git a/sys/arm/conf/COLIBRI-VF50 b/sys/arm/conf/COLIBRI-VF50
deleted file mode 100644
index af0085615786..000000000000
--- a/sys/arm/conf/COLIBRI-VF50
+++ /dev/null
@@ -1,28 +0,0 @@
-# Kernel configuration for Toradex Colibri VF50 Evaluation Board.
-#
-# 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.
-#
-# $FreeBSD$
-
-#NO_UNIVERSE
-
-include "VYBRID"
-ident COLIBRI-VF50
-
-#FDT
-options FDT
-options FDT_DTB_STATIC
-makeoptions FDT_DTS_FILE=vybrid-colibri-vf50.dts
diff --git a/sys/arm/conf/COSMIC b/sys/arm/conf/COSMIC
deleted file mode 100644
index b9d1ffc5aa42..000000000000
--- a/sys/arm/conf/COSMIC
+++ /dev/null
@@ -1,28 +0,0 @@
-# Kernel configuration for Cosmic Board (Freescale Vybrid Family development
board).
-#
-# 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.
-#
-# $FreeBSD$
-
-#NO_UNIVERSE
-
-include "VYBRID"
-ident COSMIC
-
-#FDT
-options FDT
-options FDT_DTB_STATIC
-makeoptions FDT_DTS_FILE=vybrid-cosmic.dts
diff --git a/sys/arm/conf/QUARTZ b/sys/arm/conf/QUARTZ
deleted file mode 100644
index de6d38463b17..000000000000
--- a/sys/arm/conf/QUARTZ
+++ /dev/null
@@ -1,28 +0,0 @@
-# Kernel configuration for Device Solutions Quartz Module.
-#
-# 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.
-#
-# $FreeBSD$
-
-#NO_UNIVERSE
-
-include "VYBRID"
-ident QUARTZ
-
-#FDT
-options FDT
-options FDT_DTB_STATIC
-makeoptions FDT_DTS_FILE=vybrid-quartz.dts
diff --git a/sys/arm/conf/VYBRID b/sys/arm/conf/VYBRID
deleted file mode 100644
index 2ce765ec483b..000000000000
--- a/sys/arm/conf/VYBRID
+++ /dev/null
@@ -1,120 +0,0 @@
-#
-# Kernel configuration for Vybrid Family boards.
-#
-# 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.
-#
-# $FreeBSD$
-
-#NO_UNIVERSE
-
-ident VYBRID
-include "std.armv7"
-include "../freescale/vybrid/std.vybrid"
-
-options SCHED_4BSD # 4BSD scheduler
-options PLATFORM # Platform based SoC
-#options SMP # Enable multiple cores
-
-# NFS root from boopt/dhcp
-#options BOOTP
-#options BOOTP_NFSROOT
-#options BOOTP_COMPAT
-#options BOOTP_NFSV3
-#options BOOTP_WIRED_TO=ffec0
-
-#options ROOTDEVNAME=\"nfs:10.5.0.1:/tftpboot/cosmic\"
-options ROOTDEVNAME=\"ufs:/dev/da0\"
-
-options MUTEX_NOINLINE
-options RWLOCK_NOINLINE
-options NO_FFS_SNAPSHOT
-options NO_SWAPPING
-
-# Interrupt controller
-device gic
-
-# pseudo devices
-device clk
-device phy
-device hwreset
-device nvmem
-device regulator
-device syscon
-
-# ARM MPCore timer
-device mpcore_timer
-
-# MMC/SD/SDIO Card slot support
-device mmc # mmc/sd bus
-device mmcsd # mmc/sd flash cards
-device sdhci # generic sdhci
-
-# Pseudo devices
-
-device loop
-device pty
-device md
-device gpio
-
-# USB support
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
-device usb
-#device musb
-device ehci
-#device ohci
-
-device umass
-device scbus # SCSI bus (required for ATA/SCSI)
-device da # Direct Access (disks)
-device pass
-
-# SATA
-#device ata
-#device atadisk
-#device mvs
-
-# Serial ports
-device uart
-
-# I2C (TWSI)
-device iic
-device iicbus
-
-# Ethernet
-device ether
-device ffec
-
-# USB ethernet support, requires miibus
-device miibus
-device axe # ASIX Electronics USB Ethernet
-device bpf # Berkeley packet filter
-
-device sound
-
-# SPI
-device spibus
-device vf_spi
-
-# Framebuffer
-device vt
-device kbdmux
-device ukbd
-
-# HID support
-device hid # Generic HID support
-
-# Flattened Device Tree
-options FDT # Configure using FDT/DTB data
