Module Name: src
Committed By: kiyohara
Date: Wed May 1 13:12:00 UTC 2013
Modified Files:
src: build.sh
src/etc: MAKEDEV.tmpl
src/sys/arch/epoc32/include: vmparam.h
src/tools: headerlist
Added Files:
src/distrib/sets/lists/comp: md.epoc32
src/etc/etc.epoc32: MAKEDEV.conf Makefile.inc ttys
src/sys/arch/epoc32: Makefile
src/sys/arch/epoc32/include: Makefile float.h ieee.h ieeefp.h math.h
profile.h setjmp.h
Log Message:
Support to build for epoc32 userland.
To generate a diff of this commit:
cvs rdiff -u -r1.266 -r1.267 src/build.sh
cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/comp/md.epoc32
cvs rdiff -u -r1.167 -r1.168 src/etc/MAKEDEV.tmpl
cvs rdiff -u -r0 -r1.1 src/etc/etc.epoc32/MAKEDEV.conf \
src/etc/etc.epoc32/Makefile.inc src/etc/etc.epoc32/ttys
cvs rdiff -u -r0 -r1.1 src/sys/arch/epoc32/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/epoc32/include/Makefile \
src/sys/arch/epoc32/include/float.h src/sys/arch/epoc32/include/ieee.h \
src/sys/arch/epoc32/include/ieeefp.h src/sys/arch/epoc32/include/math.h \
src/sys/arch/epoc32/include/profile.h \
src/sys/arch/epoc32/include/setjmp.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/epoc32/include/vmparam.h
cvs rdiff -u -r1.6 -r1.7 src/tools/headerlist
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/build.sh
diff -u src/build.sh:1.266 src/build.sh:1.267
--- src/build.sh:1.266 Sun Apr 28 12:54:39 2013
+++ src/build.sh Wed May 1 13:12:00 2013
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.266 2013/04/28 12:54:39 pooka Exp $
+# $NetBSD: build.sh,v 1.267 2013/05/01 13:12:00 kiyohara Exp $
#
# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -586,6 +586,7 @@ MACHINE=cobalt MACHINE_ARCH=mips64el AL
MACHINE=cobalt MACHINE_ARCH=mipsel DEFAULT
MACHINE=dreamcast MACHINE_ARCH=sh3el
MACHINE=emips MACHINE_ARCH=mipseb
+MACHINE=epoc32 MACHINE_ARCH=arm
MACHINE=evbarm MACHINE_ARCH=arm ALIAS=evbarm-el DEFAULT
MACHINE=evbarm MACHINE_ARCH=armeb ALIAS=evbarm-eb
MACHINE=evbarm MACHINE_ARCH=earm ALIAS=evbearm-el
@@ -1730,7 +1731,7 @@ createmakewrapper()
eval cat <<EOF ${makewrapout}
#! ${HOST_SH}
# Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from: \$NetBSD: build.sh,v 1.266 2013/04/28 12:54:39 pooka Exp $
+# Generated from: \$NetBSD: build.sh,v 1.267 2013/05/01 13:12:00 kiyohara Exp $
# with these arguments: ${_args}
#
Index: src/etc/MAKEDEV.tmpl
diff -u src/etc/MAKEDEV.tmpl:1.167 src/etc/MAKEDEV.tmpl:1.168
--- src/etc/MAKEDEV.tmpl:1.167 Sat Apr 20 11:41:51 2013
+++ src/etc/MAKEDEV.tmpl Wed May 1 13:12:00 2013
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: MAKEDEV.tmpl,v 1.167 2013/04/20 11:41:51 rkujawa Exp $
+# $NetBSD: MAKEDEV.tmpl,v 1.168 2013/05/01 13:12:00 kiyohara Exp $
#
# Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -124,6 +124,7 @@
# ixpcom IXP12x0 COM ports
# epcom EP93xx COM ports
# plcom ARM PL01[01] serial ports
+# wmcom EPOC Windermere COM ports
# ttyM? HP200/300 4 port serial mux interface (hp300)
# ttya "ttya" system console (luna68k)
# ttyb second system serial port (luna68k)
@@ -1914,6 +1915,11 @@ plcom[0-9]*)
mkdev plcom$unit c %plcom_chr% $unit "" "" $u_uucp
;;
+wmcom[0-9]*)
+ unit=${i#wmcom}
+ mkdev wmcom$unit c %wmcom_chr% $unit "" "" $u_uucp
+ ;;
+
ucbsnd)
mkdev ucbsnd c %ucbsnd_chr% 0 666
;;
Index: src/sys/arch/epoc32/include/vmparam.h
diff -u src/sys/arch/epoc32/include/vmparam.h:1.1 src/sys/arch/epoc32/include/vmparam.h:1.2
--- src/sys/arch/epoc32/include/vmparam.h:1.1 Sun Apr 28 12:11:26 2013
+++ src/sys/arch/epoc32/include/vmparam.h Wed May 1 13:12:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.1 2013/04/28 12:11:26 kiyohara Exp $ */
+/* $NetBSD: vmparam.h,v 1.2 2013/05/01 13:12:00 kiyohara Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -32,7 +32,7 @@
#ifndef _EPOC32_VMPARAM_H_
#define _EPOC32_VMPARAM_H_
-#ifdef _KERNEL
+#if defined(_KERNEL) || defined(_KMEMUSER)
#include <arm/arm32/vmparam.h>
@@ -84,6 +84,6 @@
#define VM_NFREELIST 1
#define VM_FREELIST_DEFAULT 0
-#endif /* _KERNEL */
+#endif /* _KERNEL || _KMEMUSER */
#endif /* _EPOC32_VMPARAM_H_ */
Index: src/tools/headerlist
diff -u src/tools/headerlist:1.6 src/tools/headerlist:1.7
--- src/tools/headerlist:1.6 Wed Jan 26 01:18:55 2011
+++ src/tools/headerlist Wed May 1 13:12:00 2013
@@ -1,4 +1,4 @@
-# $NetBSD: headerlist,v 1.6 2011/01/26 01:18:55 pooka Exp $
+# $NetBSD: headerlist,v 1.7 2013/05/01 13:12:00 kiyohara Exp $
#
# do not edit; this file was automatically generated by:
# NetBSD: mkheaderlist.sh,v 1.1 2007/08/07 12:38:23 yamt Exp
@@ -36,6 +36,8 @@
./emips/include/elf_machdep.h
./dreamcast/include/disklabel.h
./dreamcast/include/elf_machdep.h
+./epoc32/include/disklabel.h
+./epoc32/include/elf_machdep.h
./evbarm/include/disklabel.h
./evbarm/include/elf_machdep.h
./evbmips/include/disklabel.h
Added files:
Index: src/distrib/sets/lists/comp/md.epoc32
diff -u /dev/null src/distrib/sets/lists/comp/md.epoc32:1.1
--- /dev/null Wed May 1 13:12:01 2013
+++ src/distrib/sets/lists/comp/md.epoc32 Wed May 1 13:11:59 2013
@@ -0,0 +1,43 @@
+# $NetBSD: md.epoc32,v 1.1 2013/05/01 13:11:59 kiyohara Exp $
+./usr/include/epoc32 comp-c-include
+./usr/include/epoc32/ansi.h comp-c-include
+./usr/include/epoc32/aout_machdep.h comp-c-include
+./usr/include/epoc32/asm.h comp-c-include
+./usr/include/epoc32/bswap.h comp-c-include
+./usr/include/epoc32/cdefs.h comp-c-include
+./usr/include/epoc32/cpu.h comp-c-include
+./usr/include/epoc32/disklabel.h comp-c-include
+./usr/include/epoc32/elf_machdep.h comp-c-include
+./usr/include/epoc32/endian.h comp-c-include
+./usr/include/epoc32/endian_machdep.h comp-c-include
+./usr/include/epoc32/float.h comp-c-include
+./usr/include/epoc32/frame.h comp-c-include
+./usr/include/epoc32/ieee.h comp-c-include
+./usr/include/epoc32/ieeefp.h comp-c-include
+./usr/include/epoc32/int_const.h comp-c-include
+./usr/include/epoc32/int_fmtio.h comp-c-include
+./usr/include/epoc32/int_limits.h comp-c-include
+./usr/include/epoc32/int_mwgwtypes.h comp-c-include
+./usr/include/epoc32/int_types.h comp-c-include
+./usr/include/epoc32/intr.h comp-c-include
+./usr/include/epoc32/limits.h comp-c-include
+./usr/include/epoc32/lock.h comp-c-include
+./usr/include/epoc32/math.h comp-c-include
+./usr/include/epoc32/mcontext.h comp-c-include
+./usr/include/epoc32/mutex.h comp-c-include
+./usr/include/epoc32/param.h comp-c-include
+./usr/include/epoc32/pcb.h comp-c-include
+./usr/include/epoc32/pmap.h comp-c-include
+./usr/include/epoc32/pmc.h comp-c-include
+./usr/include/epoc32/proc.h comp-c-include
+./usr/include/epoc32/profile.h comp-c-include
+./usr/include/epoc32/ptrace.h comp-c-include
+./usr/include/epoc32/reg.h comp-c-include
+./usr/include/epoc32/rwlock.h comp-c-include
+./usr/include/epoc32/setjmp.h comp-c-include
+./usr/include/epoc32/signal.h comp-c-include
+./usr/include/epoc32/sysarch.h comp-c-include
+./usr/include/epoc32/trap.h comp-c-include
+./usr/include/epoc32/types.h comp-c-include
+./usr/include/epoc32/vmparam.h comp-c-include
+./usr/include/epoc32/wchar_limits.h comp-c-include
Index: src/etc/etc.epoc32/MAKEDEV.conf
diff -u /dev/null src/etc/etc.epoc32/MAKEDEV.conf:1.1
--- /dev/null Wed May 1 13:12:01 2013
+++ src/etc/etc.epoc32/MAKEDEV.conf Wed May 1 13:12:00 2013
@@ -0,0 +1,23 @@
+# $NetBSD: MAKEDEV.conf,v 1.1 2013/05/01 13:12:00 kiyohara Exp $
+
+all_md)
+ makedev wscons wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3
+ makedev tty0 tty1 st0 st1 ch0 cd0 cd1
+ makedev uk0 uk1 ss0
+ makedev usbs isdns
+ makedev music rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
+ makedev scsibus0
+ makedev ses0 ses1 ses2 ses3
+ makedev sysmon
+ makedev kttcp
+ makedev audio
+ makedev apm
+ makedev cfs
+ ;;
+
+ramdisk)
+ makedev std bpf wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3
+ makedev tty0 tty1 opty
+ makedev st0 st1 cd0 cd1
+ makedev wscons
+ ;;
Index: src/etc/etc.epoc32/Makefile.inc
diff -u /dev/null src/etc/etc.epoc32/Makefile.inc:1.1
--- /dev/null Wed May 1 13:12:01 2013
+++ src/etc/etc.epoc32/Makefile.inc Wed May 1 13:12:00 2013
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile.inc,v 1.1 2013/05/01 13:12:00 kiyohara Exp $
+#
+# etc.epoc32/Makefile.inc -- epoc32-specific etc Makefile targets
+#
+
+KERNEL_SETS= GENERIC
Index: src/etc/etc.epoc32/ttys
diff -u /dev/null src/etc/etc.epoc32/ttys:1.1
--- /dev/null Wed May 1 13:12:01 2013
+++ src/etc/etc.epoc32/ttys Wed May 1 13:12:00 2013
@@ -0,0 +1,20 @@
+# $NetBSD: ttys,v 1.1 2013/05/01 13:12:00 kiyohara Exp $
+#
+# from: @(#)ttys 5.1 (Berkeley) 4/17/89
+#
+# name getty type status comments
+#
+console "/usr/libexec/getty default" vt100 on secure
+constty "/usr/libexec/getty default" vt100 off secure
+ttyE0 "/usr/libexec/getty Pc" wsvt25 off secure
+ttyE1 "/usr/libexec/getty Pc" wsvt25 off secure
+ttyE2 "/usr/libexec/getty Pc" wsvt25 off secure
+ttyE3 "/usr/libexec/getty Pc" wsvt25 off secure
+tty00 "/usr/libexec/getty default" unknown off secure
+tty01 "/usr/libexec/getty default" unknown off secure
+tty02 "/usr/libexec/getty default" unknown off secure
+tty03 "/usr/libexec/getty default" unknown off secure
+tty04 "/usr/libexec/getty default" unknown off secure
+tty05 "/usr/libexec/getty default" unknown off secure
+tty06 "/usr/libexec/getty default" unknown off secure
+tty07 "/usr/libexec/getty default" unknown off secure
Index: src/sys/arch/epoc32/Makefile
diff -u /dev/null src/sys/arch/epoc32/Makefile:1.1
--- /dev/null Wed May 1 13:12:01 2013
+++ src/sys/arch/epoc32/Makefile Wed May 1 13:11:59 2013
@@ -0,0 +1,29 @@
+# $NetBSD: Makefile,v 1.1 2013/05/01 13:11:59 kiyohara Exp $
+
+# Makefile for epoc32 tags file and boot blocks
+
+TEPOC32= ../epoc32/tags
+SEPOC32= ../epoc32/epoc32/*.[ch] ../epoc32/include/*.h \
+ ../epoc32/dev/*.[ch]
+AEPOC32= ../epoc32/epoc32/*.S
+
+# Directories in which to place tags links
+DEPOC32= include
+
+.include "../../kern/Make.tags.inc"
+
+tags:
+ -ctags -wdtf ${TEPOC32} ${SEPOC32} ${COMM}
+ egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AEPOC32} | \
+ ${TOOL_SED} -e \
+ "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
+ >> ${TEPOC32}
+ sort -o ${TEPOC32} ${TEPOC32}
+
+links:
+ -for i in ${DEPOC32}; do \
+ cd $$i && rm -f tags; ln -s ../tags tags; done
+
+SUBDIR= compile include stand
+
+.include <bsd.subdir.mk>
Index: src/sys/arch/epoc32/include/Makefile
diff -u /dev/null src/sys/arch/epoc32/include/Makefile:1.1
--- /dev/null Wed May 1 13:12:01 2013
+++ src/sys/arch/epoc32/include/Makefile Wed May 1 13:11:59 2013
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile,v 1.1 2013/05/01 13:11:59 kiyohara Exp $
+
+INCSDIR= /usr/include/epoc32
+
+INCS= ansi.h aout_machdep.h asm.h \
+ bswap.h \
+ cdefs.h cpu.h \
+ disklabel.h \
+ elf_machdep.h endian.h endian_machdep.h \
+ float.h frame.h \
+ ieee.h ieeefp.h \
+ int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
+ intr.h \
+ limits.h lock.h \
+ math.h mcontext.h mutex.h \
+ param.h pcb.h pmap.h pmc.h proc.h profile.h ptrace.h \
+ reg.h rwlock.h \
+ setjmp.h signal.h sysarch.h \
+ trap.h types.h \
+ vmparam.h \
+ wchar_limits.h
+
+.include <bsd.kinc.mk>
Index: src/sys/arch/epoc32/include/float.h
diff -u /dev/null src/sys/arch/epoc32/include/float.h:1.1
--- /dev/null Wed May 1 13:12:01 2013
+++ src/sys/arch/epoc32/include/float.h Wed May 1 13:11:59 2013
@@ -0,0 +1,3 @@
+/* $NetBSD: float.h,v 1.1 2013/05/01 13:11:59 kiyohara Exp $ */
+
+#include <arm/float.h>
Index: src/sys/arch/epoc32/include/ieee.h
diff -u /dev/null src/sys/arch/epoc32/include/ieee.h:1.1
--- /dev/null Wed May 1 13:12:01 2013
+++ src/sys/arch/epoc32/include/ieee.h Wed May 1 13:11:59 2013
@@ -0,0 +1,3 @@
+/* $NetBSD: ieee.h,v 1.1 2013/05/01 13:11:59 kiyohara Exp $ */
+
+#include <arm/ieee.h>
Index: src/sys/arch/epoc32/include/ieeefp.h
diff -u /dev/null src/sys/arch/epoc32/include/ieeefp.h:1.1
--- /dev/null Wed May 1 13:12:01 2013
+++ src/sys/arch/epoc32/include/ieeefp.h Wed May 1 13:11:59 2013
@@ -0,0 +1,3 @@
+/* $NetBSD: ieeefp.h,v 1.1 2013/05/01 13:11:59 kiyohara Exp $ */
+
+#include <arm/ieeefp.h>
Index: src/sys/arch/epoc32/include/math.h
diff -u /dev/null src/sys/arch/epoc32/include/math.h:1.1
--- /dev/null Wed May 1 13:12:01 2013
+++ src/sys/arch/epoc32/include/math.h Wed May 1 13:12:00 2013
@@ -0,0 +1,3 @@
+/* $NetBSD: math.h,v 1.1 2013/05/01 13:12:00 kiyohara Exp $ */
+
+#include <arm/math.h>
Index: src/sys/arch/epoc32/include/profile.h
diff -u /dev/null src/sys/arch/epoc32/include/profile.h:1.1
--- /dev/null Wed May 1 13:12:01 2013
+++ src/sys/arch/epoc32/include/profile.h Wed May 1 13:12:00 2013
@@ -0,0 +1,3 @@
+/* $NetBSD: profile.h,v 1.1 2013/05/01 13:12:00 kiyohara Exp $ */
+
+#include <arm/profile.h>
Index: src/sys/arch/epoc32/include/setjmp.h
diff -u /dev/null src/sys/arch/epoc32/include/setjmp.h:1.1
--- /dev/null Wed May 1 13:12:01 2013
+++ src/sys/arch/epoc32/include/setjmp.h Wed May 1 13:12:00 2013
@@ -0,0 +1,3 @@
+/* $NetBSD: setjmp.h,v 1.1 2013/05/01 13:12:00 kiyohara Exp $ */
+
+#include <arm/setjmp.h>
