Date: Fri, 14 Sep 2012 11:03:18 -0700 From: John-Mark Gurney <jmg@funkthat.com> To: freebsd-arm@FreeBSD.org Subject: minor patches to cpsw and arm conf files Message-ID: <20120914180318.GX58312@funkthat.com>
next in thread | raw e-mail | index | archive | help
The first patch removes some dead code, an incorrect comment, and some
anoying printf's from TI's cpsw driver. I left the other printf's in
the same function since they are clearly there to denote unimplemented
functionality.
The second patch fixes up the conf files such that they follow the
proper format of options<space><tab>... This applied for both
commented out options and uncommented options... I also fixes a few
that had "#<space>options" and the like to make it more standard...
for people who care, part of it was automated with:
for i in `grep -l '^#options<tab>' *'; do sed -e 's/^#options<tab>/options /' < $i > tmp && mv tmp $i; done
for i in `grep -l '^options<tab>' *'; do sed -e 's/^options<tab>/options /' < $i > tmp && mv tmp $i; done
Anyone have any objections to me committing these?
Thanks.
Index: ti/cpsw/if_cpsw.c
===================================================================
--- ti/cpsw/if_cpsw.c (revision 240480)
+++ ti/cpsw/if_cpsw.c (working copy)
@@ -713,8 +713,6 @@
sc->cpsw_if_flags = ifp->if_flags;
CPSW_GLOBAL_UNLOCK(sc);
break;
- printf("%s: SIOCSIFFLAGS\n",__func__);
- break;
case SIOCADDMULTI:
printf("%s: SIOCADDMULTI\n",__func__);
break;
@@ -724,12 +722,10 @@
case SIOCSIFCAP:
printf("%s: SIOCSIFCAP\n",__func__);
break;
- case SIOCGIFMEDIA: /* fall through */
- printf("%s: SIOCGIFMEDIA\n",__func__);
+ case SIOCGIFMEDIA:
error = ifmedia_ioctl(ifp, ifr, &sc->mii->mii_media, command);
break;
case SIOCSIFMEDIA:
- printf("%s: SIOCSIFMEDIA\n",__func__);
error = ifmedia_ioctl(ifp, ifr, &sc->mii->mii_media, command);
break;
default:
Index: conf/KB920X
===================================================================
--- conf/KB920X (revision 240480)
+++ conf/KB920X (working copy)
@@ -144,6 +144,6 @@
device cdce # emulate an ethernet
device usb_template # Control of the gadget
-options IEEE80211_SUPPORT_MESH
+options IEEE80211_SUPPORT_MESH
-options AH_SUPPORT_AR5416
+options AH_SUPPORT_AR5416
Index: conf/QILA9G20
===================================================================
--- conf/QILA9G20 (revision 240480)
+++ conf/QILA9G20 (working copy)
@@ -51,7 +51,7 @@
options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
-options ALT_BREAK_TO_DEBUGGER
+options ALT_BREAK_TO_DEBUGGER
#options MSDOSFS #MSDOS Filesystem
#options CD9660 #ISO 9660 Filesystem
Index: conf/SAM9X25EK
===================================================================
--- conf/SAM9X25EK (revision 240480)
+++ conf/SAM9X25EK (working copy)
@@ -51,7 +51,7 @@
options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
-options ALT_BREAK_TO_DEBUGGER
+options ALT_BREAK_TO_DEBUGGER
#options MSDOSFS #MSDOS Filesystem
#options CD9660 #ISO 9660 Filesystem
Index: conf/SN9G45
===================================================================
--- conf/SN9G45 (revision 240480)
+++ conf/SN9G45 (working copy)
@@ -50,7 +50,7 @@
options ROOTDEVNAME=\"ufs:/dev/da0s1\"
-options ALT_BREAK_TO_DEBUGGER
+options ALT_BREAK_TO_DEBUGGER
#options MSDOSFS #MSDOS Filesystem
#options CD9660 #ISO 9660 Filesystem
Index: conf/PANDABOARD
===================================================================
--- conf/PANDABOARD (revision 240480)
+++ conf/PANDABOARD (working copy)
@@ -46,15 +46,15 @@
options UFS_DIRHASH #Improve performance on big directories
options NFSCLIENT #Network Filesystem Client
device snp
-#options NFSCL
+#options NFSCL
#options NFSSERVER #Network Filesystem Server
options NFS_ROOT #NFS usable as /, requires NFSCLIENT
-options BREAK_TO_DEBUGGER
-options BOOTP_NFSROOT
-options BOOTP_COMPAT
-options BOOTP
-options BOOTP_NFSV3
-options BOOTP_WIRED_TO=ue0
+options BREAK_TO_DEBUGGER
+options BOOTP_NFSROOT
+options BOOTP_COMPAT
+options BOOTP
+options BOOTP_NFSV3
+options BOOTP_WIRED_TO=ue0
options MSDOSFS #MSDOS Filesystem
#options CD9660 #ISO 9660 Filesystem
#options PROCFS #Process filesystem (requires PSEUDOFS)
@@ -93,7 +93,7 @@
device pl310 # PL310 L2 cache controller
# Debugging for use in -current
-#options VERBOSE_SYSINIT #Enable verbose sysinit messages
+#options VERBOSE_SYSINIT #Enable verbose sysinit messages
options KDB
options DDB #Enable the kernel debugger
#options INVARIANTS #Enable calls of extra sanity checking
@@ -106,16 +106,16 @@
# The following enables MFS as root, this seems similar to an initramfs or initrd
# as used in Linux.
-# options MD_ROOT
-# options MD_ROOT_SIZE=7560
+#options MD_ROOT
+#options MD_ROOT_SIZE=7560
device random # Entropy device
# USB support
device usb
options USB_DEBUG
-#options USB_REQ_DEBUG
-#options USB_VERBOSE
+#options USB_REQ_DEBUG
+#options USB_VERBOSE
device ohci
device ehci
device umass
@@ -125,7 +125,7 @@
# USB Ethernet support, requires miibus
device miibus
-# device axe # ASIX Electronics USB Ethernet
+#device axe # ASIX Electronics USB Ethernet
device smsc # SMSC LAN95xx USB Ethernet
@@ -140,5 +140,5 @@
options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=pandaboard.dts
-# device vfp # vfp/neon
-# options ARM_VFP_SUPPORT # vfp/neon
+#device vfp # vfp/neon
+#options ARM_VFP_SUPPORT # vfp/neon
Index: conf/ARMADAXP
===================================================================
--- conf/ARMADAXP (revision 240480)
+++ conf/ARMADAXP (working copy)
@@ -92,8 +92,8 @@
device mii
device e1000phy
device bpf
-options HZ=1000
-options DEVICE_POLLING
+options HZ=1000
+options DEVICE_POLLING
device vlan
#FDT
Index: conf/SHEEVAPLUG
===================================================================
--- conf/SHEEVAPLUG (revision 240480)
+++ conf/SHEEVAPLUG (working copy)
@@ -56,8 +56,8 @@
device mii
device e1000phy
device bpf
-options HZ=1000
-options DEVICE_POLLING
+options HZ=1000
+options DEVICE_POLLING
device vlan
device cesa # Marvell security engine
@@ -78,5 +78,5 @@
# Flattened Device Tree
options FDT
-options FDT_DTB_STATIC
+options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=sheevaplug.dts
Index: conf/TS7800
===================================================================
--- conf/TS7800 (revision 240480)
+++ conf/TS7800 (working copy)
@@ -74,6 +74,6 @@
# Flattened Device Tree
options FDT
-options FDT_DTB_STATIC
+options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=ts7800.dts
Index: conf/GUMSTIX-QEMU
===================================================================
--- conf/GUMSTIX-QEMU (revision 240480)
+++ conf/GUMSTIX-QEMU (working copy)
@@ -21,5 +21,5 @@
ident GUMSTIX-QEMU
-options QEMU_WORKAROUNDS
+options QEMU_WORKAROUNDS
nooptions ARM_CACHE_LOCK_ENABLE # QEMU does not implement this
Index: conf/CNS11XXNAS
===================================================================
--- conf/CNS11XXNAS (revision 240480)
+++ conf/CNS11XXNAS (working copy)
@@ -47,9 +47,9 @@
#options DIAGNOSTIC
-#options COMPAT_FREEBSD5
-#options COMPAT_FREEBSD6
-#options COMPAT_FREEBSD7
+#options COMPAT_FREEBSD5
+#options COMPAT_FREEBSD6
+#options COMPAT_FREEBSD7
options SCHED_ULE #ULE scheduler
@@ -121,4 +121,4 @@
device geom_journal
device geom_part_bsd
-options ROOTDEVNAME=\"ufs:da0s1a\"
+options ROOTDEVNAME=\"ufs:da0s1a\"
Index: conf/BEAGLEBONE
===================================================================
--- conf/BEAGLEBONE (revision 240480)
+++ conf/BEAGLEBONE (working copy)
@@ -25,52 +25,52 @@
makeoptions MODULES_OVERRIDE=""
makeoptions WITHOUT_MODULES="ahc"
-options HZ=100
-options SCHED_4BSD #4BSD scheduler
-options INET #InterNETworking
-options INET6 #IPv6 communications protocols
-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 MSDOSFS #MSDOS Filesystem
-options CD9660 #ISO 9660 Filesystem
-options PROCFS #Process filesystem (requires PSEUDOFS)
-options PSEUDOFS #Pseudo-filesystem framework
-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 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 KBD_INSTALL_CDEV # install a CDEV entry in /dev
-options PREEMPTION
+options HZ=100
+options SCHED_4BSD #4BSD scheduler
+options INET #InterNETworking
+options INET6 #IPv6 communications protocols
+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 MSDOSFS #MSDOS Filesystem
+options CD9660 #ISO 9660 Filesystem
+options PROCFS #Process filesystem (requires PSEUDOFS)
+options PSEUDOFS #Pseudo-filesystem framework
+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 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 KBD_INSTALL_CDEV # install a CDEV entry in /dev
+options PREEMPTION
# Debugging
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
-options BREAK_TO_DEBUGGER
-#options VERBOSE_SYSINIT #Enable verbose sysinit messages
-options KDB
-options DDB #Enable the kernel debugger
-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
-options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
-#options DIAGNOSTIC
+options BREAK_TO_DEBUGGER
+#options VERBOSE_SYSINIT #Enable verbose sysinit messages
+options KDB
+options DDB #Enable the kernel debugger
+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
+options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
+#options DIAGNOSTIC
# NFS support
-#options NFSCL
-#options NFSSERVER #Network Filesystem Server
-#options NFSCLIENT #Network Filesystem Client
+#options NFSCL
+#options NFSSERVER #Network Filesystem Server
+#options NFSCLIENT #Network Filesystem Client
# Uncomment this for NFS root
-#options NFS_ROOT #NFS usable as /, requires NFSCLIENT
-#options BOOTP_NFSROOT
-#options BOOTP_COMPAT
-#options BOOTP
-#options BOOTP_NFSV3
-#options BOOTP_WIRED_TO=cpsw0
+#options NFS_ROOT #NFS usable as /, requires NFSCLIENT
+#options BOOTP_NFSROOT
+#options BOOTP_COMPAT
+#options BOOTP
+#options BOOTP_NFSV3
+#options BOOTP_WIRED_TO=cpsw0
# MMC/SD/SDIO card slot support
@@ -78,7 +78,7 @@
device mmcsd # mmc/sd flash cards
# Boot device is 2nd slice on MMC/SD card
-options ROOTDEVNAME=\"ufs:mmcsd0s2\"
+options ROOTDEVNAME=\"ufs:mmcsd0s2\"
# Console and misc
device uart
@@ -99,9 +99,9 @@
# USB support
device usb
-options USB_DEBUG
-#options USB_REQ_DEBUG
-#options USB_VERBOSE
+options USB_DEBUG
+#options USB_REQ_DEBUG
+#options USB_VERBOSE
device musb
device umass
device scbus # SCSI bus (required for SCSI)
Index: conf/HL201
===================================================================
--- conf/HL201 (revision 240480)
+++ conf/HL201 (working copy)
@@ -49,7 +49,7 @@
#options BOOTP_WIRED_TO=ate0
options BOOTP_COMPAT
-options ALT_BREAK_TO_DEBUGGER
+options ALT_BREAK_TO_DEBUGGER
#options MSDOSFS #MSDOS Filesystem
#options CD9660 #ISO 9660 Filesystem
@@ -128,5 +128,5 @@
#device wlan_ccmp # 802.11 CCMP support
#device wlan_tkip # 802.11 TKIP support
#device wlan_amrr # AMRR transmit rate control algorithm
-options ROOTDEVNAME=\"ufs:da0s1a\"
+options ROOTDEVNAME=\"ufs:da0s1a\"
Index: conf/EA3250
===================================================================
--- conf/EA3250 (revision 240480)
+++ conf/EA3250 (working copy)
@@ -65,7 +65,7 @@
device lpe
# USB
-options USB_DEBUG
+options USB_DEBUG
device usb
device ohci
device umass
Index: conf/SAM9G20EK
===================================================================
--- conf/SAM9G20EK (revision 240480)
+++ conf/SAM9G20EK (working copy)
@@ -50,7 +50,7 @@
options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
-options ALT_BREAK_TO_DEBUGGER
+options ALT_BREAK_TO_DEBUGGER
#options MSDOSFS #MSDOS Filesystem
#options CD9660 #ISO 9660 Filesystem
Index: conf/LN2410SBC
===================================================================
--- conf/LN2410SBC (revision 240480)
+++ conf/LN2410SBC (working copy)
@@ -40,7 +40,7 @@
#options UFS_DIRHASH #Improve performance on big directories
#options MD_ROOT #MD is a potential root device
#options MD_ROOT_SIZE=4096 # 4MB ram disk
-options ROOTDEVNAME=\"ufs:da0s1\"
+options ROOTDEVNAME=\"ufs:da0s1\"
#options BOOTP
#options BOOTP_NFSROOT # NFS mount root filesystem using BOOTP info
Index: conf/RPI-B
===================================================================
--- conf/RPI-B (revision 240480)
+++ conf/RPI-B (working copy)
@@ -24,12 +24,12 @@
files "../broadcom/bcm2835/files.bcm2835"
makeoptions MODULES_OVERRIDE=""
-options KERNVIRTADDR=0xc0100000
+options KERNVIRTADDR=0xc0100000
makeoptions KERNVIRTADDR=0xc0100000
-options KERNPHYSADDR=0x00100000
+options KERNPHYSADDR=0x00100000
makeoptions KERNPHYSADDR=0x00100000
-options PHYSADDR=0x00000000
-options STARTUP_PAGETABLE_ADDR=0x01000000
+options PHYSADDR=0x00000000
+options STARTUP_PAGETABLE_ADDR=0x01000000
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
options HZ=100
@@ -42,13 +42,13 @@
options UFS_DIRHASH #Improve performance on big directories
device snp
-# options NFSCL #Network Filesystem Client
-# options NFS_ROOT #NFS usable as /, requires NFSCLIENT
-# options BOOTP_NFSROOT
-# options BOOTP_COMPAT
-# options BOOTP
-# options BOOTP_NFSV3
-# options BOOTP_WIRED_TO=ue0
+#options NFSCL #Network Filesystem Client
+#options NFS_ROOT #NFS usable as /, requires NFSCLIENT
+#options BOOTP_NFSROOT
+#options BOOTP_COMPAT
+#options BOOTP
+#options BOOTP_NFSV3
+#options BOOTP_WIRED_TO=ue0
options PSEUDOFS #Pseudo-filesystem framework
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
Index: conf/DOCKSTAR
===================================================================
--- conf/DOCKSTAR (revision 240480)
+++ conf/DOCKSTAR (working copy)
@@ -56,8 +56,8 @@
device mge # Marvell Gigabit Ethernet controller
device mii
device bpf
-options HZ=1000
-options DEVICE_POLLING
+options HZ=1000
+options DEVICE_POLLING
device vlan
# USB
@@ -71,5 +71,5 @@
# Flattened Device Tree
options FDT
-options FDT_DTB_STATIC
+options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=dockstar.dts
--
John-Mark Gurney Voice: +1 415 225 5579
"All that I will do, has been done, All that I have, has not."
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120914180318.GX58312>