Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/evbarm Remove unexpected code duplications
details: https://anonhg.NetBSD.org/src/rev/97a6af6d7fa3
branches: trunk
changeset: 336082:97a6af6d7fa3
user: ozaki-r <ozaki-r%NetBSD.org@localhost>
date: Wed Feb 11 07:51:10 2015 +0000
description:
Remove unexpected code duplications
I don't know why this happened...
diffstat:
sys/arch/evbarm/conf/VEXPRESS_A15 | 219 +---------------------
sys/arch/evbarm/conf/files.vexpress | 36 +---
sys/arch/evbarm/conf/std.vexpress | 34 +---
sys/arch/evbarm/vexpress/if_smsh_axi.c | 121 +-----------
sys/arch/evbarm/vexpress/platform.h | 53 +-----
sys/arch/evbarm/vexpress/vexpress_axi.c | 160 +---------------
sys/arch/evbarm/vexpress/vexpress_intr.h | 56 +-----
sys/arch/evbarm/vexpress/vexpress_machdep.c | 288 +---------------------------
sys/arch/evbarm/vexpress/vexpress_plcom.c | 101 +---------
sys/arch/evbarm/vexpress/vexpress_plmmc.c | 95 +---------
sys/arch/evbarm/vexpress/vexpress_space.c | 255 +------------------------
sys/arch/evbarm/vexpress/vexpress_start.S | 141 +-------------
sys/arch/evbarm/vexpress/vexpress_var.h | 50 +----
13 files changed, 19 insertions(+), 1590 deletions(-)
diffs (truncated from 1795 to 300 lines):
diff -r 1d327267d47b -r 97a6af6d7fa3 sys/arch/evbarm/conf/VEXPRESS_A15
--- a/sys/arch/evbarm/conf/VEXPRESS_A15 Wed Feb 11 04:47:11 2015 +0000
+++ b/sys/arch/evbarm/conf/VEXPRESS_A15 Wed Feb 11 07:51:10 2015 +0000
@@ -1,5 +1,5 @@
#
-# $NetBSD: VEXPRESS_A15,v 1.1 2015/02/09 07:50:24 slp Exp $
+# $NetBSD: VEXPRESS_A15,v 1.2 2015/02/11 07:51:10 ozaki-r Exp $
#
# VEXPRESS_A15 -- Versatile Express A15 kernel
#
@@ -215,220 +215,3 @@
#pseudo-device clockctl # user control of clock subsystem
pseudo-device ksyms # /dev/ksyms
#pseudo-device lockstat # lock profiling
-#
-# $NetBSD: VEXPRESS_A15,v 1.1 2015/02/09 07:50:24 slp Exp $
-#
-# VEXPRESS_A15 -- Versatile Express A15 kernel
-#
-
-include "arch/evbarm/conf/std.vexpress"
-
-# 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
-options CPU_CORTEX
-options CPU_CORTEXA7
-options CPU_CORTEXA15
-#options MULTIPROCESSOR
-
-options PMAPCOUNTERS
-options BUSDMA_COUNTERS
-#options EXYNOS_CONSOLE_EARLY
-#options UVMHIST
-#options USBHIST
-#options USBHIST_SIZE=100000
-#options UVMHIST_PRINT,KERNHIST_DELAY=0
-options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
-options PMAP_NEED_ALLOC_POOLPAGE
-
-# Specify the memory size in megabytes (optional).
-#options MEMSIZE=512
-
-# 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)
-
-# Development and Debugging options
-
-#options PERFCTRS # performance counters
-options DIAGNOSTIC # internal consistency checks
-options DEBUG
-options LOCKDEBUG
-#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 PLCONSOLE
-
-# 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="\"\""
-options BOOT_ARGS="\"verbose\""
-
-config netbsd root on ? type ?
-
-# The main bus device
-mainbus0 at root
-
-# The boot cpu and secondary CPUs
-cpu0 at mainbus?
-#cpu? at mainbus? # Multiprocessor
-
-# A9 core devices
-armperiph0 at mainbus?
-armgic0 at armperiph? # Interrupt Controller
-armgtmr0 at armperiph? # Generic Timer
-
-# VEXPRESS AXI0
-axi0 at mainbus?
-
-# PL011 uart
-plcom0 at axi? addr 0x1c090000 irq 37
-
-# PL181 MMCI host controller
-plmmc0 at axi? addr 0x1c050000 irq 41
-sdmmc* at plmmc0
-ld* at sdmmc?
-#options SDMMC_DEBUG
-#options SDMMCCISDEBUG
-
-# LAN 9118
-smsh0 at axi? addr 0x1a000000 irq 47
-
-# MII/PHY support
-ukphy* at mii? phy ? # smsh(4) internal 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
diff -r 1d327267d47b -r 97a6af6d7fa3 sys/arch/evbarm/conf/files.vexpress
--- a/sys/arch/evbarm/conf/files.vexpress Wed Feb 11 04:47:11 2015 +0000
+++ b/sys/arch/evbarm/conf/files.vexpress Wed Feb 11 07:51:10 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.vexpress,v 1.1 2015/02/09 07:47:15 slp Exp $
+# $NetBSD: files.vexpress,v 1.2 2015/02/11 07:51:10 ozaki-r Exp $
#
# Versatile Express board configuration info
#
@@ -32,37 +32,3 @@
attach smsh at axi with smsh_axi
file arch/evbarm/vexpress/if_smsh_axi.c smsh_axi
-# $NetBSD: files.vexpress,v 1.1 2015/02/09 07:47:15 slp Exp $
-#
-# Versatile Express board configuration info
-#
-
-file arch/evbarm/vexpress/vexpress_machdep.c
-
-include "arch/arm/pic/files.pic"
-include "arch/arm/cortex/files.cortex"
-
-file arch/arm/arm32/arm32_boot.c
-file arch/arm/arm32/arm32_kvminit.c
-file arch/arm/arm32/arm32_reboot.c
-file arch/arm/arm32/irq_dispatch.S
-
-file arch/evbarm/vexpress/vexpress_space.c
-
-# VEXPRESS AXI/AHB bus interface and SoC domains
-device axi { [addr=-1], [size=0], [irq=-1], [irqbase=-1]} : bus_space_generic
-attach axi at mainbus
-file arch/evbarm/vexpress/vexpress_axi.c axi
-
-# UART Interface
-attach plcom at axi with vexpressplcom
-file arch/evbarm/vexpress/vexpress_plcom.c vexpressplcom
-
-# MMCI host controller
-attach plmmc at axi with vexpressplmmc
-file arch/evbarm/vexpress/vexpress_plmmc.c vexpressplmmc
-
-# SMSC LAN9118
-attach smsh at axi with smsh_axi
-file arch/evbarm/vexpress/if_smsh_axi.c smsh_axi
-
diff -r 1d327267d47b -r 97a6af6d7fa3 sys/arch/evbarm/conf/std.vexpress
--- a/sys/arch/evbarm/conf/std.vexpress Wed Feb 11 04:47:11 2015 +0000
+++ b/sys/arch/evbarm/conf/std.vexpress Wed Feb 11 07:51:10 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.vexpress,v 1.1 2015/02/09 07:47:15 slp Exp $
+# $NetBSD: std.vexpress,v 1.2 2015/02/11 07:51:10 ozaki-r Exp $
#
# standard NetBSD/evbarm for VEXPRESS options
@@ -30,35 +30,3 @@
options ARM_INTR_IMPL="<arch/evbarm/vexpress/vexpress_intr.h>"
options ARM_GENERIC_TODR
-# $NetBSD: std.vexpress,v 1.1 2015/02/09 07:47:15 slp Exp $
-#
-# standard NetBSD/evbarm for VEXPRESS options
-
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
-
-# Pull in VEXPRESS config definitions
-include "arch/evbarm/conf/files.vexpress"
Home |
Main Index |
Thread Index |
Old Index