Source-Changes-HG archive

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

[src/netbsd-7]: src Pull up following revision(s) (requested by skrll in tick...



details:   https://anonhg.NetBSD.org/src/rev/29a5aeafbc2e
branches:  netbsd-7
changeset: 798569:29a5aeafbc2e
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Nov 14 10:04:40 2014 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #230):
        sys/dev/i2c/axp22x.c: revision 1.1
        etc/etc.evbarm/Makefile.inc: revisions 1.65-1.66
        sys/arch/evbarm/conf/HUMMINGBIRD_A31: revisions 1.1-1.15
        sys/arch/evbarm/conf/HUMMINGBIRD_A31_INSTALL: revisions 1.1-1.3
        sys/dev/i2c/axp22x.c: revision 1.1
        sys/dev/i2c/files.i2c: revision 1.57

Add Merrii Hummingbird A31 board kernels.
Add AXP22x Power Management Unit driver.

diffstat:

 etc/etc.evbarm/Makefile.inc                  |   10 +-
 sys/arch/evbarm/conf/HUMMINGBIRD_A31         |  281 +++++++++++++++++++++++++++
 sys/arch/evbarm/conf/HUMMINGBIRD_A31_INSTALL |   11 +
 sys/dev/i2c/axp22x.c                         |  132 ++++++++++++
 sys/dev/i2c/files.i2c                        |    7 +-
 5 files changed, 439 insertions(+), 2 deletions(-)

diffs (truncated from 485 to 300 lines):

diff -r 86cb716297bd -r 29a5aeafbc2e etc/etc.evbarm/Makefile.inc
--- a/etc/etc.evbarm/Makefile.inc       Fri Nov 14 08:17:38 2014 +0000
+++ b/etc/etc.evbarm/Makefile.inc       Fri Nov 14 10:04:40 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.63.2.1 2014/11/12 19:54:46 martin Exp $
+#      $NetBSD: Makefile.inc,v 1.63.2.2 2014/11/14 10:04:40 martin Exp $
 #
 #      etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
 #
@@ -25,6 +25,10 @@
 EVBARM_BOARDS.armv7hf+=                BPI
 EVBARM_BOARDS.armv7+=          CUBIEBOARD
 EVBARM_BOARDS.armv7hf+=                CUBIEBOARD
+EVBARM_BOARDS.armv7+=          CUBIETRUCK
+EVBARM_BOARDS.armv7hf+=                CUBIETRUCK
+EVBARM_BOARDS.armv7+=          HUMMINGBIRD_A31
+EVBARM_BOARDS.armv7hf+=                HUMMINGBIRD_A31
 .else
 # little endian boards
 #EVBARM_BOARDS.armv4+=         ARMADILLO210
@@ -84,6 +88,10 @@
 EVBARM_BOARDS.armv7hf+=        BPI
 EVBARM_BOARDS.armv7+=          CUBIEBOARD
 EVBARM_BOARDS.armv7hf+=        CUBIEBOARD
+EVBARM_BOARDS.armv7+=          CUBIETRUCK
+EVBARM_BOARDS.armv7hf+=        CUBIETRUCK
+EVBARM_BOARDS.armv7+=          HUMMINGBIRD_A31
+EVBARM_BOARDS.armv7hf+=                HUMMINGBIRD_A31
 #EVBARM_BOARDS.armv7+=         IGEPV2
 EVBARM_BOARDS.armv7+=          MIRABOX
 EVBARM_BOARDS.armv7hf+=                MIRABOX
diff -r 86cb716297bd -r 29a5aeafbc2e sys/arch/evbarm/conf/HUMMINGBIRD_A31
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbarm/conf/HUMMINGBIRD_A31      Fri Nov 14 10:04:40 2014 +0000
@@ -0,0 +1,281 @@
+#      $NetBSD: HUMMINGBIRD_A31,v 1.19.2.2 2014/11/14 10:04:40 martin Exp $
+#
+#      HUMMINGBIRD_A31 - Merrii Hummingbird A31
+#
+
+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 CPUFLAGS
+makeoptions    CPUFLAGS="-mcpu=cortex-a7 -mfpu=neon"
+no makeoptions BOARDTYPE
+makeoptions    BOARDTYPE="hummingbird_a31"
+#options       UVMHIST,UVMHIST_PRINT
+options        CPU_CORTEXA7
+options        ALLWINNER_A31
+options        PMAPCOUNTERS
+options        AWIN_CONSOLE_EARLY
+options        AWIN_GPIO_IGNORE_FW
+
+# 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_09       # NetBSD 0.9,
+#options       COMPAT_10       # NetBSD 1.0,
+#options       COMPAT_11       # NetBSD 1.1,
+#options       COMPAT_12       # NetBSD 1.2,
+#options       COMPAT_13       # NetBSD 1.3,
+#options       COMPAT_14       # NetBSD 1.4,
+#options       COMPAT_15       # NetBSD 1.5,
+#options       COMPAT_16       # NetBSD 1.6,
+#options       COMPAT_20       # NetBSD 2.0,
+options        COMPAT_30       # NetBSD 3.0,
+options        COMPAT_40       # NetBSD 4.0,
+options        COMPAT_50       # NetBSD 5.0,
+options        COMPAT_60       # NetBSD 6.0, and
+options        COMPAT_70       # NetBSD 7.0 binary 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)
+
+# Alternate buffer queue strategies for better responsiveness under high
+# disk I/O load.
+#options       BUFQ_READPRIO
+options        BUFQ_PRIOCSCAN
+
+# 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
+
+## 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
+
+# CPU
+options        MULTIPROCESSOR
+cpu*           at mainbus?
+
+# Specify the memory size in megabytes.
+options        MEMSIZE=1024
+
+# 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?
+
+# Interrupt Controller
+awinicu0       at awinio0 
+
+# DMA Controller
+awindma0       at awinio0
+
+# 64-bit counter
+awincnt0       at awinio0
+
+# GPIO Controller
+awingpio0      at awinio0
+
+gpio*          at awingpio?
+
+# I2C Controller
+awiniic0       at awinio? port 0
+#awiniic*      at awinio? port ?
+iic0           at awiniic0
+
+# P2WI
+awinp2wi0      at awinio0
+iic1           at awinp2wi0
+axp22x0                at iic1 addr 0x34       # AXP221 Power Management Unit  
+
+# On-board 16550 UARTs
+com0           at awinio? port 0                       # UART0 (console)
+options        CONADDR=0x01c28000, CONSPEED=115200
+
+# Consumer IR
+awinir0                at awinio?
+cir0           at awinir0
+
+# Watchdog timers
+awinwdt*       at awinio?
+
+# RTC
+awinrtc*       at awinio?
+
+# onboard audio codec
+awinac0                at awinio0
+audio0         at awinac0
+
+# GMAC Ethernet
+awge0          at awinio0 port ?
+
+# 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?
+
+# USB OTG
+#motg0         at awinio0
+#usb*          at motg?
+
+include "dev/usb/usbdevices.config"
+
+midi*          at midibus?
+
+rlphy*         at mii? phy ?
+rgephy*        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



Home | Main Index | Thread Index | Old Index