CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: mrg Date: Tue Oct 18 06:40:06 UTC 2016 Modified Files: src/distrib/sets/lists/comp: ad.mips Log Message: libc_fp is arch64 only. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/distrib/sets/lists/comp/ad.mips Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/ad.mips diff -u src/distrib/sets/lists/comp/ad.mips:1.62 src/distrib/sets/lists/comp/ad.mips:1.63 --- src/distrib/sets/lists/comp/ad.mips:1.62 Tue Oct 11 17:02:28 2016 +++ src/distrib/sets/lists/comp/ad.mips Tue Oct 18 06:40:06 2016 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips,v 1.62 2016/10/11 17:02:28 macallan Exp $ +# $NetBSD: ad.mips,v 1.63 2016/10/18 06:40:06 mrg Exp $ ./usr/bin/elf2aoutcomp-obsolete obsolete ./usr/bin/elf2ecoffcomp-sysutil-bin ./usr/include/g++/bits/mips32 comp-c-include arch64 @@ -78,9 +78,9 @@ -./usr/lib/64/libgomp.so.1.1 -./usr/lib/64/libgomp_p.a -./usr/lib/64/libgomp_pic.a -./usr/lib/libc_fp.acomp-c-lib softfloat -./usr/lib/libc_fp_p.acomp-c-lib profile,softfloat -./usr/lib/libc_fp_pic.acomp-c-piclib softfloat,picinstall +./usr/lib/libc_fp.acomp-c-lib softfloat,arch64 +./usr/lib/libc_fp_p.acomp-c-lib profile,softfloat,arch64 +./usr/lib/libc_fp_pic.acomp-c-piclib softfloat,picinstall,arch64 ./usr/lib/64/libc_fp.acomp-c-lib softfloat,arch64 ./usr/lib/64/libc_fp_p.a comp-c-lib profile,softfloat,arch64 ./usr/lib/64/libc_fp_pic.a comp-c-piclib picinstall,compat,arch64
CVS commit: src/tests/net
Module Name:src Committed By: ozaki-r Date: Tue Oct 18 04:10:24 UTC 2016 Modified Files: src/tests/net/if_gif: t_gif.sh src/tests/net/if_pppoe: t_pppoe.sh Log Message: Make test names self-descriptive To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/net/if_gif/t_gif.sh cvs rdiff -u -r1.4 -r1.5 src/tests/net/if_pppoe/t_pppoe.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/net/if_gif/t_gif.sh diff -u src/tests/net/if_gif/t_gif.sh:1.5 src/tests/net/if_gif/t_gif.sh:1.6 --- src/tests/net/if_gif/t_gif.sh:1.5 Wed Aug 10 08:29:20 2016 +++ src/tests/net/if_gif/t_gif.sh Tue Oct 18 04:10:24 2016 @@ -1,4 +1,4 @@ -# $NetBSD: t_gif.sh,v 1.5 2016/08/10 08:29:20 ozaki-r Exp $ +# $NetBSD: t_gif.sh,v 1.6 2016/10/18 04:10:24 ozaki-r Exp $ # # Copyright (c) 2015 Internet Initiative Japan Inc. # All rights reserved. @@ -739,7 +739,7 @@ add_test() inner=$3 outer=$4 - name="${category}${inner}over${outer}" + name="gif_${category}_${inner}over${outer}" fulldesc="Does ${inner} over ${outer} if_gif ${desc}" atf_test_case ${name} cleanup Index: src/tests/net/if_pppoe/t_pppoe.sh diff -u src/tests/net/if_pppoe/t_pppoe.sh:1.4 src/tests/net/if_pppoe/t_pppoe.sh:1.5 --- src/tests/net/if_pppoe/t_pppoe.sh:1.4 Wed Sep 14 01:48:08 2016 +++ src/tests/net/if_pppoe/t_pppoe.sh Tue Oct 18 04:10:24 2016 @@ -1,4 +1,4 @@ -# $NetBSD: t_pppoe.sh,v 1.4 2016/09/14 01:48:08 knakahara Exp $ +# $NetBSD: t_pppoe.sh,v 1.5 2016/10/18 04:10:24 ozaki-r Exp $ # # Copyright (c) 2016 Internet Initiative Japan Inc. # All rights reserved. @@ -186,42 +186,42 @@ run_test() atf_test_case pap cleanup -pap_head() +pppoe_pap_head() { atf_set "descr" "Does simple pap tests" atf_set "require.progs" "rump_server pppoectl" } -pap_body() +pppoe_pap_body() { run_test pap } -pap_cleanup() +pppoe_pap_cleanup() { cleanup } atf_test_case chap cleanup -chap_head() +pppoe_chap_head() { atf_set "descr" "Does simple chap tests" atf_set "require.progs" "rump_server pppoectl" } -chap_body() +pppoe_chap_body() { run_test chap } -chap_cleanup() +pppoe_chap_cleanup() { cleanup } atf_init_test_cases() { - atf_add_test_case pap - atf_add_test_case chap + atf_add_test_case pppoe_pap + atf_add_test_case pppoe_chap }
CVS commit: src/sys/dev/isa
Module Name:src Committed By: martin Date: Tue Oct 18 03:38:50 UTC 2016 Modified Files: src/sys/dev/isa: isa_stub.c Log Message: Make this compile again. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/isa/isa_stub.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/isa/isa_stub.c diff -u src/sys/dev/isa/isa_stub.c:1.1 src/sys/dev/isa/isa_stub.c:1.2 --- src/sys/dev/isa/isa_stub.c:1.1 Mon Oct 17 18:23:49 2016 +++ src/sys/dev/isa/isa_stub.c Tue Oct 18 03:38:50 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_stub.c,v 1.1 2016/10/17 18:23:49 jdolecek Exp $ */ +/* $NetBSD: isa_stub.c,v 1.2 2016/10/18 03:38:50 martin Exp $ */ /*- * Copyright (c) 2016 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: isa_stub.c,v 1.1 2016/10/17 18:23:49 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isa_stub.c,v 1.2 2016/10/18 03:38:50 martin Exp $"); #include #include @@ -47,6 +47,9 @@ __KERNEL_RCSID(0, "$NetBSD: isa_stub.c,v void *default_isa_intr_establish_xname(isa_chipset_tag_t ic, int irq, int type, int level, int (*ih_fun)(void *), void *ih_arg, const char *xname); +void *isa_intr_establish_xname(isa_chipset_tag_t ic, int irq, + int type, + int level, int (*ih_fun)(void *), void *ih_arg, const char *xname); __strict_weak_alias(isa_intr_establish_xname, default_isa_intr_establish_xname); void *
CVS commit: src/sys/netinet6
Module Name:src Committed By: ozaki-r Date: Tue Oct 18 02:46:50 UTC 2016 Modified Files: src/sys/netinet6: nd6.c Log Message: Fix indentation To generate a diff of this commit: cvs rdiff -u -r1.207 -r1.208 src/sys/netinet6/nd6.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/netinet6/nd6.c diff -u src/sys/netinet6/nd6.c:1.207 src/sys/netinet6/nd6.c:1.208 --- src/sys/netinet6/nd6.c:1.207 Fri Sep 2 07:15:14 2016 +++ src/sys/netinet6/nd6.c Tue Oct 18 02:46:50 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: nd6.c,v 1.207 2016/09/02 07:15:14 ozaki-r Exp $ */ +/* $NetBSD: nd6.c,v 1.208 2016/10/18 02:46:50 ozaki-r Exp $ */ /* $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $ */ /* @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.207 2016/09/02 07:15:14 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.208 2016/10/18 02:46:50 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_net_mpsafe.h" @@ -779,7 +779,7 @@ regen_tmpaddr(const struct in6_ifaddr *i ia6_release(public_ifa6, &psref); return 0; } - pserialize_read_exit(s); + pserialize_read_exit(s); return -1; }
CVS commit: src/sys/netinet6
Module Name:src Committed By: ozaki-r Date: Tue Oct 18 02:46:22 UTC 2016 Modified Files: src/sys/netinet6: icmp6.c Log Message: Remove unnecessary pserialize_read_enter To generate a diff of this commit: cvs rdiff -u -r1.197 -r1.198 src/sys/netinet6/icmp6.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/netinet6/icmp6.c diff -u src/sys/netinet6/icmp6.c:1.197 src/sys/netinet6/icmp6.c:1.198 --- src/sys/netinet6/icmp6.c:1.197 Fri Aug 26 21:48:31 2016 +++ src/sys/netinet6/icmp6.c Tue Oct 18 02:46:21 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: icmp6.c,v 1.197 2016/08/26 21:48:31 dholland Exp $ */ +/* $NetBSD: icmp6.c,v 1.198 2016/10/18 02:46:21 ozaki-r Exp $ */ /* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */ /* @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.197 2016/08/26 21:48:31 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.198 2016/10/18 02:46:21 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -1132,7 +1132,6 @@ icmp6_mtudisc_update(struct ip6ctlparam sin6.sin6_family = PF_INET6; sin6.sin6_len = sizeof(struct sockaddr_in6); sin6.sin6_addr = *dst; - s = pserialize_read_enter(); rcvif = m_get_rcvif(m, &s); if (in6_setscope(&sin6.sin6_addr, rcvif, NULL)) { m_put_rcvif(rcvif, &s);
CVS commit: src/sys/netinet6
Module Name:src Committed By: ozaki-r Date: Tue Oct 18 02:45:41 UTC 2016 Modified Files: src/sys/netinet6: in6_ifattach.c Log Message: Add missing pserialize_read_exit To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.106 src/sys/netinet6/in6_ifattach.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/netinet6/in6_ifattach.c diff -u src/sys/netinet6/in6_ifattach.c:1.105 src/sys/netinet6/in6_ifattach.c:1.106 --- src/sys/netinet6/in6_ifattach.c:1.105 Tue Aug 16 10:31:57 2016 +++ src/sys/netinet6/in6_ifattach.c Tue Oct 18 02:45:41 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: in6_ifattach.c,v 1.105 2016/08/16 10:31:57 roy Exp $ */ +/* $NetBSD: in6_ifattach.c,v 1.106 2016/10/18 02:45:41 ozaki-r Exp $ */ /* $KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $ */ /* @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.105 2016/08/16 10:31:57 roy Exp $"); +__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.106 2016/10/18 02:45:41 ozaki-r Exp $"); #include #include @@ -492,6 +492,7 @@ get_ifid(struct ifnet *ifp0, struct ifne nd6log(LOG_DEBUG, "%s: borrow interface identifier from %s\n", if_name(ifp0), if_name(ifp)); + pserialize_read_exit(s); goto success; } }
CVS commit: src/sys/netinet
Module Name:src Committed By: ozaki-r Date: Tue Oct 18 01:15:21 UTC 2016 Modified Files: src/sys/netinet: ip_input.c Log Message: Avoid double frees of mbuf May fix one of panicks reported by Tom Ivar Helbekkmo in PR kern/51522 To generate a diff of this commit: cvs rdiff -u -r1.342 -r1.343 src/sys/netinet/ip_input.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/netinet/ip_input.c diff -u src/sys/netinet/ip_input.c:1.342 src/sys/netinet/ip_input.c:1.343 --- src/sys/netinet/ip_input.c:1.342 Tue Oct 11 05:15:01 2016 +++ src/sys/netinet/ip_input.c Tue Oct 18 01:15:20 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_input.c,v 1.342 2016/10/11 05:15:01 ozaki-r Exp $ */ +/* $NetBSD: ip_input.c,v 1.343 2016/10/18 01:15:20 ozaki-r Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -91,7 +91,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.342 2016/10/11 05:15:01 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.343 2016/10/18 01:15:20 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -618,6 +618,7 @@ ip_input(struct mbuf *m) freed = pfil_run_hooks(inet_pfil_hook, &m, ifp, PFIL_IN) != 0; SOFTNET_UNLOCK(); if (freed || m == NULL) { + m = NULL; goto out; } ip = mtod(m, struct ip *); @@ -647,6 +648,7 @@ ip_input(struct mbuf *m) if ((*altq_input)(m, AF_INET) == 0) { /* Packet dropped by traffic conditioner. */ SOFTNET_UNLOCK(); + m = NULL; goto out; } SOFTNET_UNLOCK(); @@ -660,8 +662,10 @@ ip_input(struct mbuf *m) * to be sent and the original packet to be freed). */ ip_nhops = 0; /* for source routed packets */ - if (hlen > sizeof (struct ip) && ip_dooptions(m)) + if (hlen > sizeof (struct ip) && ip_dooptions(m)) { + m = NULL; goto out; + } /* * Check our list of addresses, to see if the packet is for us.
CVS commit: src/external/gpl3/gdb
Module Name:src Committed By: mrg Date: Tue Oct 18 00:16:58 UTC 2016 Modified Files: src/external/gpl3/gdb: Makefile.gdb_arch Log Message: fix earmhf and earmhfeb builds. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gdb/Makefile.gdb_arch Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gdb/Makefile.gdb_arch diff -u src/external/gpl3/gdb/Makefile.gdb_arch:1.1 src/external/gpl3/gdb/Makefile.gdb_arch:1.2 --- src/external/gpl3/gdb/Makefile.gdb_arch:1.1 Sun Oct 16 04:36:51 2016 +++ src/external/gpl3/gdb/Makefile.gdb_arch Tue Oct 18 00:16:58 2016 @@ -1,3 +1,3 @@ # $NetBSD# -GDB_MACHINE_ARCH= ${MACHINE_ARCH:C/^e//:C/e?armv[4-7]h?f?/arm/} +GDB_MACHINE_ARCH= ${MACHINE_ARCH:C/^e//:C/e?armv?[4-7]?h?f?/arm/}
CVS commit: src/external/bsd/blacklist/etc/rc.d
Module Name:src Committed By: christos Date: Mon Oct 17 22:47:16 UTC 2016 Modified Files: src/external/bsd/blacklist/etc/rc.d: blacklistd Log Message: account for socket name change. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/blacklist/etc/rc.d/blacklistd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/blacklist/etc/rc.d/blacklistd diff -u src/external/bsd/blacklist/etc/rc.d/blacklistd:1.1 src/external/bsd/blacklist/etc/rc.d/blacklistd:1.2 --- src/external/bsd/blacklist/etc/rc.d/blacklistd:1.1 Thu Jan 22 12:49:41 2015 +++ src/external/bsd/blacklist/etc/rc.d/blacklistd Mon Oct 17 18:47:16 2016 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: blacklistd,v 1.1 2015/01/22 17:49:41 christos Exp $ +# $NetBSD: blacklistd,v 1.2 2016/10/17 22:47:16 christos Exp $ # # PROVIDE: blacklistd @@ -18,7 +18,7 @@ start_precmd="${name}_precmd" extra_commands="reload" _sockfile="/var/run/${name}.sockets" -_sockname="blsock" +_sockname="blacklistd.sock" blacklistd_precmd() {
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Mon Oct 17 22:42:34 UTC 2016 Modified Files: src/share/mk: bsd.own.mk Log Message: switch evbcf and powerpc64 to GDB 7.12. remaining ports: hppa, sun2, vax, m68k, sh3, mips64* To generate a diff of this commit: cvs rdiff -u -r1.975 -r1.976 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.own.mk diff -u src/share/mk/bsd.own.mk:1.975 src/share/mk/bsd.own.mk:1.976 --- src/share/mk/bsd.own.mk:1.975 Mon Oct 17 21:42:54 2016 +++ src/share/mk/bsd.own.mk Mon Oct 17 22:42:34 2016 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.975 2016/10/17 21:42:54 mrg Exp $ +# $NetBSD: bsd.own.mk,v 1.976 2016/10/17 22:42:34 mrg Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -130,12 +130,10 @@ USE_SSP?= yes # # What GDB is used? # -.if ${MACHINE} == "evbcf" || \ -${MACHINE} == "hppa" || \ +.if ${MACHINE} == "hppa" || \ ${MACHINE} == "sun2" || \ ${MACHINE} == "vax" || \ ${MACHINE_CPU} == "m68k" || \ -${MACHINE_CPU} == "powerpc64" || \ ${MACHINE_CPU} == "sh3" || \ ${MACHINE_ARCH} == "mips64el" || \ ${MACHINE_ARCH} == "mips64eb"
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Mon Oct 17 21:42:54 UTC 2016 Modified Files: src/share/mk: bsd.own.mk Log Message: reverse the HAVE_GDB test - list the unconverted ports. To generate a diff of this commit: cvs rdiff -u -r1.974 -r1.975 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.own.mk diff -u src/share/mk/bsd.own.mk:1.974 src/share/mk/bsd.own.mk:1.975 --- src/share/mk/bsd.own.mk:1.974 Mon Oct 17 20:25:34 2016 +++ src/share/mk/bsd.own.mk Mon Oct 17 21:42:54 2016 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.974 2016/10/17 20:25:34 mrg Exp $ +# $NetBSD: bsd.own.mk,v 1.975 2016/10/17 21:42:54 mrg Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -130,19 +130,18 @@ USE_SSP?= yes # # What GDB is used? # -.if ${MACHINE} == "alpha" || \ -${MACHINE} == "amd64" || \ -${MACHINE} == "i386" || \ -${MACHINE} == "sparc" || \ -${MACHINE} == "sparc64" || \ -${MACHINE_ARCH} == "mipsel" || \ -${MACHINE_ARCH} == "mipseb" || \ -${MACHINE_CPU} == "arm" || \ -${MACHINE_CPU} == "powerpc" -HAVE_GDB?= 712 -.else -# coldfire/hppa/m68000/m68k/mips64/ppc64/sh3*/vax +.if ${MACHINE} == "evbcf" || \ +${MACHINE} == "hppa" || \ +${MACHINE} == "sun2" || \ +${MACHINE} == "vax" || \ +${MACHINE_CPU} == "m68k" || \ +${MACHINE_CPU} == "powerpc64" || \ +${MACHINE_CPU} == "sh3" || \ +${MACHINE_ARCH} == "mips64el" || \ +${MACHINE_ARCH} == "mips64eb" HAVE_GDB?= 710 +.else +HAVE_GDB?= 712 .endif .if ${HAVE_GDB} == 712
CVS commit: src/share/man/man4
Module Name:src Committed By: maya Date: Mon Oct 17 20:43:19 UTC 2016 Modified Files: src/share/man/man4: options.4 Log Message: OPEN_MAX is 128 now, unless defined differently in config To generate a diff of this commit: cvs rdiff -u -r1.451 -r1.452 src/share/man/man4/options.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/options.4 diff -u src/share/man/man4/options.4:1.451 src/share/man/man4/options.4:1.452 --- src/share/man/man4/options.4:1.451 Thu Oct 29 07:46:08 2015 +++ src/share/man/man4/options.4 Mon Oct 17 20:43:19 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: options.4,v 1.451 2015/10/29 07:46:08 wiz Exp $ +.\" $NetBSD: options.4,v 1.452 2016/10/17 20:43:19 maya Exp $ .\" .\" Copyright (c) 1996 .\" Perry E. Metzger. All rights reserved. @@ -30,7 +30,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" -.Dd October 28, 2015 +.Dd October 17, 2016 .Dt OPTIONS 4 .Os .Sh NAME @@ -1444,7 +1444,7 @@ file descriptors for each process; this value is inherited by its child processes. It defaults to .Em OPEN_MAX , -which is currently defined to be 64. +which is currently defined to be 128. .It Cd options MAXFILES=integer Sets the default value of the .Em kern.maxfiles
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Mon Oct 17 20:25:34 UTC 2016 Modified Files: src/share/mk: bsd.own.mk Log Message: switch i386 and 32 bit mips to GDB 7.12. To generate a diff of this commit: cvs rdiff -u -r1.973 -r1.974 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.own.mk diff -u src/share/mk/bsd.own.mk:1.973 src/share/mk/bsd.own.mk:1.974 --- src/share/mk/bsd.own.mk:1.973 Sun Oct 16 19:20:02 2016 +++ src/share/mk/bsd.own.mk Mon Oct 17 20:25:34 2016 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.973 2016/10/16 19:20:02 mrg Exp $ +# $NetBSD: bsd.own.mk,v 1.974 2016/10/17 20:25:34 mrg Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -132,12 +132,16 @@ USE_SSP?= yes # .if ${MACHINE} == "alpha" || \ ${MACHINE} == "amd64" || \ +${MACHINE} == "i386" || \ ${MACHINE} == "sparc" || \ ${MACHINE} == "sparc64" || \ +${MACHINE_ARCH} == "mipsel" || \ +${MACHINE_ARCH} == "mipseb" || \ ${MACHINE_CPU} == "arm" || \ ${MACHINE_CPU} == "powerpc" HAVE_GDB?= 712 .else +# coldfire/hppa/m68000/m68k/mips64/ppc64/sh3*/vax HAVE_GDB?= 710 .endif
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: mrg Date: Mon Oct 17 20:16:57 UTC 2016 Modified Files: src/distrib/sets/lists/comp: ad.arm Log Message: fix oabi arm builds - no eabi ldscripts. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/distrib/sets/lists/comp/ad.arm Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/ad.arm diff -u src/distrib/sets/lists/comp/ad.arm:1.74 src/distrib/sets/lists/comp/ad.arm:1.75 --- src/distrib/sets/lists/comp/ad.arm:1.74 Sat Oct 15 11:41:54 2016 +++ src/distrib/sets/lists/comp/ad.arm Mon Oct 17 20:16:57 2016 @@ -1,4 +1,4 @@ -# $NetBSD: ad.arm,v 1.74 2016/10/15 11:41:54 christos Exp $ +# $NetBSD: ad.arm,v 1.75 2016/10/17 20:16:57 mrg Exp $ ./usr/include/acorn26comp-c-include ./usr/include/acorn26/ansi.h comp-obsolete obsolete ./usr/include/acorn26/aout_machdep.h comp-obsolete obsolete @@ -693,58 +693,32 @@ ./usr/libdata/ldscripts/armelf_nbsd.xsw -unknown- binutils ./usr/libdata/ldscripts/armelf_nbsd.xu -unknown- binutils ./usr/libdata/ldscripts/armelf_nbsd.xw -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.x -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.x -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.xbn -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.xbn -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.xc -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.xc -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.xd -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.xd -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.xdc -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.xdc -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.xdw -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.xdw -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.xn -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.xn -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.xr -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.xr -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.xs -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.xs -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.xsc -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.xsc -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.xsw -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.xsw -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.xu -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.xu -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.xw -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabi.xw -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.x -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.x -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.xbn -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.xbn -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.xc -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.xc -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.xd -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.xd -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.xdc -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.xdc -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.xdw -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.xdw -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.xn -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.xn -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.xr -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.xr -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.xs -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.xs -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.xsc -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.xsc -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.xsw -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.xsw -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.xu -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.xu -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.xw -unknown- binutils -./usr/libdata/ldscripts/armelf_nbsd_eabihf.xw -unknown- binutils +./usr/libdata/ldscripts/armelf_nbsd_eabi.x -unknown- binutils,eabi +./usr/libdata/ldscripts/armelf_nbsd_eabi.xbn -unknown- binutils,eabi +./usr/libdata/ldscripts/armelf_nbsd_eabi.xc -unknown- binutils,eabi +./usr/libdata/ldscripts/armelf_nbsd_eabi.xd -unknown- binutils,eabi +./usr/libdata/ldscripts/armelf_nbsd_eabi.xdc -unknown- binutils,eabi +./usr/l
CVS commit: src/sys/dev/usb
Module Name:src Committed By: nat Date: Mon Oct 17 20:04:48 UTC 2016 Modified Files: src/sys/dev/usb: udl.c udl.h Log Message: Add a kthread to update display with framebuffer contents. X11 will now work with wsfb(4). OK christos@ To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/dev/usb/udl.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/usb/udl.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/udl.c diff -u src/sys/dev/usb/udl.c:1.15 src/sys/dev/usb/udl.c:1.16 --- src/sys/dev/usb/udl.c:1.15 Mon Oct 17 19:58:42 2016 +++ src/sys/dev/usb/udl.c Mon Oct 17 20:04:48 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: udl.c,v 1.15 2016/10/17 19:58:42 nat Exp $ */ +/* $NetBSD: udl.c,v 1.16 2016/10/17 20:04:48 nat Exp $ */ /*- * Copyright (c) 2009 FUKAUMI Naoki. @@ -53,7 +53,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: udl.c,v 1.15 2016/10/17 19:58:42 nat Exp $"); +__KERNEL_RCSID(0, "$NetBSD: udl.c,v 1.16 2016/10/17 20:04:48 nat Exp $"); #include #include @@ -61,6 +61,8 @@ __KERNEL_RCSID(0, "$NetBSD: udl.c,v 1.15 #include #include #include +#include +#include #include #include @@ -172,6 +174,7 @@ static uint16_t udl_lfsr(uint16_t); static int udl_set_resolution(struct udl_softc *, const struct videomode *); static const struct videomode *udl_videomode_lookup(const char *); +static void udl_update_thread(void *); static inline void udl_cmd_add_1(struct udl_softc *sc, uint8_t val) @@ -468,6 +471,12 @@ udl_attach(device_t parent, device_t sel config_found(sc->sc_dev, &aa, wsemuldisplaydevprint); usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); + + mutex_init(&sc->sc_thread_mtx, MUTEX_DEFAULT, IPL_NONE); + cv_init(&sc->sc_thread_cv, "udlcv"); + sc->sc_dying = false; + kthread_create(PRI_BIO, KTHREAD_MPSAFE | KTHREAD_MUSTJOIN, NULL, + udl_update_thread, sc, &sc->sc_thread, "udlupd"); } static int @@ -492,9 +501,6 @@ udl_detach(device_t self, int flags) usbd_close_pipe(sc->sc_tx_pipeh); } - cv_destroy(&sc->sc_cv); - mutex_destroy(&sc->sc_mtx); - /* * Free Huffman table. */ @@ -504,6 +510,15 @@ udl_detach(device_t self, int flags) * Free framebuffer memory. */ udl_fbmem_free(sc); + + sc->sc_dying = true; + cv_broadcast(&sc->sc_thread_cv); + kthread_join(sc->sc_thread); + + cv_destroy(&sc->sc_cv); + mutex_destroy(&sc->sc_mtx); + cv_destroy(&sc->sc_thread_cv); + mutex_destroy(&sc->sc_thread_mtx); /* * Detach wsdisplay. @@ -637,6 +652,7 @@ udl_mmap(void *v, void *vs, off_t off, i if (udl_fbmem_alloc(sc) != 0) return -1; + cv_broadcast(&sc->sc_thread_cv); vaddr = (vaddr_t)sc->sc_fbmem + off; rv = pmap_extract(pmap_kernel(), vaddr, &paddr); KASSERT(rv); @@ -810,11 +826,24 @@ static int udl_fbmem_alloc(struct udl_softc *sc) { + mutex_enter(&sc->sc_thread_mtx); if (sc->sc_fbmem == NULL) { - sc->sc_fbmem = kmem_alloc(UDL_FBMEM_SIZE(sc), KM_SLEEP); - if (sc->sc_fbmem == NULL) + sc->sc_fbmem = kmem_zalloc(UDL_FBMEM_SIZE(sc), KM_SLEEP); + if (sc->sc_fbmem == NULL) { + mutex_exit(&sc->sc_thread_mtx); + return -1; + } + } + if (sc->sc_fbmem_prev == NULL) { + sc->sc_fbmem_prev = kmem_zalloc(UDL_FBMEM_SIZE(sc), KM_SLEEP); + if (sc->sc_fbmem_prev == NULL) { + kmem_free(sc->sc_fbmem, UDL_FBMEM_SIZE(sc)); + sc->sc_fbmem = NULL; + mutex_exit(&sc->sc_thread_mtx); return -1; + } } + mutex_exit(&sc->sc_thread_mtx); return 0; } @@ -823,10 +852,16 @@ static void udl_fbmem_free(struct udl_softc *sc) { + mutex_enter(&sc->sc_thread_mtx); if (sc->sc_fbmem != NULL) { kmem_free(sc->sc_fbmem, UDL_FBMEM_SIZE(sc)); sc->sc_fbmem = NULL; } + if (sc->sc_fbmem_prev != NULL) { + kmem_free(sc->sc_fbmem_prev, UDL_FBMEM_SIZE(sc)); + sc->sc_fbmem_prev = NULL; + } + mutex_exit(&sc->sc_thread_mtx); } static int @@ -1763,3 +1798,82 @@ udl_videomode_lookup(const char *name) return NULL; } + +static void +udl_update_thread(void *v) +{ + struct udl_softc *sc = v; + int stride; +#ifdef notyet + bool update = false; + int linecount, x, y; + uint16_t *fb, *fbcopy; + uint8_t *curfb; +#else + uint16_t *fb; + int offs; +#endif + + mutex_enter(&sc->sc_thread_mtx); + + for (;;) { + stride = min(sc->sc_width, UDL_CMD_WIDTH_MAX - 8); + if (sc->sc_dying == true) { + mutex_exit(&sc->sc_thread_mtx); + kthread_exit(0); + } + + if (sc->sc_fbmem == NULL) + goto thread_wait; + +#ifdef notyet + curfb = kmem_zalloc(UDL_FBMEM_SIZE(sc), KM_SLEEP); + memcpy(curfb, sc->sc_fbmem, sc->sc_height * sc->sc_width * 2); + fb = (uint16_t *)curfb; + fbcopy = (uint16_t *)sc->sc_fbmem_prev; + for (y = 0; y < sc->sc_height; y++) { + linecount = 0; + update = false; + for (x = 0; x < sc->sc_width; x++) { +if (linecount >= stride) { + udl_draw_line(sc, &fb[y * sc->sc_width + + x - linecount], y * sc->sc_width + + x - linecount, linecount); +
CVS commit: src/sys/dev/usb
Module Name:src Committed By: nat Date: Mon Oct 17 19:58:42 UTC 2016 Modified Files: src/sys/dev/usb: udl.c usbdevs Log Message: Add DisplayLink FY-DVI usb adaptor. OK christos@ To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/dev/usb/udl.c cvs rdiff -u -r1.719 -r1.720 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/udl.c diff -u src/sys/dev/usb/udl.c:1.14 src/sys/dev/usb/udl.c:1.15 --- src/sys/dev/usb/udl.c:1.14 Sat Apr 23 10:15:32 2016 +++ src/sys/dev/usb/udl.c Mon Oct 17 19:58:42 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: udl.c,v 1.14 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: udl.c,v 1.15 2016/10/17 19:58:42 nat Exp $ */ /*- * Copyright (c) 2009 FUKAUMI Naoki. @@ -53,7 +53,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: udl.c,v 1.14 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: udl.c,v 1.15 2016/10/17 19:58:42 nat Exp $"); #include #include @@ -330,7 +330,9 @@ static const struct usb_devno udl_devs[] { USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_PLUGABLE }, { USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_LT1421WIDE }, { USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_SD_U2VDH }, - { USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_UM7X0 } + { USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_UM7X0 }, + { USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_FYDVI }, + { USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_FYDVI2 } }; static int Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.719 src/sys/dev/usb/usbdevs:1.720 --- src/sys/dev/usb/usbdevs:1.719 Sun Oct 16 18:47:49 2016 +++ src/sys/dev/usb/usbdevs Mon Oct 17 19:58:42 2016 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.719 2016/10/16 18:47:49 nat Exp $ +$NetBSD: usbdevs,v 1.720 2016/10/17 19:58:42 nat Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -1334,6 +1334,7 @@ product DISPLAYLINK LCDUSB10X 0x0156 IO- product DISPLAYLINK VGA10 0x015a CMP-USBVGA10 product DISPLAYLINK WSDVI 0x0198 WS Tech DVI product DISPLAYLINK EC008 0x019b EasyCAP008 DVI +product DISPLAYLINK FYDVI2 0x019e DisplayLink FY-DVI2 product DISPLAYLINK GXDVIU2 0x01ac BUFFALO GX-DVI/U2 product DISPLAYLINK LCD4300U 0x01ba LCD-4300U product DISPLAYLINK LCD8000U 0x01bb LCD-8000U @@ -1351,6 +1352,7 @@ product DISPLAYLINK PLUGABLE 0x0377 Plug product DISPLAYLINK LT1421WIDE 0x03e0 Lenovo ThinkVision LT1421 Wide product DISPLAYLINK SD_U2VDH 0x046d AREA SD-U2VDH product DISPLAYLINK UM7X0 0x401a nanovision MiMo +product DISPLAYLINK FYDVI 0x8060 DisplayLink FY-DVI /* D-Link products */ /*product DLINK DSBS25 0x0100 DSB-S25 serial adapter*/
CVS commit: src/external/gpl3/gdb/lib
Module Name:src Committed By: mrg Date: Mon Oct 17 18:32:35 UTC 2016 Removed Files: src/external/gpl3/gdb/lib/libbfd/arch/earm: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libbfd/arch/earmeb: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libbfd/arch/earmhf: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libbfd/arch/earmhfeb: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libbfd/arch/earmv4: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libdecnumber/arch/earm: config.h defs.mk gstdint.h src/external/gpl3/gdb/lib/libdecnumber/arch/earmeb: config.h defs.mk gstdint.h src/external/gpl3/gdb/lib/libdecnumber/arch/earmhf: config.h defs.mk gstdint.h src/external/gpl3/gdb/lib/libdecnumber/arch/earmhfeb: config.h defs.mk gstdint.h src/external/gpl3/gdb/lib/libdecnumber/arch/earmv4: config.h defs.mk gstdint.h src/external/gpl3/gdb/lib/libiberty/arch/earm: config.h defs.mk src/external/gpl3/gdb/lib/libiberty/arch/earmeb: config.h defs.mk src/external/gpl3/gdb/lib/libiberty/arch/earmhf: config.h defs.mk src/external/gpl3/gdb/lib/libiberty/arch/earmhfeb: config.h defs.mk src/external/gpl3/gdb/lib/libiberty/arch/earmv4: config.h defs.mk src/external/gpl3/gdb/lib/libopcodes/arch/earm: config.h defs.mk src/external/gpl3/gdb/lib/libopcodes/arch/earmeb: config.h defs.mk src/external/gpl3/gdb/lib/libopcodes/arch/earmhf: config.h defs.mk src/external/gpl3/gdb/lib/libopcodes/arch/earmhfeb: config.h defs.mk src/external/gpl3/gdb/lib/libopcodes/arch/earmv4: config.h defs.mk src/external/gpl3/gdb/lib/libreadline/arch/earm: config.h defs.mk src/external/gpl3/gdb/lib/libreadline/arch/earmeb: config.h defs.mk src/external/gpl3/gdb/lib/libreadline/arch/earmhf: config.h defs.mk src/external/gpl3/gdb/lib/libreadline/arch/earmhfeb: config.h defs.mk src/external/gpl3/gdb/lib/libreadline/arch/earmv4: config.h defs.mk Log Message: remove unused files. To generate a diff of this commit: cvs rdiff -u -r1.6 -r0 src/external/gpl3/gdb/lib/libbfd/arch/earm/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/earm/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/earm/bfd_stdint.h \ src/external/gpl3/gdb/lib/libbfd/arch/earm/bfdver.h \ src/external/gpl3/gdb/lib/libbfd/arch/earm/targmatch.h cvs rdiff -u -r1.7 -r0 src/external/gpl3/gdb/lib/libbfd/arch/earm/config.h cvs rdiff -u -r1.3 -r0 src/external/gpl3/gdb/lib/libbfd/arch/earm/defs.mk cvs rdiff -u -r1.5 -r0 src/external/gpl3/gdb/lib/libbfd/arch/earmeb/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/earmeb/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/earmeb/bfd_stdint.h \ src/external/gpl3/gdb/lib/libbfd/arch/earmeb/bfdver.h \ src/external/gpl3/gdb/lib/libbfd/arch/earmeb/config.h cvs rdiff -u -r1.3 -r0 src/external/gpl3/gdb/lib/libbfd/arch/earmeb/defs.mk cvs rdiff -u -r1.6 -r0 \ src/external/gpl3/gdb/lib/libbfd/arch/earmeb/targmatch.h cvs rdiff -u -r1.5 -r0 src/external/gpl3/gdb/lib/libbfd/arch/earmhf/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/earmhf/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/earmhf/bfd_stdint.h \ src/external/gpl3/gdb/lib/libbfd/arch/earmhf/bfdver.h cvs rdiff -u -r1.6 -r0 src/external/gpl3/gdb/lib/libbfd/arch/earmhf/config.h \ src/external/gpl3/gdb/lib/libbfd/arch/earmhf/targmatch.h cvs rdiff -u -r1.3 -r0 src/external/gpl3/gdb/lib/libbfd/arch/earmhf/defs.mk cvs rdiff -u -r1.5 -r0 \ src/external/gpl3/gdb/lib/libbfd/arch/earmhfeb/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/earmhfeb/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/earmhfeb/bfd_stdint.h \ src/external/gpl3/gdb/lib/libbfd/arch/earmhfeb/bfdver.h \ src/external/gpl3/gdb/lib/libbfd/arch/earmhfeb/config.h cvs rdiff -u -r1.3 -r0 src/external/gpl3/gdb/lib/libbfd/arch/earmhfeb/defs.mk cvs rdiff -u -r1.6 -r0 \ src/external/gpl3/gdb/lib/libbfd/arch/earmhfeb/targmatch.h cvs rdiff -u -r1.2 -r0 src/external/gpl3/gdb/lib/libbfd/arch/earmv4/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/earmv4/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/earmv4/bfdver.h \ src/external/gpl3/gdb/lib/libbfd/arch/earmv4/config.h cvs rdiff -u -r1.3 -r0 \ src/external/gpl3/gdb/lib/libbfd/arch/earmv4/bfd_stdint.h \ src/external/gpl3/gdb/lib/libbfd/arch/earmv4/targmatch.h cvs rdiff -u -r1.1 -r0 src/external/gpl3/gdb/lib/libbfd/arch/earmv4/defs.mk cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gdb/lib/libdecnumber/arch/earm/config.h cvs rdiff -u -r1.1 -r0 \ src/external/gpl3/gdb/lib/
CVS commit: src/lib/librumpuser/build-aux
Module Name:src Committed By: maya Date: Mon Oct 17 18:24:42 UTC 2016 Modified Files: src/lib/librumpuser/build-aux: install-sh Log Message: use mktemp instead of $RANDOM for tmpdir ..$RANDOM won't work with our /bin/sh. unsure if this script is used, but it is wrong. might help the spurious build failures that occasionally show up on autobuilds. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/librumpuser/build-aux/install-sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/librumpuser/build-aux/install-sh diff -u src/lib/librumpuser/build-aux/install-sh:1.1 src/lib/librumpuser/build-aux/install-sh:1.2 --- src/lib/librumpuser/build-aux/install-sh:1.1 Tue Nov 4 19:05:17 2014 +++ src/lib/librumpuser/build-aux/install-sh Mon Oct 17 18:24:42 2016 @@ -345,7 +345,7 @@ do # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ;; *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + tmpdir=$(mktemp -d -p ${TMPDIR:-/tmp}) trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 if (umask $mkdir_umask &&
CVS commit: src/sys
Module Name:src Committed By: jdolecek Date: Mon Oct 17 18:23:50 UTC 2016 Modified Files: src/sys/arch/xen/include: intr.h src/sys/arch/xen/x86: intr.c src/sys/dev/isa: files.isa Added Files: src/sys/dev/isa: isa_stub.c Log Message: provide stub intr xname establish for xen To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/arch/xen/include/intr.h cvs rdiff -u -r1.29 -r1.30 src/sys/arch/xen/x86/intr.c cvs rdiff -u -r1.163 -r1.164 src/sys/dev/isa/files.isa cvs rdiff -u -r0 -r1.1 src/sys/dev/isa/isa_stub.c 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/xen/include/intr.h diff -u src/sys/arch/xen/include/intr.h:1.38 src/sys/arch/xen/include/intr.h:1.39 --- src/sys/arch/xen/include/intr.h:1.38 Sun Oct 16 06:40:43 2016 +++ src/sys/arch/xen/include/intr.h Mon Oct 17 18:23:50 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.38 2016/10/16 06:40:43 kre Exp $ */ +/* $NetBSD: intr.h,v 1.39 2016/10/17 18:23:50 jdolecek Exp $ */ /* NetBSD intr.h,v 1.15 2004/10/31 10:39:34 yamt Exp */ /*- @@ -164,6 +164,8 @@ void intr_default_setup(void); int x86_nmi(void); void *intr_establish(int, struct pic *, int, int, int, int (*)(void *), void *, bool); +void *intr_establish_xname(int, struct pic *, int, int, int, int (*)(void *), void *, +bool, const char *); void intr_disestablish(struct intrhand *); const char *intr_string(intr_handle_t); void cpu_intr_init(struct cpu_info *); @@ -184,15 +186,6 @@ void xen_broadcast_ipi(uint32_t); #define xen_send_ipi(_i1, _i2) (0) /* nothing */ #define xen_broadcast_ipi(_i1) ((void) 0) /* nothing */ #endif /* MULTIPROCESSOR */ - -/* - * XXX Hack: allow xen kernels to build with recent (Oct 2016) changes - * to acpi interrupt establishment (until a better solution) - */ -#define intr_establish_xname(a,b,c,d,e,f,g,h,i) intr_establish(a,b,c,d,e,f,g,h) -#define isa_intr_establish_xname(a,b,c,d,e,f,g) isa_intr_establish(a,b,c,d,e,f) -/* kcaH XXX */ - #endif /* !_LOCORE */ #endif /* _XEN_INTR_H_ */ Index: src/sys/arch/xen/x86/intr.c diff -u src/sys/arch/xen/x86/intr.c:1.29 src/sys/arch/xen/x86/intr.c:1.30 --- src/sys/arch/xen/x86/intr.c:1.29 Sat Aug 13 16:22:15 2011 +++ src/sys/arch/xen/x86/intr.c Mon Oct 17 18:23:50 2016 @@ -103,7 +103,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.29 2011/08/13 16:22:15 cherry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.30 2016/10/17 18:23:50 jdolecek Exp $"); #include "opt_multiprocessor.h" #include "opt_xen.h" @@ -187,6 +187,16 @@ cpu_intr_init(struct cpu_info *ci) #if NPCI > 0 || NISA > 0 void * +intr_establish_xname(int legacy_irq, struct pic *pic, int pin, +int type, int level, int (*handler)(void *) , void *arg, +bool known_mpsafe, const char *xname) +{ + /* XXX xname registration not supported */ + return intr_establish(legacy_irq, pic, pin, type, level, handler, arg, + known_mpsafe); +} + +void * intr_establish(int legacy_irq, struct pic *pic, int pin, int type, int level, int (*handler)(void *) , void *arg, bool known_mpsafe) Index: src/sys/dev/isa/files.isa diff -u src/sys/dev/isa/files.isa:1.163 src/sys/dev/isa/files.isa:1.164 --- src/sys/dev/isa/files.isa:1.163 Mon Jun 10 07:14:02 2013 +++ src/sys/dev/isa/files.isa Mon Oct 17 18:23:49 2016 @@ -1,4 +1,4 @@ -# $NetBSD: files.isa,v 1.163 2013/06/10 07:14:02 kardel Exp $ +# $NetBSD: files.isa,v 1.164 2016/10/17 18:23:49 jdolecek Exp $ # # Config file and device description for machine-independent ISA code. # Included by ports that need it. Requires that the SCSI files be @@ -13,6 +13,7 @@ device isa {[port = -1], [size = 0], [irq = -1], [drq = -1], [drq2 = -1]} attach isa at isabus file dev/isa/isa.c isa needs-flag +file dev/isa/isa_stub.c isa file dev/isa/isabusprint.c isabus Added files: Index: src/sys/dev/isa/isa_stub.c diff -u /dev/null src/sys/dev/isa/isa_stub.c:1.1 --- /dev/null Mon Oct 17 18:23:50 2016 +++ src/sys/dev/isa/isa_stub.c Mon Oct 17 18:23:49 2016 @@ -0,0 +1,57 @@ +/* $NetBSD: isa_stub.c,v 1.1 2016/10/17 18:23:49 jdolecek Exp $ */ + +/*- + * Copyright (c) 2016 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Charles M. Hannum; by Jason R. Thorpe of Wasabi Systems, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: mrg Date: Mon Oct 17 17:37:44 UTC 2016 Modified Files: src/external/gpl3/gdb/dist/gdb: m68kbsd-nat.c vaxbsd-nat.c Log Message: add some missing casts and make these build. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gdb/dist/gdb/m68kbsd-nat.c cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gdb/dist/gdb/vaxbsd-nat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gdb/dist/gdb/m68kbsd-nat.c diff -u src/external/gpl3/gdb/dist/gdb/m68kbsd-nat.c:1.10 src/external/gpl3/gdb/dist/gdb/m68kbsd-nat.c:1.11 --- src/external/gpl3/gdb/dist/gdb/m68kbsd-nat.c:1.10 Wed Oct 12 20:20:33 2016 +++ src/external/gpl3/gdb/dist/gdb/m68kbsd-nat.c Mon Oct 17 17:37:44 2016 @@ -57,7 +57,7 @@ m68kbsd_fpregset_supplies_p (int regnum) static void m68kbsd_supply_gregset (struct regcache *regcache, const void *gregs) { - const char *regs = gregs; + const char *regs = (const char *)gregs; int regnum; for (regnum = M68K_D0_REGNUM; regnum <= M68K_PC_REGNUM; regnum++) @@ -70,7 +70,7 @@ static void m68kbsd_supply_fpregset (struct regcache *regcache, const void *fpregs) { struct gdbarch *gdbarch = get_regcache_arch (regcache); - const char *regs = fpregs; + const char *regs = (const char *)fpregs; int regnum; for (regnum = M68K_FP0_REGNUM; regnum <= M68K_FPI_REGNUM; regnum++) @@ -85,7 +85,7 @@ static void m68kbsd_collect_gregset (const struct regcache *regcache, void *gregs, int regnum) { - char *regs = gregs; + char *regs = (char *)gregs; int i; for (i = M68K_D0_REGNUM; i <= M68K_PC_REGNUM; i++) @@ -103,7 +103,7 @@ m68kbsd_collect_fpregset (const struct r void *fpregs, int regnum) { struct gdbarch *gdbarch = get_regcache_arch (regcache); - char *regs = fpregs; + char *regs = (char *)fpregs; int i; for (i = M68K_FP0_REGNUM; i <= M68K_FPI_REGNUM; i++) @@ -253,7 +253,7 @@ m68kbsd_supply_pcb (struct regcache *reg tmp = pcb->pcb_ps & 0x; regcache_raw_supply (regcache, M68K_PS_REGNUM, &tmp); - read_memory (pcb->pcb_regs[PCB_REGS_FP] + 4, (char *) &tmp, sizeof tmp); + read_memory (pcb->pcb_regs[PCB_REGS_FP] + 4, (unsigned char *) &tmp, sizeof tmp); regcache_raw_supply (regcache, M68K_PC_REGNUM, &tmp); return 1; Index: src/external/gpl3/gdb/dist/gdb/vaxbsd-nat.c diff -u src/external/gpl3/gdb/dist/gdb/vaxbsd-nat.c:1.11 src/external/gpl3/gdb/dist/gdb/vaxbsd-nat.c:1.12 --- src/external/gpl3/gdb/dist/gdb/vaxbsd-nat.c:1.11 Wed Oct 12 20:20:33 2016 +++ src/external/gpl3/gdb/dist/gdb/vaxbsd-nat.c Mon Oct 17 17:37:44 2016 @@ -47,7 +47,7 @@ typedef struct fpreg fpregset_t; static void vaxbsd_supply_gregset (struct regcache *regcache, const void *gregs) { - const gdb_byte *regs = gregs; + const gdb_byte *regs = (const gdb_byte *)gregs; int regnum; for (regnum = 0; regnum < VAX_NUM_REGS; regnum++) @@ -61,7 +61,7 @@ static void vaxbsd_collect_gregset (const struct regcache *regcache, void *gregs, int regnum) { - gdb_byte *regs = gregs; + gdb_byte *regs = (gdb_byte *)gregs; int i; for (i = 0; i <= VAX_NUM_REGS; i++)
CVS commit: src/sys/dev/pci
Module Name:src Committed By: flxd Date: Mon Oct 17 16:02:10 UTC 2016 Modified Files: src/sys/dev/pci: siop_pci_common.c Log Message: Add 53C810AP for FreeAXP's emulation of a DEC KZPAA adapter. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/dev/pci/siop_pci_common.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/siop_pci_common.c diff -u src/sys/dev/pci/siop_pci_common.c:1.35 src/sys/dev/pci/siop_pci_common.c:1.36 --- src/sys/dev/pci/siop_pci_common.c:1.35 Sat Mar 29 19:28:25 2014 +++ src/sys/dev/pci/siop_pci_common.c Mon Oct 17 16:02:10 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: siop_pci_common.c,v 1.35 2014/03/29 19:28:25 christos Exp $ */ +/* $NetBSD: siop_pci_common.c,v 1.36 2016/10/17 16:02:10 flxd Exp $ */ /* * Copyright (c) 2000 Manuel Bouyer. @@ -27,7 +27,7 @@ /* SYM53c8xx PCI-SCSI I/O Processors driver: PCI front-end */ #include -__KERNEL_RCSID(0, "$NetBSD: siop_pci_common.c,v 1.35 2014/03/29 19:28:25 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: siop_pci_common.c,v 1.36 2016/10/17 16:02:10 flxd Exp $"); #include #include @@ -63,6 +63,12 @@ static const struct siop_product_desc si SF_PCI_RL | SF_PCI_BOF | SF_CHIP_PF | SF_CHIP_LS, 4, 8, 3, 250, 0 }, + { PCI_PRODUCT_SYMBIOS_810AP, + 0x00, + "Symbios Logic 53c810ap (fast scsi)", + SF_PCI_RL | SF_PCI_BOF | SF_CHIP_PF | SF_CHIP_LS, + 4, 8, 3, 250, 0 + }, { PCI_PRODUCT_SYMBIOS_815, 0x00, "Symbios Logic 53c815 (fast scsi)",
CVS commit: src/external/gpl3/gdb/lib
Module Name:src Committed By: christos Date: Mon Oct 17 14:02:21 UTC 2016 Modified Files: src/external/gpl3/gdb/lib/libbfd/arch/powerpc64: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h targmatch.h src/external/gpl3/gdb/lib/libdecnumber/arch/powerpc64: gstdint.h src/external/gpl3/gdb/lib/libgdb/arch/powerpc64: config.h defs.mk init.c jit-reader.h observer.h observer.inc version.c xml-builtin.c src/external/gpl3/gdb/lib/libgdb/arch/powerpc64/build-gnulib: config.h src/external/gpl3/gdb/lib/libiberty/arch/powerpc64: config.h src/external/gpl3/gdb/lib/libopcodes/arch/powerpc64: config.h src/external/gpl3/gdb/lib/libsim/arch/powerpc64: build-config.h config.h Log Message: regen powerpc64 To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gdb/lib/libbfd/arch/powerpc64/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/powerpc64/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/powerpc64/bfd_stdint.h \ src/external/gpl3/gdb/lib/libbfd/arch/powerpc64/bfdver.h \ src/external/gpl3/gdb/lib/libbfd/arch/powerpc64/config.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libbfd/arch/powerpc64/targmatch.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gdb/lib/libdecnumber/arch/powerpc64/gstdint.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gdb/lib/libgdb/arch/powerpc64/config.h \ src/external/gpl3/gdb/lib/libgdb/arch/powerpc64/version.c \ src/external/gpl3/gdb/lib/libgdb/arch/powerpc64/xml-builtin.c cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libgdb/arch/powerpc64/defs.mk \ src/external/gpl3/gdb/lib/libgdb/arch/powerpc64/init.c cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libgdb/arch/powerpc64/jit-reader.h cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/gdb/lib/libgdb/arch/powerpc64/observer.h \ src/external/gpl3/gdb/lib/libgdb/arch/powerpc64/observer.inc cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/gdb/lib/libgdb/arch/powerpc64/build-gnulib/config.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gdb/lib/libiberty/arch/powerpc64/config.h cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/gdb/lib/libopcodes/arch/powerpc64/config.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libsim/arch/powerpc64/build-config.h \ src/external/gpl3/gdb/lib/libsim/arch/powerpc64/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gdb/lib/libbfd/arch/powerpc64/bfd-in3.h diff -u src/external/gpl3/gdb/lib/libbfd/arch/powerpc64/bfd-in3.h:1.5 src/external/gpl3/gdb/lib/libbfd/arch/powerpc64/bfd-in3.h:1.6 --- src/external/gpl3/gdb/lib/libbfd/arch/powerpc64/bfd-in3.h:1.5 Wed Feb 3 17:13:37 2016 +++ src/external/gpl3/gdb/lib/libbfd/arch/powerpc64/bfd-in3.h Mon Oct 17 10:02:20 2016 @@ -1,5 +1,5 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-gdb,v 1.6 2013/10/03 18:58:37 christos Exp */ +/* Generated from: NetBSD: mknative-gdb,v 1.7 2016/10/16 04:37:42 mrg Exp */ /* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp */ /* DO NOT EDIT! -*- buffer-read-only: t -*- This file is automatically @@ -11,7 +11,7 @@ /* Main header file for the bfd library -- portable access to object files. - Copyright (C) 1990-2015 Free Software Foundation, Inc. + Copyright (C) 1990-2016 Free Software Foundation, Inc. Contributed by Cygnus Support. @@ -267,7 +267,7 @@ struct orl /* Output ranlib. */ } u; /* bfd* or file position. */ int namidx; /* Index into string table. */ }; - + /* Linenumber stuff. */ typedef struct lineno_cache_entry { @@ -281,11 +281,19 @@ typedef struct lineno_cache_entry alent; /* Object and core file sections. */ +typedef struct bfd_section *sec_ptr; #define align_power(addr, align) \ - (((addr) + ((bfd_vma) 1 << (align)) - 1) & ((bfd_vma) -1 << (align))) + (((addr) + ((bfd_vma) 1 << (align)) - 1) & (-((bfd_vma) 1 << (align -typedef struct bfd_section *sec_ptr; +/* Align an address upward to a boundary, expressed as a number of bytes. + E.g. align to an 8-byte boundary with argument of 8. Take care never + to wrap around if the address is within boundary-1 of the end of the + address space. */ +#define BFD_ALIGN(this, boundary) \ + bfd_vma) (this) + (boundary) - 1) >= (bfd_vma) (this)) \ + ? (((bfd_vma) (this) + ((boundary) - 1)) & ~ (bfd_vma) ((boundary)-1)) \ + : ~ (bfd_vma) 0) #define bfd_get_section_name(bfd, ptr) ((void) bfd, (ptr)->name) #define bfd_get_section_vma(bfd, ptr) ((void) bfd, (ptr)->vma) @@ -522,7 +530,6 @@ extern void warn_deprecated (const char #define bfd_get_file_flags(abfd) ((abfd)->flags) #define bfd_applicable_file_flags(abfd) ((abfd)->xvec->object_flags) #define bfd_applicable_section_flags(abfd) ((abfd)->xve
CVS commit: src/sys/arch
Module Name:src Committed By: ryo Date: Mon Oct 17 10:36:57 UTC 2016 Modified Files: src/sys/arch/arm/imx: files.imx7 src/sys/arch/evbarm/conf: ARMADILLO-IOT-G3 std.imx7 src/sys/arch/evbarm/imx7: imx7_machdep.c Log Message: * Add option MEMSIZE_RESERVED to reserves memory for Cortex-M4 area * change KERNEL_BASE from 0x80008000 to 0x8200 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/files.imx7 cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3 cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/std.imx7 cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/imx7/imx7_machdep.c 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/arm/imx/files.imx7 diff -u src/sys/arch/arm/imx/files.imx7:1.1 src/sys/arch/arm/imx/files.imx7:1.2 --- src/sys/arch/arm/imx/files.imx7:1.1 Tue May 17 06:44:45 2016 +++ src/sys/arch/arm/imx/files.imx7 Mon Oct 17 10:36:56 2016 @@ -1,4 +1,4 @@ -# $NetBSD: files.imx7,v 1.1 2016/05/17 06:44:45 ryo Exp $ +# $NetBSD: files.imx7,v 1.2 2016/10/17 10:36:56 ryo Exp $ # # Configuration info for the Freescale i.MX7 # @@ -7,6 +7,7 @@ include "arch/arm/pic/files.pic" include "arch/arm/cortex/files.cortex" defparam opt_imx.hMEMSIZE +defparam opt_imx.hMEMSIZE_RESERVED defflag opt_imx.hIMX7 file arch/arm/arm32/arm32_boot.c Index: src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3 diff -u src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.2 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.3 --- src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.2 Sun Aug 7 10:44:05 2016 +++ src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3 Mon Oct 17 10:36:56 2016 @@ -1,4 +1,4 @@ -# $NetBSD: ARMADILLO-IOT-G3,v 1.2 2016/08/07 10:44:05 christos Exp $ +# $NetBSD: ARMADILLO-IOT-G3,v 1.3 2016/10/17 10:36:56 ryo Exp $ # # ARMADILLO-IOT-G3 -- Atmark Techno, Armadillo-IoT G3 # @@ -22,6 +22,7 @@ options MULTIPROCESSOR options PMAPCOUNTERS options MEMSIZE=512 +options MEMSIZE_RESERVED=32 # only reserved 32M for Cortex-M4 core # Standard system options Index: src/sys/arch/evbarm/conf/std.imx7 diff -u src/sys/arch/evbarm/conf/std.imx7:1.1 src/sys/arch/evbarm/conf/std.imx7:1.2 --- src/sys/arch/evbarm/conf/std.imx7:1.1 Tue May 17 06:44:46 2016 +++ src/sys/arch/evbarm/conf/std.imx7 Mon Oct 17 10:36:56 2016 @@ -1,4 +1,4 @@ -# $NetBSD: std.imx7,v 1.1 2016/05/17 06:44:46 ryo Exp $ +# $NetBSD: std.imx7,v 1.2 2016/10/17 10:36:56 ryo Exp $ # # standard NetBSD/evbarm options for i.MX7 board @@ -25,8 +25,8 @@ options CORTEX_PMC options CORTEX_PMC_CCNT_HZ=79200 options KERNEL_BASE_EXT=0x8000 -makeoptions KERNEL_BASE_PHYS="0x80008000" -makeoptions KERNEL_BASE_VIRT="0x80008000" +makeoptions KERNEL_BASE_PHYS="0x8200" +makeoptions KERNEL_BASE_VIRT="0x8200" makeoptions BOARDMKFRAG="${THISARM}/conf/mk.imx7" makeoptions CPPFLAGS+="-I$S/../../../include" Index: src/sys/arch/evbarm/imx7/imx7_machdep.c diff -u src/sys/arch/evbarm/imx7/imx7_machdep.c:1.3 src/sys/arch/evbarm/imx7/imx7_machdep.c:1.4 --- src/sys/arch/evbarm/imx7/imx7_machdep.c:1.3 Mon May 30 17:43:46 2016 +++ src/sys/arch/evbarm/imx7/imx7_machdep.c Mon Oct 17 10:36:57 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: imx7_machdep.c,v 1.3 2016/05/30 17:43:46 dholland Exp $ */ +/* $NetBSD: imx7_machdep.c,v 1.4 2016/10/17 10:36:57 ryo Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: imx7_machdep.c,v 1.3 2016/05/30 17:43:46 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imx7_machdep.c,v 1.4 2016/10/17 10:36:57 ryo Exp $"); #include "opt_evbarm_boardtype.h" #include "opt_arm_debug.h" @@ -220,7 +220,14 @@ initarm(void *arg) #endif bootconfig.dramblocks = 1; +#ifdef MEMSIZE_RESERVED + /* reserved for Cortex-M4 core */ + memsize -= MEMSIZE_RESERVED * 1024 * 1024; + bootconfig.dram[0].address = KERN_VTOPHYS(KERNEL_BASE) + + MEMSIZE_RESERVED * 1024 * 1024; +#else bootconfig.dram[0].address = KERN_VTOPHYS(KERNEL_BASE); +#endif bootconfig.dram[0].pages = memsize / PAGE_SIZE; #ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
CVS commit: src/sys/arch/arm/imx
Module Name:src Committed By: ryo Date: Mon Oct 17 09:21:51 UTC 2016 Modified Files: src/sys/arch/arm/imx: imx7_ccmreg.h imx7_gpcreg.h imx7_srcreg.h Added Files: src/sys/arch/arm/imx: imx7_rdcreg.h Log Message: add more register definitions. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/imx7_ccmreg.h \ src/sys/arch/arm/imx/imx7_gpcreg.h src/sys/arch/arm/imx/imx7_srcreg.h cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/imx/imx7_rdcreg.h 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/arm/imx/imx7_ccmreg.h diff -u src/sys/arch/arm/imx/imx7_ccmreg.h:1.1 src/sys/arch/arm/imx/imx7_ccmreg.h:1.2 --- src/sys/arch/arm/imx/imx7_ccmreg.h:1.1 Tue May 17 06:44:45 2016 +++ src/sys/arch/arm/imx/imx7_ccmreg.h Mon Oct 17 09:21:51 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: imx7_ccmreg.h,v 1.1 2016/05/17 06:44:45 ryo Exp $ */ +/* $NetBSD: imx7_ccmreg.h,v 1.2 2016/10/17 09:21:51 ryo Exp $ */ /* * Copyright (c) 2015 Internet Initiative Japan, Inc. @@ -974,6 +974,10 @@ #define CCM_CCGR190_TOG 0x4bec /* CCGR mapping */ +#define CCM_CCGR_M4 CCM_CCGR1 +#define CCM_CCGR_M4_SET (CCM_CCGR_M4 + 4) +#define CCM_CCGR_M4_CLR (CCM_CCGR_M4 + 8) +#define CCM_CCGR_M4_TOG (CCM_CCGR_M4 + 12) #define CCM_CCGR_SIM_MAIN CCM_CCGR4 #define CCM_CCGR_SIM_MAIN_SET (CCM_CCGR_SIM_MAIN + 4) #define CCM_CCGR_SIM_MAIN_CLR (CCM_CCGR_SIM_MAIN + 8) Index: src/sys/arch/arm/imx/imx7_gpcreg.h diff -u src/sys/arch/arm/imx/imx7_gpcreg.h:1.1 src/sys/arch/arm/imx/imx7_gpcreg.h:1.2 --- src/sys/arch/arm/imx/imx7_gpcreg.h:1.1 Tue May 17 06:44:45 2016 +++ src/sys/arch/arm/imx/imx7_gpcreg.h Mon Oct 17 09:21:51 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: imx7_gpcreg.h,v 1.1 2016/05/17 06:44:45 ryo Exp $ */ +/* $NetBSD: imx7_gpcreg.h,v 1.2 2016/10/17 09:21:51 ryo Exp $ */ /* * Copyright (c) 2015 Internet Initiative Japan, Inc. @@ -59,6 +59,8 @@ #define GPC_PGC_ACK_SEL_A7_A7_PGC_PUP_ACK __BIT(31) #define GPC_PGC_ACK_SEL_A7_A7_PGC_PDN_ACK __BIT(15) #define GPC_PGC_ACK_SEL_M40x0028 +#define GPC_PGC_ACK_SEL_M4_M4_DUMMY_PGC_PUP_ACK __BIT(31) +#define GPC_PGC_ACK_SEL_M4_M4_DUMMY_PGC_PDN_ACK __BIT(15) #define GPC_MISC 0x002c #define GPC_IMR1_CORE0_A70x0030 #define GPC_IMR2_CORE0_A70x0034 @@ -92,6 +94,7 @@ #define GPC_SLT9_CFG 0x00d4 #define GPC_PGC_CPU_MAPPING0x00ec #define GPC_PGC_CPU_MAPPING_FASTMEGA_A7_DOMAIN __BIT(0) +#define GPC_PGC_CPU_MAPPING_FASTMEGA_M4_DOMAIN __BIT(8) #define GPC_CPU_PGC_SW_PUP_REQ0x00f0 #define GPC_PU_PGC_SW_PUP_REQ0x00f8 #define GPC_CPU_PGC_SW_PDN_REQ0x00fc Index: src/sys/arch/arm/imx/imx7_srcreg.h diff -u src/sys/arch/arm/imx/imx7_srcreg.h:1.1 src/sys/arch/arm/imx/imx7_srcreg.h:1.2 --- src/sys/arch/arm/imx/imx7_srcreg.h:1.1 Tue May 17 06:44:45 2016 +++ src/sys/arch/arm/imx/imx7_srcreg.h Mon Oct 17 09:21:51 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: imx7_srcreg.h,v 1.1 2016/05/17 06:44:45 ryo Exp $ */ +/* $NetBSD: imx7_srcreg.h,v 1.2 2016/10/17 09:21:51 ryo Exp $ */ /* * Copyright (c) 2015 Internet Initiative Japan, Inc. @@ -45,6 +45,7 @@ #define SRC_M4RCR_ENABLE_M4 __BIT(3) #define SRC_M4RCR_SW_M4P_RST __BIT(2) #define SRC_M4RCR_SW_M4C_RST __BIT(1) +#define SRC_M4RCR_SW_M4C_NON_SCLR_RST __BIT(0) #define SRC_ERCR0x0014 #define SRC_HSICPHY_RCR0x001c #define SRC_HSICPHY_PORT_RST __BIT(1) Added files: Index: src/sys/arch/arm/imx/imx7_rdcreg.h diff -u /dev/null src/sys/arch/arm/imx/imx7_rdcreg.h:1.1 --- /dev/null Mon Oct 17 09:21:51 2016 +++ src/sys/arch/arm/imx/imx7_rdcreg.h Mon Oct 17 09:21:51 2016 @@ -0,0 +1,643 @@ +/* $NetBSD: imx7_rdcreg.h,v 1.1 2016/10/17 09:21:51 ryo Exp $ */ + +/* + * Copyright (c) 2016 Ryo Shimizu + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR