The branch main has been updated by manu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=949efdaa1db8cfe165760ebb78efd3e04ad1f758
commit 949efdaa1db8cfe165760ebb78efd3e04ad1f758
Author: Emmanuel Vadot <m...@freebsd.org>
AuthorDate: 2023-03-15 09:29:27 +0000
Commit: Emmanuel Vadot <m...@freebsd.org>
CommitDate: 2023-03-17 13:49:01 +0000
arm: Remove SOCFPGA specific kernel configs
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: br
Differential Revision: https://reviews.freebsd.org/D39088
---
sys/arm/conf/SOCDK | 30 -------------
sys/arm/conf/SOCFPGA | 110 -----------------------------------------------
sys/arm/conf/SOCKIT | 30 -------------
sys/arm/conf/SOCKIT-BERI | 37 ----------------
4 files changed, 207 deletions(-)
diff --git a/sys/arm/conf/SOCDK b/sys/arm/conf/SOCDK
deleted file mode 100644
index b5561b9b7ff2..000000000000
--- a/sys/arm/conf/SOCDK
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Kernel configuration for Altera Arria10 SOC Development Kit.
-#
-# 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 "SOCFPGA"
-ident SOCDK
-
-options ROOTDEVNAME=\"ufs:/dev/mmcsd0s4\"
-
-# Flattened Device Tree
-options FDT_DTB_STATIC
-makeoptions FDT_DTS_FILE=socfpga_arria10_socdk_sdmmc.dts
diff --git a/sys/arm/conf/SOCFPGA b/sys/arm/conf/SOCFPGA
deleted file mode 100644
index 0ffd0ab53631..000000000000
--- a/sys/arm/conf/SOCFPGA
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-# Kernel configuration for Altera SOCFPGA development kits.
-#
-# 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 SOCFPGA
-include "std.armv7"
-include "../altera/socfpga/std.socfpga"
-
-makeoptions MODULES_OVERRIDE=""
-
-options SCHED_ULE # ULE scheduler
-options PLATFORM # Platform based SoC
-options SMP # Enable multiple cores
-
-options SOC_ALTERA_ARRIA10
-options SOC_ALTERA_CYCLONE5
-
-# NFS root from boopt/dhcp
-#options BOOTP
-#options BOOTP_NFSROOT
-#options BOOTP_COMPAT
-#options BOOTP_NFSV3
-#options BOOTP_WIRED_TO=ue0
-
-# pseudo devices
-device clk
-device phy
-device hwreset
-device nvmem
-device regulator
-device syscon
-
-# Interrupt controller
-device gic
-
-# ARM MPCore timer
-device mpcore_timer
-
-# DMA support
-device xdma
-device pl330
-
-# MMC/SD/SDIO Card slot support
-device mmc # mmc/sd bus
-device mmcsd # mmc/sd flash cards
-device dwmmc
-
-# Pseudo devices
-
-device loop
-device pty
-device md
-device gpio
-
-# USB support
-options USB_HOST_ALIGN=64 # Align usb buffers to cache line size.
-device usb
-device dwcotg
-
-device umass
-device scbus # SCSI bus (required for ATA/SCSI)
-device da # Direct Access (disks)
-device pass
-
-# Serial ports
-device uart
-device uart_snps
-
-# I2C (TWSI)
-device iic
-device iicbus
-
-# SPI
-device spibus
-device cqspi
-device n25q
-
-# Ethernet
-device ether
-device mii
-device smsc
-device smscphy
-device dwc
-device micphy
-
-# USB ethernet support, requires miibus
-device miibus
-device axe # ASIX Electronics USB Ethernet
-device bpf # Berkeley packet filter
-
-# Flattened Device Tree
-options FDT # Configure using FDT/DTB data
diff --git a/sys/arm/conf/SOCKIT b/sys/arm/conf/SOCKIT
deleted file mode 100644
index d1e9a85d7bd9..000000000000
--- a/sys/arm/conf/SOCKIT
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Kernel configuration for Terasic SoCKit (Altera Cyclone V SoC).
-#
-# 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 "SOCFPGA"
-ident SOCKIT
-
-options ROOTDEVNAME=\"ufs:/dev/mmcsd0s4\"
-
-# Flattened Device Tree
-options FDT_DTB_STATIC
-makeoptions FDT_DTS_FILE=socfpga_cyclone5_sockit_sdmmc.dts
diff --git a/sys/arm/conf/SOCKIT-BERI b/sys/arm/conf/SOCKIT-BERI
deleted file mode 100644
index 0e21f5c27604..000000000000
--- a/sys/arm/conf/SOCKIT-BERI
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Kernel configuration for Terasic SoCKit (Altera Cyclone V SoC).
-#
-# 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 "SOCFPGA"
-ident SOCKIT-BERI
-
-options ROOTDEVNAME=\"ufs:/dev/mmcsd0s4\"
-
-# BERI specific
-device beri_ring
-device beri_mem
-device beri_vtblk
-device vtbe
-device altera_pio
-
-# Flattened Device Tree
-options FDT_DTB_STATIC
-makeoptions FDT_DTS_FILE=socfpga_cyclone5_sockit_beri_sdmmc.dts
