Module Name: src
Committed By: jakllsch
Date: Sun Mar 6 02:22:27 UTC 2011
Modified Files:
src/sys/arch/evbarm/conf: BEAGLEBOARD GEMINI GEMINI_MASTER GEMINI_SLAVE
IGEPV2 IQ31244 IXM1200 LUBBOCK Makefile.evbarm.inc NAPPI SHEEVAPLUG
TEAMASA_NPWR TISDP2420 TISDP2430 TOASTER TS7200_LCD TWINTAIL
files.overo ldscript.evbarm mk.beagle std.imx31
Log Message:
Remove trailing spaces.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/BEAGLEBOARD
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/GEMINI \
src/sys/arch/evbarm/conf/GEMINI_MASTER \
src/sys/arch/evbarm/conf/GEMINI_SLAVE src/sys/arch/evbarm/conf/TISDP2420
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/IGEPV2 \
src/sys/arch/evbarm/conf/TOASTER src/sys/arch/evbarm/conf/TS7200_LCD
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/evbarm/conf/IQ31244
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbarm/conf/IXM1200
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbarm/conf/LUBBOCK
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/conf/Makefile.evbarm.inc
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbarm/conf/NAPPI
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/SHEEVAPLUG \
src/sys/arch/evbarm/conf/files.overo src/sys/arch/evbarm/conf/std.imx31
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbarm/conf/TEAMASA_NPWR
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/TISDP2430
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/conf/TWINTAIL
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/ldscript.evbarm
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/mk.beagle
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/BEAGLEBOARD
diff -u src/sys/arch/evbarm/conf/BEAGLEBOARD:1.15 src/sys/arch/evbarm/conf/BEAGLEBOARD:1.16
--- src/sys/arch/evbarm/conf/BEAGLEBOARD:1.15 Sat Feb 26 18:07:18 2011
+++ src/sys/arch/evbarm/conf/BEAGLEBOARD Sun Mar 6 02:22:27 2011
@@ -1,5 +1,5 @@
#
-# $NetBSD: BEAGLEBOARD,v 1.15 2011/02/26 18:07:18 ahoka Exp $
+# $NetBSD: BEAGLEBOARD,v 1.16 2011/03/06 02:22:27 jakllsch Exp $
#
# BEAGLEBOARD -- TI OMAP 3530 Eval Board Kernel
#
@@ -146,8 +146,8 @@
## USB Debugging options
options USB_DEBUG
options EHCI_DEBUG
-options OHCI_DEBUG
-options UHUB_DEBUG
+options OHCI_DEBUG
+options UHUB_DEBUG
# Valid options for BOOT_ARGS:
@@ -175,10 +175,10 @@
L3i0 at mainbus?
# OBIO
-obio0 at mainbus? base 0x48000000 size 0x1000000 # L4 CORE
-obio1 at mainbus? base 0x48300000 size 0x0040000 # L4 WAKEUP
-obio2 at mainbus? base 0x49000000 size 0x0100000 # L4 PERIPHERAL
-#obio3 at mainbus? base 0x54000000 size 0x0800000 # L4 EMUL
+obio0 at mainbus? base 0x48000000 size 0x1000000 # L4 CORE
+obio1 at mainbus? base 0x48300000 size 0x0040000 # L4 WAKEUP
+obio2 at mainbus? base 0x49000000 size 0x0100000 # L4 PERIPHERAL
+#obio3 at mainbus? base 0x54000000 size 0x0800000 # L4 EMUL
# General Purpose Memory Controller
gpmc0 at mainbus? base 0x6e000000
Index: src/sys/arch/evbarm/conf/GEMINI
diff -u src/sys/arch/evbarm/conf/GEMINI:1.14 src/sys/arch/evbarm/conf/GEMINI:1.15
--- src/sys/arch/evbarm/conf/GEMINI:1.14 Fri Apr 16 13:48:30 2010
+++ src/sys/arch/evbarm/conf/GEMINI Sun Mar 6 02:22:27 2011
@@ -1,5 +1,5 @@
#
-# GEMINI --
+# GEMINI --
#
include "arch/evbarm/conf/std.gemini"
@@ -202,7 +202,7 @@
# USB
ehci0 at obio? addr 0x68000000 size 0x400 intr 10 # 30?
-ehci1 at obio? addr 0x69000000 size 0x400 intr 11 # 31?
+ehci1 at obio? addr 0x69000000 size 0x400 intr 11 # 31?
usb* at ehci?
uhub* at usb?
@@ -213,7 +213,7 @@
# PCI
pci0 at obio? bus ?
-options PCI_NETBSD_CONFIGURE # set up the PCI bus
+options PCI_NETBSD_CONFIGURE # set up the PCI bus
options PCIVERBOSE
options PCI_CONFIG_DUMP
Index: src/sys/arch/evbarm/conf/GEMINI_MASTER
diff -u src/sys/arch/evbarm/conf/GEMINI_MASTER:1.14 src/sys/arch/evbarm/conf/GEMINI_MASTER:1.15
--- src/sys/arch/evbarm/conf/GEMINI_MASTER:1.14 Tue Nov 23 11:13:56 2010
+++ src/sys/arch/evbarm/conf/GEMINI_MASTER Sun Mar 6 02:22:27 2011
@@ -1,5 +1,5 @@
#
-# GEMINI --
+# GEMINI --
#
include "arch/evbarm/conf/std.gemini"
@@ -220,7 +220,7 @@
# USB
##ehci0 at obio? addr 0x68000000 size 0x400 intr 10 # 30?
-##ehci1 at obio? addr 0x69000000 size 0x400 intr 11 # 31?
+##ehci1 at obio? addr 0x69000000 size 0x400 intr 11 # 31?
##usb* at ehci?
##uhub* at usb?
@@ -229,7 +229,7 @@
# PCI
##pci0 at obio? bus ?
-##options PCI_NETBSD_CONFIGURE # set up the PCI bus
+##options PCI_NETBSD_CONFIGURE # set up the PCI bus
##options PCIVERBOSE
##options PCI_CONFIG_DUMP
Index: src/sys/arch/evbarm/conf/GEMINI_SLAVE
diff -u src/sys/arch/evbarm/conf/GEMINI_SLAVE:1.14 src/sys/arch/evbarm/conf/GEMINI_SLAVE:1.15
--- src/sys/arch/evbarm/conf/GEMINI_SLAVE:1.14 Tue Nov 23 11:13:56 2010
+++ src/sys/arch/evbarm/conf/GEMINI_SLAVE Sun Mar 6 02:22:27 2011
@@ -1,5 +1,5 @@
#
-# GEMINI_SLAVE --
+# GEMINI_SLAVE --
#
include "arch/evbarm/conf/std.gemini"
@@ -218,7 +218,7 @@
# USB
##ehci0 at obio? addr 0x68000000 size 0x400 intr 10 # 30?
-##ehci1 at obio? addr 0x69000000 size 0x400 intr 11 # 31?
+##ehci1 at obio? addr 0x69000000 size 0x400 intr 11 # 31?
##usb* at ehci?
##uhub* at usb?
@@ -227,7 +227,7 @@
# PCI
pci0 at obio? bus ?
-options PCI_NETBSD_CONFIGURE # set up the PCI bus
+options PCI_NETBSD_CONFIGURE # set up the PCI bus
options PCIVERBOSE
options PCI_CONFIG_DUMP
Index: src/sys/arch/evbarm/conf/TISDP2420
diff -u src/sys/arch/evbarm/conf/TISDP2420:1.14 src/sys/arch/evbarm/conf/TISDP2420:1.15
--- src/sys/arch/evbarm/conf/TISDP2420:1.14 Sun Mar 6 02:18:36 2011
+++ src/sys/arch/evbarm/conf/TISDP2420 Sun Mar 6 02:22:27 2011
@@ -1,5 +1,5 @@
#
-# $NetBSD: TISDP2420,v 1.14 2011/03/06 02:18:36 jakllsch Exp $
+# $NetBSD: TISDP2420,v 1.15 2011/03/06 02:22:27 jakllsch Exp $
#
# TISDP2420 -- TI OMAP 2420 Eval Board Kernel
#
@@ -145,8 +145,8 @@
## USB Debugging options
options USB_DEBUG
-options OHCI_DEBUG
-options UHUB_DEBUG
+options OHCI_DEBUG
+options UHUB_DEBUG
# Valid options for BOOT_ARGS:
@@ -178,8 +178,8 @@
L3i0 at mainbus?
# OBIO
-obio0 at mainbus? base 0x48000000 size 0x1000000 # L4 CORE
-obio1 at mainbus? base 0x49000000 size 0x0800000 # L4 WAKEUP
+obio0 at mainbus? base 0x48000000 size 0x1000000 # L4 CORE
+obio1 at mainbus? base 0x49000000 size 0x0800000 # L4 WAKEUP
# General Purpose Memory Controller
gpmc0 at mainbus? base 0x6800a000
Index: src/sys/arch/evbarm/conf/IGEPV2
diff -u src/sys/arch/evbarm/conf/IGEPV2:1.2 src/sys/arch/evbarm/conf/IGEPV2:1.3
--- src/sys/arch/evbarm/conf/IGEPV2:1.2 Tue Nov 23 11:13:56 2010
+++ src/sys/arch/evbarm/conf/IGEPV2 Sun Mar 6 02:22:27 2011
@@ -1,5 +1,5 @@
#
-# $NetBSD: IGEPV2,v 1.2 2010/11/23 11:13:56 hannken Exp $
+# $NetBSD: IGEPV2,v 1.3 2011/03/06 02:22:27 jakllsch Exp $
#
# IGEPv2 -- TI OMAP 3530 Eval Board Kernel
#
@@ -148,8 +148,8 @@
## USB Debugging options
options USB_DEBUG
-options OHCI_DEBUG
-options UHUB_DEBUG
+options OHCI_DEBUG
+options UHUB_DEBUG
# Valid options for BOOT_ARGS:
@@ -177,10 +177,10 @@
L3i0 at mainbus?
# OBIO
-obio0 at mainbus? base 0x48000000 size 0x1000000 # L4 CORE
-obio1 at mainbus? base 0x48300000 size 0x0040000 # L4 WAKEUP
-obio2 at mainbus? base 0x49000000 size 0x0100000 # L4 PERIPHERAL
-#obio3 at mainbus? base 0x54000000 size 0x0800000 # L4 EMUL
+obio0 at mainbus? base 0x48000000 size 0x1000000 # L4 CORE
+obio1 at mainbus? base 0x48300000 size 0x0040000 # L4 WAKEUP
+obio2 at mainbus? base 0x49000000 size 0x0100000 # L4 PERIPHERAL
+#obio3 at mainbus? base 0x54000000 size 0x0800000 # L4 EMUL
# General Purpose Memory Controller
gpmc0 at mainbus? base 0x6e000000
Index: src/sys/arch/evbarm/conf/TOASTER
diff -u src/sys/arch/evbarm/conf/TOASTER:1.2 src/sys/arch/evbarm/conf/TOASTER:1.3
--- src/sys/arch/evbarm/conf/TOASTER:1.2 Sun Dec 11 12:17:06 2005
+++ src/sys/arch/evbarm/conf/TOASTER Sun Mar 6 02:22:27 2011
@@ -1,4 +1,4 @@
-# $NetBSD: TOASTER,v 1.2 2005/12/11 12:17:06 christos Exp $
+# $NetBSD: TOASTER,v 1.3 2011/03/06 02:22:27 jakllsch Exp $
#
# TOASTER - kernel for the NetBSD/toaster demo first unveiled during
# LinuxWorld Expo 2005
@@ -8,7 +8,7 @@
toastersensors* at tspld?
wskbd* at toastersensors? console ? mux 1
-
+
toasterlcd* at tsdio0
toaster* at tsdio0
wsdisplay* at toasterlcd? console ?
Index: src/sys/arch/evbarm/conf/TS7200_LCD
diff -u src/sys/arch/evbarm/conf/TS7200_LCD:1.2 src/sys/arch/evbarm/conf/TS7200_LCD:1.3
--- src/sys/arch/evbarm/conf/TS7200_LCD:1.2 Sun Dec 11 12:17:06 2005
+++ src/sys/arch/evbarm/conf/TS7200_LCD Sun Mar 6 02:22:27 2011
@@ -1,7 +1,7 @@
-# $NetBSD: TS7200_LCD,v 1.2 2005/12/11 12:17:06 christos Exp $
+# $NetBSD: TS7200_LCD,v 1.3 2011/03/06 02:22:27 jakllsch Exp $
#
# TS7200_LCD - standard TS7200, but with a 2x24 LCD attached
-# to the LCD header and a 4x4 matrix keypad attached to the DIO
+# to the LCD header and a 4x4 matrix keypad attached to the DIO
# header.
#
Index: src/sys/arch/evbarm/conf/IQ31244
diff -u src/sys/arch/evbarm/conf/IQ31244:1.49 src/sys/arch/evbarm/conf/IQ31244:1.50
--- src/sys/arch/evbarm/conf/IQ31244:1.49 Tue Nov 23 11:13:56 2010
+++ src/sys/arch/evbarm/conf/IQ31244 Sun Mar 6 02:22:27 2011
@@ -1,4 +1,4 @@
-# $NetBSD: IQ31244,v 1.49 2010/11/23 11:13:56 hannken Exp $
+# $NetBSD: IQ31244,v 1.50 2011/03/06 02:22:27 jakllsch Exp $
#
# IQ31244 -- Intel IQ31244 Evaluation Board Kernel
#
@@ -149,8 +149,8 @@
# On-board device support
obio* at mainbus?
-com0 at obio? addr 0xfe800000 xint 1 # on-board TI 165C50 UART
-# Default setting of J7 is open, which means that the interrupt is not
+com0 at obio? addr 0xfe800000 xint 1 # on-board TI 16C550 UART
+# Default setting of J7 is open, which means that the interrupt is not
# connected
wdc0 at obio? addr 0xfe8f0000 width 16 # on-board CF reader
#wdc0 at obio? addr 0xfe8f0000 width 16 xint 1 # on-board CF reader
Index: src/sys/arch/evbarm/conf/IXM1200
diff -u src/sys/arch/evbarm/conf/IXM1200:1.42 src/sys/arch/evbarm/conf/IXM1200:1.43
--- src/sys/arch/evbarm/conf/IXM1200:1.42 Sun Mar 6 02:18:36 2011
+++ src/sys/arch/evbarm/conf/IXM1200 Sun Mar 6 02:22:27 2011
@@ -1,4 +1,4 @@
-# $NetBSD: IXM1200,v 1.42 2011/03/06 02:18:36 jakllsch Exp $
+# $NetBSD: IXM1200,v 1.43 2011/03/06 02:22:27 jakllsch Exp $
#
# IXM1200 -- Intel IXM1200 Evaluation Board Kernel
#
@@ -162,7 +162,7 @@
#
# Networking devices
#
-fxp* at pci? dev ? function ? # Intel 82559ER Fast Ethernet LAN Controller
+fxp* at pci? dev ? function ? # Intel 82559ER Fast Ethernet LAN Controller
# MII/PHY support
inphy* at mii? phy ? # Intel 82555 PHYs
Index: src/sys/arch/evbarm/conf/LUBBOCK
diff -u src/sys/arch/evbarm/conf/LUBBOCK:1.35 src/sys/arch/evbarm/conf/LUBBOCK:1.36
--- src/sys/arch/evbarm/conf/LUBBOCK:1.35 Tue Nov 23 11:13:56 2010
+++ src/sys/arch/evbarm/conf/LUBBOCK Sun Mar 6 02:22:27 2011
@@ -185,7 +185,7 @@
sackbc1 at sacc0 addr 0x0c00 intr 18
# PS/2 controller of SA-1111 doesn't have "slot"; One device is attached
-# to one controller. However, pckbd driver requires "slot 0" and pms driver
+# to one controller. However, pckbd driver requires "slot 0" and pms driver
# requires "slot 1"
pckbd* at sackbc0 slot 0
wskbd* at pckbd? # console ?
Index: src/sys/arch/evbarm/conf/Makefile.evbarm.inc
diff -u src/sys/arch/evbarm/conf/Makefile.evbarm.inc:1.20 src/sys/arch/evbarm/conf/Makefile.evbarm.inc:1.21
--- src/sys/arch/evbarm/conf/Makefile.evbarm.inc:1.20 Mon Jan 31 06:09:32 2011
+++ src/sys/arch/evbarm/conf/Makefile.evbarm.inc Sun Mar 6 02:22:27 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.evbarm.inc,v 1.20 2011/01/31 06:09:32 matt Exp $
+# $NetBSD: Makefile.evbarm.inc,v 1.21 2011/03/06 02:22:27 jakllsch Exp $
.if defined(BOARDMKFRAG) # Must be a full pathname.
.include "${BOARDMKFRAG}"
@@ -12,7 +12,7 @@
netbsd: ldscript # XXX
-# generate ldscript from common template
+# generate ldscript from common template
ldscript: ${THISARM}/conf/ldscript.evbarm ${THISARM}/conf/Makefile.evbarm.inc Makefile ${BOARDMKFRAG}
echo ${KERNELS}
${TOOL_SED} -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
Index: src/sys/arch/evbarm/conf/NAPPI
diff -u src/sys/arch/evbarm/conf/NAPPI:1.37 src/sys/arch/evbarm/conf/NAPPI:1.38
--- src/sys/arch/evbarm/conf/NAPPI:1.37 Thu Dec 16 12:49:19 2010
+++ src/sys/arch/evbarm/conf/NAPPI Sun Mar 6 02:22:27 2011
@@ -1,4 +1,4 @@
-# $NetBSD: NAPPI,v 1.37 2010/12/16 12:49:19 uebayasi Exp $
+# $NetBSD: NAPPI,v 1.38 2011/03/06 02:22:27 jakllsch Exp $
#
# NAPPI -- Netwise APlication Platform Board Kernel
#
@@ -159,7 +159,7 @@
#
# Networking devices
#
-fxp* at pci? dev ? function ? # Intel 82559ER Fast Ethernet LAN Controller
+fxp* at pci? dev ? function ? # Intel 82559ER Fast Ethernet LAN Controller
# MII/PHY support
inphy* at mii? phy ? # Intel 82555 PHYs
Index: src/sys/arch/evbarm/conf/SHEEVAPLUG
diff -u src/sys/arch/evbarm/conf/SHEEVAPLUG:1.3 src/sys/arch/evbarm/conf/SHEEVAPLUG:1.4
--- src/sys/arch/evbarm/conf/SHEEVAPLUG:1.3 Sat Mar 5 14:50:56 2011
+++ src/sys/arch/evbarm/conf/SHEEVAPLUG Sun Mar 6 02:22:27 2011
@@ -1,4 +1,4 @@
-# $NetBSD: SHEEVAPLUG,v 1.3 2011/03/05 14:50:56 matt Exp $
+# $NetBSD: SHEEVAPLUG,v 1.4 2011/03/06 02:22:27 jakllsch Exp $
#
# This configuration supports for generically Marvell SheevaPlug
#
@@ -288,7 +288,7 @@
umass* at uhub? port ? configuration ? interface ?
wd* at umass?
scsibus* at scsi?
-sd* at scsibus? target ? lun ? # SCSI disk drives
+sd* at scsibus? target ? lun ? # SCSI disk drives
cd* at scsibus? target ? lun ? # SCSI CD-ROM drives
# USB audio
Index: src/sys/arch/evbarm/conf/files.overo
diff -u src/sys/arch/evbarm/conf/files.overo:1.3 src/sys/arch/evbarm/conf/files.overo:1.4
--- src/sys/arch/evbarm/conf/files.overo:1.3 Sat Aug 28 04:54:46 2010
+++ src/sys/arch/evbarm/conf/files.overo Sun Mar 6 02:22:27 2011
@@ -1,10 +1,10 @@
-# $NetBSD: files.overo,v 1.3 2010/08/28 04:54:46 kiyohara Exp $
+# $NetBSD: files.overo,v 1.4 2011/03/06 02:22:27 jakllsch Exp $
#
# Gumstix. Inc. Overo boards configuration info
#
file arch/evbarm/gumstix/gumstix_machdep.c
-defflag opt_gumstix.h OVERO
+defflag opt_gumstix.h OVERO
GUMSTIX_NETBSD_ARGS_EXPANSION
defparam opt_gxio.h GXIO_DEFAULT_EXPANSION
Index: src/sys/arch/evbarm/conf/std.imx31
diff -u src/sys/arch/evbarm/conf/std.imx31:1.3 src/sys/arch/evbarm/conf/std.imx31:1.4
--- src/sys/arch/evbarm/conf/std.imx31:1.3 Sun Dec 27 05:14:56 2009
+++ src/sys/arch/evbarm/conf/std.imx31 Sun Mar 6 02:22:27 2011
@@ -1,6 +1,6 @@
-# $NetBSD: std.imx31,v 1.3 2009/12/27 05:14:56 uebayasi Exp $
+# $NetBSD: std.imx31,v 1.4 2011/03/06 02:22:27 jakllsch Exp $
#
-# standard NetBSD/evbarm options for FreeScale I.MX31
+# standard NetBSD/evbarm options for FreeScale I.MX31
machine evbarm arm
include "conf/std" # MI standard options
Index: src/sys/arch/evbarm/conf/TEAMASA_NPWR
diff -u src/sys/arch/evbarm/conf/TEAMASA_NPWR:1.65 src/sys/arch/evbarm/conf/TEAMASA_NPWR:1.66
--- src/sys/arch/evbarm/conf/TEAMASA_NPWR:1.65 Tue Nov 23 11:13:57 2010
+++ src/sys/arch/evbarm/conf/TEAMASA_NPWR Sun Mar 6 02:22:27 2011
@@ -1,4 +1,4 @@
-# $NetBSD: TEAMASA_NPWR,v 1.65 2010/11/23 11:13:57 hannken Exp $
+# $NetBSD: TEAMASA_NPWR,v 1.66 2011/03/06 02:22:27 jakllsch Exp $
#
# TEAMASA_NPWR -- Team ASA, Inc. Npwr -- XScale/IOP310-based
# server appliance.
@@ -158,7 +158,7 @@
obio* at mainbus?
# On-board 16550 UART
-com0 at obio? addr 0xfe810000 xint3 3
+com0 at obio? addr 0xfe810000 xint3 3
# i80312 Companion I/O support
iopxs* at mainbus?
Index: src/sys/arch/evbarm/conf/TISDP2430
diff -u src/sys/arch/evbarm/conf/TISDP2430:1.13 src/sys/arch/evbarm/conf/TISDP2430:1.14
--- src/sys/arch/evbarm/conf/TISDP2430:1.13 Tue Nov 23 11:13:57 2010
+++ src/sys/arch/evbarm/conf/TISDP2430 Sun Mar 6 02:22:27 2011
@@ -1,5 +1,5 @@
#
-# $NetBSD: TISDP2430,v 1.13 2010/11/23 11:13:57 hannken Exp $
+# $NetBSD: TISDP2430,v 1.14 2011/03/06 02:22:27 jakllsch Exp $
#
# TISDP2430 -- TI OMAP 2430 Eval Board Kernel
#
@@ -144,8 +144,8 @@
## USB Debugging options
options USB_DEBUG
-options OHCI_DEBUG
-options UHUB_DEBUG
+options OHCI_DEBUG
+options UHUB_DEBUG
# Valid options for BOOT_ARGS:
@@ -177,13 +177,12 @@
L3i0 at mainbus?
# OBIO
-obio0 at mainbus? base 0x48000000 size 0x1000000 # L4 CORE
+obio0 at mainbus? base 0x48000000 size 0x1000000 # L4 CORE
obio1 at mainbus? base 0x49000000 size 0x0800000 # L4 WAKEUP
# General Purpose Memory Controller
gpmc0 at mainbus? base 0x6e000000
-
# Interrupt Controller
omapicu0 at obio0 addr 0x4900c000 size 0x1000 intrbase 0
omapgpio0 at obio0 addr 0x4900e000 size 0x0400 intrbase 96 intr 29
Index: src/sys/arch/evbarm/conf/TWINTAIL
diff -u src/sys/arch/evbarm/conf/TWINTAIL:1.38 src/sys/arch/evbarm/conf/TWINTAIL:1.39
--- src/sys/arch/evbarm/conf/TWINTAIL:1.38 Tue Nov 23 11:13:57 2010
+++ src/sys/arch/evbarm/conf/TWINTAIL Sun Mar 6 02:22:27 2011
@@ -1,4 +1,4 @@
-# $NetBSD: TWINTAIL,v 1.38 2010/11/23 11:13:57 hannken Exp $
+# $NetBSD: TWINTAIL,v 1.39 2011/03/06 02:22:27 jakllsch Exp $
#
# TWINTAIL -- Genetec corp. G4255EB-X002 Evaluation Board Kernel
#
@@ -194,7 +194,7 @@
kmkbd* at obio?
wskbd* at kmkbd? # console ?
-# GB-225 option board
+# GB-225 option board
opio0 at obio? intr 2
# USB host
Index: src/sys/arch/evbarm/conf/ldscript.evbarm
diff -u src/sys/arch/evbarm/conf/ldscript.evbarm:1.5 src/sys/arch/evbarm/conf/ldscript.evbarm:1.6
--- src/sys/arch/evbarm/conf/ldscript.evbarm:1.5 Fri Nov 7 16:23:58 2008
+++ src/sys/arch/evbarm/conf/ldscript.evbarm Sun Mar 6 02:22:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ldscript.evbarm,v 1.5 2008/11/07 16:23:58 rafal Exp $ */
+/* $NetBSD: ldscript.evbarm,v 1.6 2011/03/06 02:22:27 jakllsch Exp $ */
OUTPUT_ARCH(arm)
ENTRY(KERNEL_BASE_phys)
@@ -36,10 +36,10 @@
*(.data)
*(.data.*)
}
- .sdata :
+ .sdata :
AT (LOADADDR(.data) + (ADDR(.sdata) - ADDR(.data)))
{
- *(.sdata)
+ *(.sdata)
*(.sdata.*)
}
_edata = .;
Index: src/sys/arch/evbarm/conf/mk.beagle
diff -u src/sys/arch/evbarm/conf/mk.beagle:1.4 src/sys/arch/evbarm/conf/mk.beagle:1.5
--- src/sys/arch/evbarm/conf/mk.beagle:1.4 Mon Jan 31 06:09:32 2011
+++ src/sys/arch/evbarm/conf/mk.beagle Sun Mar 6 02:22:27 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mk.beagle,v 1.4 2011/01/31 06:09:32 matt Exp $
+# $NetBSD: mk.beagle,v 1.5 2011/03/06 02:22:27 jakllsch Exp $
# gcc doesn't know about cortex-a8
CPPFLAGS+= -mcpu=arm1136jf-s
@@ -19,7 +19,7 @@
${OBJCOPY} -S -O binary $@ [email protected]; \
echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} [email protected] [email protected]; \
${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} [email protected] [email protected]; \
- echo
+ echo
EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
