Module Name: src
Committed By: skrll
Date: Sun Sep 7 06:26:08 UTC 2014
Modified Files:
src/sys/arch/evbarm/awin: awin_machdep.c
Added Files:
src/sys/arch/evbarm/conf: BPI
Log Message:
Add a Banana Pi kernel config and fixup mmc0detect assignment for BPI.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/awin/awin_machdep.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/BPI
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/awin/awin_machdep.c
diff -u src/sys/arch/evbarm/awin/awin_machdep.c:1.3 src/sys/arch/evbarm/awin/awin_machdep.c:1.4
--- src/sys/arch/evbarm/awin/awin_machdep.c:1.3 Sun Sep 7 06:14:13 2014
+++ src/sys/arch/evbarm/awin/awin_machdep.c Sun Sep 7 06:26:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_machdep.c,v 1.3 2014/09/07 06:14:13 skrll Exp $ */
+/* $NetBSD: awin_machdep.c,v 1.4 2014/09/07 06:26:08 skrll Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_machdep.c,v 1.3 2014/09/07 06:14:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_machdep.c,v 1.4 2014/09/07 06:26:08 skrll Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
@@ -619,7 +619,11 @@ awin_device_register(device_t self, void
prop_dictionary_set_cstring(dict, "hdd5ven", ">PH17");
prop_dictionary_set_cstring(dict, "emacpwren", ">PH19");
}
+#if AWIN_board == AWIN_cubieboard || AWIN_board == AWIN_cubietruck
prop_dictionary_set_cstring(dict, "mmc0detect", "<PH1");
+#elif AWIN_board == AWIN_bpi
+ prop_dictionary_set_cstring(dict, "mmc0detect", "<PH10");
+#endif
prop_dictionary_set_cstring(dict, "audiopactrl", ">PH15");
/*
Added files:
Index: src/sys/arch/evbarm/conf/BPI
diff -u /dev/null src/sys/arch/evbarm/conf/BPI:1.1
--- /dev/null Sun Sep 7 06:26:08 2014
+++ src/sys/arch/evbarm/conf/BPI Sun Sep 7 06:26:08 2014
@@ -0,0 +1,311 @@
+#
+# $NetBSD: BPI,v 1.1 2014/09/07 06:26:08 skrll Exp $
+#
+# BPI -- Banana Pi - an Allwinner A20 Eval Board Kernel
+#
+
+include "arch/evbarm/conf/std.awin"
+
+# estimated number of users
+
+maxusers 32
+
+# Standard system options
+
+options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
+#options NTP # NTP phase/frequency locked loop
+
+# CPU options
+
+no makeoptions BOARDTYPE
+makeoptions BOARDTYPE="bpi"
+#options UVMHIST,UVMHIST_PRINT
+options CPU_CORTEXA8
+options CPU_CORTEXA7
+options ALLWINNER_A10
+options ALLWINNER_A20
+options PMAPCOUNTERS
+options AWIN_CONSOLE_EARLY
+
+# Architecture options
+
+# File systems
+
+file-system FFS # UFS
+#file-system LFS # log-structured file system
+file-system MFS # memory file system
+file-system NFS # Network file system
+#file-system ADOSFS # AmigaDOS-compatible file system
+#file-system EXT2FS # second extended file system (linux)
+#file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+#file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+#file-system NULLFS # loopback file system
+file-system PROCFS # /proc
+#file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
+#file-system UMAPFS # NULLFS + uid and gid remapping
+#file-system UNION # union file system
+file-system TMPFS # memory file system
+file-system PTYFS # /dev/pts/N support
+
+# File system options
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
+#options FFS_EI # FFS Endian Independent support
+#options NFSSERVER
+options WAPBL # File system journaling support
+#options FFS_NO_SNAPSHOT # No FFS snapshot support
+
+# Networking options
+
+#options GATEWAY # packet forwarding
+options INET # IP + ICMP + TCP + UDP
+options INET6 # IPV6
+#options IPSEC # IP security
+#options IPSEC_DEBUG # debug for IP security
+#options MROUTING # IP multicast routing
+#options PIM # Protocol Independent Multicast
+#options NETATALK # AppleTalk networking
+#options PPP_BSDCOMP # BSD-Compress compression support for PPP
+#options PPP_DEFLATE # Deflate compression support for PPP
+#options PPP_FILTER # Active filter support for PPP (requires bpf)
+#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
+
+options NFS_BOOT_BOOTP
+options NFS_BOOT_DHCP
+#options NFS_BOOT_BOOTSTATIC
+#options NFS_BOOTSTATIC_MYIP="\"192.168.1.4\""
+#options NFS_BOOTSTATIC_GWIP="\"192.168.1.1\""
+#options NFS_BOOTSTATIC_MASK="\"255.255.255.0\""
+#options NFS_BOOTSTATIC_SERVADDR="\"192.168.1.1\""
+#options NFS_BOOTSTATIC_SERVER="\"192.168.1.1:/nfs/sdp2430\""
+
+options NFS_BOOT_RWSIZE=1024
+
+# Compatibility options
+
+options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
+#options COMPAT_43 # 4.3BSD compatibility.
+options COMPAT_70 # NetBSD 7.0 compatibility.
+options COMPAT_60 # NetBSD 6.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.
+#options COMPAT_15 # NetBSD 1.5 compatibility.
+#options COMPAT_14 # NetBSD 1.4 compatibility.
+#options COMPAT_13 # NetBSD 1.3 compatibility.
+#options COMPAT_12 # NetBSD 1.2 compatibility.
+#options COMPAT_11 # NetBSD 1.1 compatibility.
+#options COMPAT_10 # NetBSD 1.0 compatibility.
+#options COMPAT_09 # NetBSD 0.9 compatibility.
+#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
+#options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
+
+# Shared memory options
+
+options SYSVMSG # System V-like message queues
+options SYSVSEM # System V-like semaphores
+options SYSVSHM # System V-like memory sharing
+
+# Device options
+
+#options MEMORY_DISK_HOOKS # boottime setup of ramdisk
+#options MEMORY_DISK_ROOT_SIZE=8192 # Size in blocks
+#options MEMORY_DISK_DYNAMIC
+#options MINIROOTSIZE=1000 # Size in blocks
+#options MEMORY_DISK_IS_ROOT # use memory disk as root
+
+# Wedge support
+options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
+options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
+
+# Miscellaneous kernel options
+options KTRACE # system call tracing, a la ktrace(1)
+#options KMEMSTATS # kernel memory statistics
+#options SCSIVERBOSE # Verbose SCSI errors
+#options MIIVERBOSE # Verbose MII autoconfuration messages
+#options DDB_KEYCODE=0x40
+#options USERCONF # userconf(4) support
+#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+
+# Development and Debugging options
+
+#options PERFCTRS # performance counters
+options DIAGNOSTIC # internal consistency checks
+#options DEBUG
+#options PMAP_DEBUG # Enable pmap_debug_level code
+#options IPKDB # remote kernel debugging
+#options VERBOSE_INIT_ARM # verbose bootstraping messages
+options DDB # in-kernel debugger
+options DDB_ONPANIC=1
+options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
+#options KGDB
+makeoptions DEBUG="-g" # compile full symbol table
+makeoptions COPY_SYMTAB=1
+#options AWIN_MMC_DEBUG
+#options SDHC_DEBUG
+#options SDMMC_DEBUG
+
+## USB Debugging options
+options USB_DEBUG
+options EHCI_DEBUG
+options OHCI_DEBUG
+options UHUB_DEBUG
+
+
+# Valid options for BOOT_ARGS:
+# single Boot to single user only
+# kdb Give control to kernel debugger
+# ask Ask for file name to reboot from
+# memorydisk=<n> Set memorydisk size to <n> KB
+# quiet Show aprint_naive output
+# verbose Show aprint_normal and aprint_verbose output
+options BOOT_ARGS="\"\""
+
+config netbsd root on ? type ?
+
+# The main bus device
+mainbus0 at root
+
+# The boot cpu
+cpu* at mainbus?
+
+# Specify the memory size in megabytes (optional).
+#options MEMSIZE=256
+#options MEMSIZE=128
+
+# A7 core devices
+armperiph0 at mainbus?
+armgic0 at armperiph? # Interrupt Controller
+armgtmr0 at armperiph? # ARM Generic Timer
+
+# SoC I/O
+awinio0 at mainbus?
+
+# SD/MMC controllers
+awinmmc0 at awinio0 port 0
+sdmmc* at awinmmc?
+ld* at sdmmc?
+
+# NAND controller
+#awinnand0 at awinio0
+
+# NAND layer
+#nand0 at nandbus?
+
+# use the bad block table
+#options NAND_BBT
+
+# Define flash partitions for board
+#flash0 at nand0 offset 0x000000 size 0x080000 readonly 1 # X-Loader
+#flash1 at nand0 offset 0x080000 size 0x1e0000 readonly 1 # U-Boot
+#flash2 at nand0 offset 0x260000 size 0x020000 readonly 1 # UB Env
+#flash3 at nand0 offset 0x280000 size 0x400000 # kernel
+#flash4 at nand0 offset 0x680000 size 0 # filesystem
+
+# Interrupt Controller
+awinicu0 at awinio0
+
+# DMA Controller
+awindma0 at awinio0
+
+# GPIO Controller
+awingpio0 at awinio0
+
+gpio* at awingpio?
+
+# System Control Module
+#awinscm0 at awinio?
+
+# I2C Controller
+awiniic0 at awinio? port 0
+#awiniic* at awinio? port ?
+iic* at awiniic?
+
+# On-board 16550 UARTs
+com0 at awinio? port 0 # UART0 (console)
+options CONADDR=0x01c28000, CONSPEED=115200
+
+# Operating System Timer (A10)
+awintmr0 at awinio?
+
+# Watchdog timers
+awinwdt* at awinio?
+
+# onboard audio codec
+awinac0 at awinio0
+audio0 at awinac0
+
+# onboard video
+#awinfb* at obio0 addr 0x48050000 size 0x10000
+#wsdisplay* at wsemuldisplaydev? console ?
+
+# various options for wscons - we try to look as much like a standard
+# sun console as possible
+#options WSEMUL_VT100 # sun terminal emulation
+#options WS_DEFAULT_FG=WSCOL_BLACK
+#options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
+#options WS_KERNEL_FG=WSCOL_GREEN
+#options WS_KERNEL_BG=WSCOL_LIGHT_WHITE
+#options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
+#options WSDISPLAY_COMPAT_SYSCONS # emulate some more ioctls
+#options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
+#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
+#options WSDISPLAY_DEFAULTSCREENS=4
+#options FONT_QVSS8x15
+#options FONT_GALLANT12x22 # the console font
+
+#pseudo-device wsmux # mouse & keyboard multiplexor
+#pseudo-device wsfont
+
+# Power, Reset and Clock Management
+#prcm* at awinio?
+
+# On-board USB
+awinusb0 at awinio0 port 0
+awinusb1 at awinio0 port 1
+ohci* at awinusb?
+ehci* at awinusb?
+usb* at ohci?
+usb* at ehci?
+
+# SATA
+ahcisata* at awinio0
+atabus* at ata?
+wd* at atabus? drive ?
+
+# 10/100 Ethernet (A10/A20)
+awe0 at awinio0 port ?
+# 10/100/1000 Ethernet (A10/A20)
+awge0 at awinio0 port ?
+
+include "dev/usb/usbdevices.config"
+
+rlphy* at mii? phy ?
+ukphy* at mii? phy ?
+
+# Pseudo-Devices
+
+# disk/mass storage pseudo-devices
+#pseudo-device md # memory disk device (ramdisk)
+#pseudo-device vnd # disk-like interface to files
+#pseudo-device fss # file system snapshot device
+#pseudo-device putter # for puffs and pud
+pseudo-device drvctl # driver control
+
+# network pseudo-devices
+pseudo-device bpfilter # Berkeley packet filter
+pseudo-device loop # network loopback
+#pseudo-device kttcp # network loopback
+
+# miscellaneous pseudo-devices
+pseudo-device pty # pseudo-terminals
+#options RND_COM
+#pseudo-device clockctl # user control of clock subsystem
+pseudo-device ksyms # /dev/ksyms
+pseudo-device lockstat # lock profiling
+
+cinclude "arch/evbarm/conf/CUBIEBOARD.local"
