Author: ian
Date: Fri Feb 13 19:52:16 2015
New Revision: 278696
URL: https://svnweb.freebsd.org/changeset/base/278696
Log:
MFC r271220:
Create a common i.MX53 config and use it with the two existing i.MX53
boards.
Added:
stable/10/sys/arm/conf/IMX53
- copied unchanged from r271220, head/sys/arm/conf/IMX53
Modified:
stable/10/sys/arm/conf/DIGI-CCWMX53
stable/10/sys/arm/conf/IMX53-QSB
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/arm/conf/DIGI-CCWMX53
==============================================================================
--- stable/10/sys/arm/conf/DIGI-CCWMX53 Fri Feb 13 19:44:04 2015
(r278695)
+++ stable/10/sys/arm/conf/DIGI-CCWMX53 Fri Feb 13 19:52:16 2015
(r278696)
@@ -17,51 +17,13 @@
#
# $FreeBSD$
-ident DIGI-CCWMX53
+#NO_UNIVERSE
-include "../freescale/imx/std.imx53"
+include "IMX53"
+ident DIGI-CCWMX53
makeoptions WITHOUT_MODULES="ahc"
-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
-#options DEBUG
-
-options SCHED_4BSD # 4BSD scheduler
-#options PREEMPTION # Enable kernel thread preemption
-options INET # InterNETworking
-options INET6 # IPv6 communications protocols
-#options SCTP # Stream Control Transmission Protocol
-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 MD_ROOT # MD is a potential root device
-options NFSCL # New Network Filesystem Client
-#options NFSD # New Network Filesystem Server
-options NFSLOCKD # Network Lock Manager
-options NFS_ROOT # NFS usable as /, requires NFSCL
-options TMPFS # Efficient memory filesystem
-options MSDOSFS # MSDOS Filesystem
-options CD9660 # ISO 9660 Filesystem
-#options PROCFS # Process filesystem (requires PSEUDOFS)
-options PSEUDOFS # Pseudo-filesystem framework
-options GEOM_PART_BSD # BSD partition scheme
-options GEOM_PART_MBR # MBR partition scheme
-options GEOM_PART_GPT # GUID Partition Tables.
-options GEOM_LABEL # Provides labelization
-#options COMPAT_FREEBSD5 # Compatible with FreeBSD5
-#options COMPAT_FREEBSD6 # Compatible with FreeBSD6
-#options COMPAT_FREEBSD7 # Compatible with FreeBSD7
-options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
-options KTRACE # ktrace(1) 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 INCLUDE_CONFIG_FILE # Include this file in kernel
-options VFP # vfp/neon
-
# required for netbooting
#options BOOTP
#options BOOTP_COMPAT
@@ -71,117 +33,6 @@ options VFP # vfp/neon
#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
-
-# Debugging support. Always need this:
-options KDB # Enable kernel debugger support.
-# For minimum debugger support (stable branch) use:
-#options KDB_TRACE # Print a stack trace for a panic.
-# For full debugger support use this instead:
-options DDB # Support DDB.
-#options GDB # Support remote GDB.
-#options DEADLKRES # Enable the deadlock resolver
-#options INVARIANTS # Enable calls of extra sanity checking
-#options INVARIANT_SUPPORT # Extra sanity checks of internal
structures, required by INVARIANTS
-#options WITNESS # Enable checks to detect deadlocks and
cycles
-
-# 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 random # Entropy device
-device ether # Ethernet support
-#device vlan # 802.1Q VLAN support
-#device tun # Packet tunnel.
-#device md # Memory "disks"
-#device gif # IPv6 and IPv4 tunneling
-#device faith # IPv6-to-IPv4 relaying
(translation)
-#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
-options ALT_BREAK_TO_DEBUGGER
-
-device ata
-device atapci # Only for helper functions
-device imxata
-options ATA_STATIC_ID # Static device numbering
-
-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.
-options USB_DEBUG # enable debug msgs
-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
-
-
# Flattened Device Tree
-options FDT
options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=digi-ccwmx53.dts
-
-# NOTE: serial console will be disabled if syscons enabled
-# Uncomment following lines for framebuffer/syscons support
-#device sc
-#device vt
-#device kbdmux
-#options SC_DFLT_FONT # compile font in
-#makeoptions SC_DFLT_FONT=cp437
Copied: stable/10/sys/arm/conf/IMX53 (from r271220, head/sys/arm/conf/IMX53)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/10/sys/arm/conf/IMX53 Fri Feb 13 19:52:16 2015
(r278696, copy of r271220, head/sys/arm/conf/IMX53)
@@ -0,0 +1,173 @@
+# 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:
+#
+#
http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#
+# 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 (http://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 "../freescale/imx/std.imx53"
+
+makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+#options DEBUG
+
+options SCHED_4BSD # 4BSD scheduler
+#options PREEMPTION # Enable kernel thread preemption
+options INET # InterNETworking
+options INET6 # IPv6 communications protocols
+#options SCTP # Stream Control Transmission Protocol
+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 MD_ROOT # MD is a potential root device
+options NFSCL # New Network Filesystem Client
+#options NFSD # New Network Filesystem Server
+options NFSLOCKD # Network Lock Manager
+options NFS_ROOT # NFS usable as /, requires NFSCL
+options TMPFS # Efficient memory filesystem
+options MSDOSFS # MSDOS Filesystem
+options CD9660 # ISO 9660 Filesystem
+#options PROCFS # Process filesystem (requires PSEUDOFS)
+options PSEUDOFS # Pseudo-filesystem framework
+options GEOM_PART_BSD # BSD partition scheme
+options GEOM_PART_MBR # MBR partition scheme
+options GEOM_PART_GPT # GUID Partition Tables.
+options GEOM_LABEL # Provides labelization
+#options COMPAT_FREEBSD5 # Compatible with FreeBSD5
+#options COMPAT_FREEBSD6 # Compatible with FreeBSD6
+#options COMPAT_FREEBSD7 # Compatible with FreeBSD7
+options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
+options KTRACE # ktrace(1) 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 INCLUDE_CONFIG_FILE # Include this file in kernel
+options VFP # vfp/neon
+
+# kernel/memory size reduction
+#options MUTEX_NOINLINE
+#options NO_FFS_SNAPSHOT
+#options NO_SWAPPING
+#options NO_SYSCTL_DESCR
+#options RWLOCK_NOINLINE
+
+# Debugging support. Always need this:
+options KDB # Enable kernel debugger support.
+# For minimum debugger support (stable branch) use:
+#options KDB_TRACE # Print a stack trace for a panic.
+# For full debugger support use this instead:
+options DDB # Support DDB.
+#options GDB # Support remote GDB.
+options DEADLKRES # Enable the deadlock resolver
+options INVARIANTS # Enable calls of extra sanity checking
+options INVARIANT_SUPPORT # Extra sanity checks of internal
structures, required by INVARIANTS
+options WITNESS # Enable checks to detect deadlocks and
cycles
+
+# 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 random # Entropy device
+device ether # Ethernet support
+#device vlan # 802.1Q VLAN support
+#device tun # Packet tunnel.
+device md # Memory "disks"
+#device gif # IPv6 and IPv4 tunneling
+#device faith # IPv6-to-IPv4 relaying
(translation)
+#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
+options ALT_BREAK_TO_DEBUGGER
+
+device ata
+device atapci # Only for helper functions
+device imxata
+options ATA_STATIC_ID # Static device numbering
+
+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.
+options USB_DEBUG # enable debug msgs
+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
+
+
+# Flattened Device Tree
+options FDT
+
+# NOTE: serial console will be disabled if syscons enabled
+# Uncomment following lines for framebuffer/syscons support
+#device sc
+#device vt
+#device kbdmux
+#options SC_DFLT_FONT # compile font in
+#makeoptions SC_DFLT_FONT=cp437
Modified: stable/10/sys/arm/conf/IMX53-QSB
==============================================================================
--- stable/10/sys/arm/conf/IMX53-QSB Fri Feb 13 19:44:04 2015
(r278695)
+++ stable/10/sys/arm/conf/IMX53-QSB Fri Feb 13 19:52:16 2015
(r278696)
@@ -17,49 +17,12 @@
#
# $FreeBSD$
-ident IMX53-QSB
-
-include "../freescale/imx/std.imx53"
+#NO_UNIVERSE
-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
-#options DEBUG
+include "IMX53"
+ident IMX53-QSB
options HZ=250 # 4ms scheduling quantum
-options SCHED_4BSD # 4BSD scheduler
-#options PREEMPTION # Enable kernel thread preemption
-options INET # InterNETworking
-options INET6 # IPv6 communications protocols
-#options SCTP # Stream Control Transmission Protocol
-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 MD_ROOT # MD is a potential root device
-options NFSCL # New Network Filesystem Client
-#options NFSD # New Network Filesystem Server
-options NFSLOCKD # Network Lock Manager
-options NFS_ROOT # NFS usable as /, requires NFSCL
-options TMPFS # Efficient memory filesystem
-options MSDOSFS # MSDOS Filesystem
-options CD9660 # ISO 9660 Filesystem
-#options PROCFS # Process filesystem (requires PSEUDOFS)
-options PSEUDOFS # Pseudo-filesystem framework
-options GEOM_PART_BSD # BSD partition scheme
-options GEOM_PART_MBR # MBR partition scheme
-options GEOM_PART_GPT # GUID Partition Tables.
-options GEOM_LABEL # Provides labelization
-#options COMPAT_FREEBSD5 # Compatible with FreeBSD5
-#options COMPAT_FREEBSD6 # Compatible with FreeBSD6
-#options COMPAT_FREEBSD7 # Compatible with FreeBSD7
-options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
-options KTRACE # ktrace(1) 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 INCLUDE_CONFIG_FILE # Include this file in kernel
-options VFP # vfp/neon
# required for netbooting
#options BOOTP
@@ -70,111 +33,6 @@ options VFP # vfp/neon
#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
-
-# Debugging support. Always need this:
-options KDB # Enable kernel debugger support.
-# For minimum debugger support (stable branch) use:
-#options KDB_TRACE # Print a stack trace for a panic.
-# For full debugger support use this instead:
-options DDB # Support DDB.
-#options GDB # Support remote GDB.
-#options DEADLKRES # Enable the deadlock resolver
-#options INVARIANTS # Enable calls of extra sanity checking
-#options INVARIANT_SUPPORT # Extra sanity checks of internal
structures, required by INVARIANTS
-#options WITNESS # Enable checks to detect deadlocks and
cycles
-
-# 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 random # Entropy device
-device ether # Ethernet support
-#device vlan # 802.1Q VLAN support
-#device tun # Packet tunnel.
-device md # Memory "disks"
-#device gif # IPv6 and IPv4 tunneling
-#device faith # IPv6-to-IPv4 relaying
(translation)
-#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
-options ALT_BREAK_TO_DEBUGGER
-
-#device ata
-#device atapci # Only for helper functions
-#device imxata
-#options ATA_STATIC_ID # Static device numbering
-
-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.
-#options USB_DEBUG # enable debug msgs
-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
-
# Flattened Device Tree
-options FDT
options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=imx53-qsb.dts
-
-# 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
-
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
