Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src modified NetWalker kernel config



details:   https://anonhg.NetBSD.org/src/rev/6579fc9748d6
branches:  trunk
changeset: 327440:6579fc9748d6
user:      hkenken <hkenken%NetBSD.org@localhost>
date:      Fri Mar 07 12:35:14 2014 +0000

description:
modified NetWalker kernel config
* add ARM_HAS_VBAR, FPU_VFP etc.

diffstat:

 etc/etc.evbarm/Makefile.inc        |   5 +-
 sys/arch/evbarm/conf/NETWALKER     |  68 ++++++-------------------------------
 sys/arch/evbarm/conf/mk.netwalker  |   4 +-
 sys/arch/evbarm/conf/std.netwalker |  16 +++++---
 4 files changed, 27 insertions(+), 66 deletions(-)

diffs (187 lines):

diff -r ff612a7ba419 -r 6579fc9748d6 etc/etc.evbarm/Makefile.inc
--- a/etc/etc.evbarm/Makefile.inc       Fri Mar 07 08:42:58 2014 +0000
+++ b/etc/etc.evbarm/Makefile.inc       Fri Mar 07 12:35:14 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.60 2014/03/01 01:51:01 matt Exp $
+#      $NetBSD: Makefile.inc,v 1.61 2014/03/07 12:35:14 hkenken Exp $
 #
 #      etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
 #
@@ -77,7 +77,8 @@
 EVBARM_BOARDS.armv7hf+=        CUBIEBOARD
 #EVBARM_BOARDS.armv7+=         IGEPV2
 #EVBARM_BOARDS.armv7+=         N900
-#EVBARM_BOARDS.armv7+=         NETWALKER
+EVBARM_BOARDS.armv7+=          NETWALKER
+EVBARM_BOARDS.armv7hf+=                NETWALKER
 #EVBARM_BOARDS.armv7+=         OVERO
 #EVBARM_BOARDS.armv7+=         PANDABOARD
 #EVBARM_BOARDS.armv7hf+=       PANDABOARD
diff -r ff612a7ba419 -r 6579fc9748d6 sys/arch/evbarm/conf/NETWALKER
--- a/sys/arch/evbarm/conf/NETWALKER    Fri Mar 07 08:42:58 2014 +0000
+++ b/sys/arch/evbarm/conf/NETWALKER    Fri Mar 07 12:35:14 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: NETWALKER,v 1.22 2014/01/23 12:23:20 hkenken Exp $
+#      $NetBSD: NETWALKER,v 1.23 2014/03/07 12:35:14 hkenken Exp $
 #
 #      NETWALKER -- http://www.sharp.co.jp/netwalker/
 #
@@ -23,8 +23,6 @@
 
 # Architecture options
 
-options        IMX51_IPGCLK_FREQ=50000000   # XXX This value is not correct.
-
 # File systems
 
 file-system    FFS             # UFS
@@ -77,8 +75,8 @@
 
 #options       COMPAT_43       # 4.3BSD compatibility.
 options        COMPAT_60       # NetBSD 6.0 compatibility.
-options        COMPAT_50       # NetBSD 5.0 compatibility.
-options        COMPAT_40       # NetBSD 4.0 compatibility.
+#options       COMPAT_50       # NetBSD 5.0 compatibility.
+#options       COMPAT_40       # NetBSD 4.0 compatibility.
 #options       COMPAT_30       # NetBSD 3.0 compatibility.
 #options       COMPAT_20       # NetBSD 2.0 compatibility.
 #options       COMPAT_16       # NetBSD 1.6 compatibility.
@@ -140,7 +138,7 @@
 #options       LOCKDEBUG
 #options       PMAP_DEBUG      # Enable pmap_debug_level code
 #options       IPKDB           # remote kernel debugging
-options        VERBOSE_INIT_ARM # verbose bootstraping messages
+#options       VERBOSE_INIT_ARM # verbose bootstraping messages
 makeoptions    DEBUG="-g"      # compile full symbol table
 #makeoptions   COPTS="-O2"
 #options       SYSCALL_STATS   # per syscall counts
@@ -207,50 +205,11 @@
 #ehci3   at imxusbc0   unit 3  irq 17 # Host3
 
 usb*           at ehci?
-uhub*          at usb?
-uhub*          at uhub? port ?
-ugen*          at uhub? port ?
-
-# USB HID device
-uhidev* at uhub? port ? configuration ? interface ?
-
-# USB Mice
-ums*   at uhidev? reportid ?
-wsmouse* at ums? mux 0
-
-# USB Keyboards
-ukbd*  at uhidev? reportid ?
-wskbd* at ukbd? console ? mux 1
-
-# USB Mass Storage
-umass* at uhub? port ? configuration ? interface ?
-wd*    at umass?
 
-# Serial adapters
-ubsa*  at uhub? port ?         # Belkin serial adapter
-ucom*  at ubsa? portno ?
-
-uchcom* at uhub? port ?        # WinChipHead CH341/CH340 serial adapter
-ucom*  at uchcom? portno ?
-
-uftdi* at uhub? port ?         # FTDI FT8U100AX serial adapter
-ucom*  at uftdi? portno ?
-
-umct*  at uhub? port ?         # MCT USB-RS232 serial adapter
-ucom*  at umct? portno ?
+# USB device drivers
+include "dev/usb/usbdevices.config"
 
-uplcom* at uhub? port ?        # I/O DATA USB-RSAQ2 serial adapter
-ucom*  at uplcom? portno ?
-
-uslsa* at uhub? port ?         # Silicon Labs USB-RS232 serial adapter
-ucom*  at uslsa? portno ?
-
-uvscom* at uhub? port ?        # SUNTAC Slipper U VS-10U serial adapter
-ucom*  at uvscom? portno ?
-
-# USB generic serial port (e.g., data over cellular)
-ugensa* at uhub? port ?
-ucom*  at ugensa?
+ukphy*         at mii? phy ?
 
 # IPUv3 LCD Controller
 ipu0           at axi?
@@ -272,12 +231,6 @@
 options        WSDISPLAY_COMPAT_RAWKBD         # can get raw scancodes
 options        WSDISPLAY_DEFAULTSCREENS=4
 
-# SCSI bus support
-scsibus* at scsi?
-
-# SCSI devices
-sd*    at scsibus? target ? lun ?      # SCSI disk drives
-
 # Pseudo-Devices
 
 pseudo-device  crypto                  # /dev/crypto device
@@ -290,10 +243,10 @@
 #pseudo-device putter                  # for puffs and pud
 
 # network pseudo-devices
-#pseudo-device bpfilter                # Berkeley packet filter
+pseudo-device  bpfilter                # Berkeley packet filter
 #pseudo-device ipfilter                # IP filter (firewall) and NAT
 pseudo-device  loop                    # network loopback
-pseudo-device  ppp                     # Point-to-Point Protocol
+#pseudo-device ppp                     # Point-to-Point Protocol
 
 # miscellaneous pseudo-devices
 pseudo-device  pty                     # pseudo-terminals
@@ -303,3 +256,6 @@
 # wscons pseudo-devices
 pseudo-device  wsmux                   # mouse & keyboard multiplexor
 pseudo-device  wsfont
+
+# local configuration
+cinclude "arch/evbarm/conf/NETWALKER.local"
diff -r ff612a7ba419 -r 6579fc9748d6 sys/arch/evbarm/conf/mk.netwalker
--- a/sys/arch/evbarm/conf/mk.netwalker Fri Mar 07 08:42:58 2014 +0000
+++ b/sys/arch/evbarm/conf/mk.netwalker Fri Mar 07 12:35:14 2014 +0000
@@ -1,4 +1,6 @@
-#      $NetBSD: mk.netwalker,v 1.2 2011/06/30 18:20:24 matt Exp $
+#      $NetBSD: mk.netwalker,v 1.3 2014/03/07 12:35:14 hkenken Exp $
+
+CPPFLAGS+= -mcpu=cortex-a8 -mfpu=neon
 
 SYSTEM_FIRST_OBJ=      netwalker_start.o
 SYSTEM_FIRST_SFILE=    ${THISARM}/netwalker/netwalker_start.S
diff -r ff612a7ba419 -r 6579fc9748d6 sys/arch/evbarm/conf/std.netwalker
--- a/sys/arch/evbarm/conf/std.netwalker        Fri Mar 07 08:42:58 2014 +0000
+++ b/sys/arch/evbarm/conf/std.netwalker        Fri Mar 07 12:35:14 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: std.netwalker,v 1.7 2013/11/01 18:41:06 skrll Exp $
+#      $NetBSD: std.netwalker,v 1.8 2014/03/07 12:35:14 hkenken Exp $
 #
 # standard NetBSD/evbarm options for Sharp NetWalker
 
@@ -8,14 +8,16 @@
 # Pull in i.mx51 config definitions.
 include                "arch/evbarm/conf/files.netwalker"
 
-options        NETWALKER
-
-options        KERNEL_BASE_EXT=0xc0000000
-makeoptions    CPUFLAGS="-mcpu=cortex-a8 -mfpu=neon"
-
-# To support easy transit to ../arch/arm/arm32
+options        MODULAR
+options        __HAVE_FAST_SOFTINTS            # should be in types.h
+options        __HAVE_CPU_COUNTER
+options        ARM_HAS_VBAR
+options        TPIDRPRW_IS_CURCPU
 options        CORTEX_PMC
 options        CORTEX_PMC_CCNT_HZ=800000000
+options        KERNEL_BASE_EXT=0xc0000000
+options        EVBARM_BOARDTYPE="netwalker"
+options        FPU_VFP
 
 makeoptions    LOADADDRESS="0x90100000"
 makeoptions    BOARDTYPE="netwalker"



Home | Main Index | Thread Index | Old Index