The branch main has been updated by manu:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=cdb0c2a73df624f0facf9903c64663c0bab419a8

commit cdb0c2a73df624f0facf9903c64663c0bab419a8
Author:     Emmanuel Vadot <m...@freebsd.org>
AuthorDate: 2023-03-15 09:39:02 +0000
Commit:     Emmanuel Vadot <m...@freebsd.org>
CommitDate: 2023-03-17 12:33:57 +0000

    arm: Remove IMX5 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:    andrew
    Differential Revision:  https://reviews.freebsd.org/D39089
---
 sys/arm/conf/EFIKA_MX | 145 --------------------------------------------------
 sys/arm/conf/IMX53    | 131 ---------------------------------------------
 2 files changed, 276 deletions(-)

diff --git a/sys/arm/conf/EFIKA_MX b/sys/arm/conf/EFIKA_MX
deleted file mode 100644
index 941922355057..000000000000
--- a/sys/arm/conf/EFIKA_MX
+++ /dev/null
@@ -1,145 +0,0 @@
-#
-# Kernel configuration for Efika MX Smarttop/Smartbook 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          EFIKA_MX
-
-include        "std.armv7"
-include        "../freescale/imx/std.imx51"
-
-makeoptions    WITHOUT_MODULES="ahc"
-
-options        SOC_IMX51
-
-options        SCHED_4BSD              # 4BSD scheduler
-#options       MD_ROOT                 # MD is a potential root device
-#options       NFSD                    # Network Filesystem Server
-options        PLATFORM
-options        INCLUDE_CONFIG_FILE     # Include this file in kernel
-
-# NFS root from boopt/dhcp
-#options       BOOTP
-#options       BOOTP_NFSROOT
-#options       BOOTP_COMPAT
-#options       BOOTP_NFSV3
-#options       BOOTP_WIRED_TO=ue0
-
-options        ROOTDEVNAME=\"ufs:ada0s2a\"
-
-
-# kernel/memory size reduction
-#options       MUTEX_NOINLINE
-#options       NO_FFS_SNAPSHOT
-#options       NO_SWAPPING
-#options       NO_SYSCTL_DESCR
-#options       RWLOCK_NOINLINE
-
-# pseudo devices
-device         clk
-device         phy
-device         hwreset
-device         nvmem
-device         regulator
-device         syscon
-
-# The `bpf' device enables the Berkeley Packet Filter.
-# Be aware of the administrative consequences of enabling this!
-# Note that 'bpf' is required for DHCP.
-device         bpf                     # Berkeley packet filter
-
-# Pseudo devices.
-device         loop                    # Network loopback
-device         ether                   # Ethernet support
-#device                vlan                    # 802.1Q VLAN support
-#device                tuntap                  # Packet tunnel.
-#device                md                      # Memory "disks"
-#device                gif                     # IPv6 and IPv4 tunneling
-#device                firmware                # firmware assist module
-
-# Serial (COM) ports
-device         uart                    # Multi-uart driver
-
-device         ata
-device         atapci                  # Only for helper functions
-device         imxata
-
-device         gpio
-device         gpioled
-
-device         fsliic
-device         iic
-device         iicbus
-
-# SCSI peripherals
-device         scbus                   # SCSI bus (required for ATA/SCSI)
-device         da                      # Direct Access (disks)
-device         cd                      # CD
-device         pass                    # Passthrough device (direct ATA/SCSI 
access)
-
-# USB support
-options        USB_HOST_ALIGN=64       # Align usb buffers to cache line size.
-device         ehci                    # OHCI USB interface
-device         usb                     # USB Bus (required)
-device         umass                   # Disks/Mass storage - Requires scbus 
and da
-device         uhid                    # "Human Interface Devices"
-device         u3g
-
-# USB Ethernet, requires miibus
-device         miibus
-device         aue                     # ADMtek USB Ethernet
-device         axe                     # ASIX Electronics USB Ethernet
-device         cdce                    # Generic USB over Ethernet
-device         cue                     # CATC USB Ethernet
-device         kue                     # Kawasaki LSI USB Ethernet
-device         rue                     # RealTek RTL8150 USB Ethernet
-device         udav                    # Davicom DM9601E USB
-
-# USB Wireless
-device         rum                     # Ralink Technology RT2501USB wireless 
NICs
-
-# Watchdog timer.
-# WARNING: can't be disabled!!!
-device         imxwdt                  # Watchdog
-
-# Wireless NIC cards
-device         wlan                    # 802.11 support
-device         wlan_wep                # 802.11 WEP support
-device         wlan_ccmp               # 802.11 CCMP support
-device         wlan_tkip               # 802.11 TKIP support
-device         wlan_amrr               # AMRR transmit rate control algorithm
-
-# HID support
-device         hid                     # Generic HID support
-
-# Flattened Device Tree
-options        FDT                     # Configure using FDT/DTB data
-options        FDT_DTB_STATIC
-makeoptions    FDT_DTS_FILE=efikamx.dts
-device         fdt_pinctrl             # FDT pinmux driver
-
-# NOTE: serial console will be disabled if syscons enabled
-# Uncomment following lines for framebuffer/syscons support
-device         sc
-device         kbdmux
-options        SC_DFLT_FONT            # compile font in
-makeoptions    SC_DFLT_FONT=cp437
-device         ukbd                    # Allow keyboard like HIDs to control 
console
-device         ums
diff --git a/sys/arm/conf/IMX53 b/sys/arm/conf/IMX53
deleted file mode 100644
index aed467424add..000000000000
--- a/sys/arm/conf/IMX53
+++ /dev/null
@@ -1,131 +0,0 @@
-#
-# Kernel configuration for i.MX53 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$
-
-ident          IMX53
-
-include        "std.armv7"
-include        "../freescale/imx/std.imx53"
-
-options        SOC_IMX53
-
-options        SCHED_4BSD              # 4BSD scheduler
-#options       NFSD                    # Network Filesystem Server
-options        PLATFORM
-options        INCLUDE_CONFIG_FILE     # Include this file in kernel
-
-# kernel/memory size reduction
-#options       MUTEX_NOINLINE
-#options       NO_FFS_SNAPSHOT
-#options       NO_SWAPPING
-#options       NO_SYSCTL_DESCR
-#options       RWLOCK_NOINLINE
-
-# The `bpf' device enables the Berkeley Packet Filter.
-# Be aware of the administrative consequences of enabling this!
-# Note that 'bpf' is required for DHCP.
-device         bpf                     # Berkeley packet filter
-
-# pseudo devices
-device         clk
-device         phy
-device         hwreset
-device         nvmem
-device         regulator
-device         syscon
-
-# Pseudo devices.
-device         loop                    # Network loopback
-device         ether                   # Ethernet support
-#device                vlan                    # 802.1Q VLAN support
-#device                tuntap                  # Packet tunnel.
-device         md                      # Memory "disks"
-#device                gif                     # IPv6 and IPv4 tunneling
-#device                firmware                # firmware assist module
-
-# Ethernet
-device         ffec                    # Freescale Fast Ethernet Controller
-device         miibus                  # Standard mii bus
-
-# Serial (COM) ports
-device         uart                    # Multi-uart driver
-
-device         ata
-device         atapci                  # Only for helper functions
-device         imxata
-
-device         gpio
-device         gpioled
-
-device         fsliic
-device         iic
-device         iicbus
-
-# SCSI peripherals
-device         scbus                   # SCSI bus (required for ATA/SCSI)
-device         da                      # Direct Access (disks)
-device         cd                      # CD
-device         pass                    # Passthrough device (direct ATA/SCSI 
access)
-
-# USB support
-options        USB_HOST_ALIGN=64       # Align usb buffers to cache line size.
-device         ehci                    # OHCI USB interface
-device         usb                     # USB Bus (required)
-device         umass                   # Disks/Mass storage - Requires scbus 
and da
-device         uhid                    # "Human Interface Devices"
-#device                ukbd                    # Allow keyboard like HIDs to 
control console
-device         ums
-
-# USB Ethernet, requires miibus
-#device                miibus
-#device                aue                     # ADMtek USB Ethernet
-#device                axe                     # ASIX Electronics USB Ethernet
-#device                cdce                    # Generic USB over Ethernet
-#device                cue                     # CATC USB Ethernet
-#device                kue                     # Kawasaki LSI USB Ethernet
-#device                rue                     # RealTek RTL8150 USB Ethernet
-#device                udav                    # Davicom DM9601E USB
-
-# USB Wireless
-#device                rum                     # Ralink Technology RT2501USB 
wireless NICs
-
-# Watchdog timer.
-# WARNING: can't be disabled!!!
-device         imxwdt                  # Watchdog
-
-# Wireless NIC cards
-device         wlan                    # 802.11 support
-device         wlan_wep                # 802.11 WEP support
-device         wlan_ccmp               # 802.11 CCMP support
-device         wlan_tkip               # 802.11 TKIP support
-device         wlan_amrr               # AMRR transmit rate control algorithm
-
-# MMC
-#device        sdhci                   # SD controller
-#device        mmc                     # SD/MMC protocol
-#device        mmcsd                   # SDCard disk device
-
-# HID support
-device         hid                     # Generic HID support
-
-
-# Flattened Device Tree
-options        FDT                     # Configure using FDT/DTB data
-makeoptions    MODULES_EXTRA="dtb/imx5 imx"
-device         fdt_pinctrl             # FDT pinmux driver

Reply via email to