CVS commit: src/sys/arch
Module Name:src Committed By: jmcneill Date: Mon Aug 12 23:31:48 UTC 2019 Modified Files: src/sys/arch/aarch64/include: armreg.h src/sys/arch/arm/cortex: gtmr.c gtmr_var.h src/sys/arch/arm/include: armreg.h Log Message: Add support for physical timers and sprinkle isb where needed. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/aarch64/include/armreg.h cvs rdiff -u -r1.40 -r1.41 src/sys/arch/arm/cortex/gtmr.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/cortex/gtmr_var.h cvs rdiff -u -r1.127 -r1.128 src/sys/arch/arm/include/armreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Aug 12 17:33:25 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #46 - #48 To generate a diff of this commit: cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.14 src/doc/CHANGES-9.0:1.1.2.15 --- src/doc/CHANGES-9.0:1.1.2.14 Sun Aug 11 10:13:30 2019 +++ src/doc/CHANGES-9.0 Mon Aug 12 17:33:25 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.14 2019/08/11 10:13:30 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.15 2019/08/12 17:33:25 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -1625,3 +1625,19 @@ usr.sbin/npf/npfctl/npf_show.c 1.29 representation. [rmind, ticket #45] +external/mit/xorg/lib/libdrm/Makefile 1.17 + + Fix makefile bug so we link against libm as intended. + [maya, ticket #46] + +external/gpl3/gdb/dist/gdb/auxv.c 1.2 + + On NetBSD the auxv tag is always 32 bits long. + [christos, ticket #47] + +sys/arch/arm/acpi/acpi_machdep.c 1.9,1.10 + + Correct the test for writeable memory. + Use same style test as acpi_md_OsWritable + [skrll, ticket #48] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Aug 12 17:33:25 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #46 - #48 To generate a diff of this commit: cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/arch/arm/acpi
Module Name:src Committed By: martin Date: Mon Aug 12 17:32:09 UTC 2019 Modified Files: src/sys/arch/arm/acpi [netbsd-9]: acpi_machdep.c Log Message: Pull up following revision(s) (requested by skrll in ticket #48): sys/arch/arm/acpi/acpi_machdep.c: revision 1.9 sys/arch/arm/acpi/acpi_machdep.c: revision 1.10 Correct the test for writeable memory. There aren't any users of this at this point. Use same style test as acpi_md_OsWritable To generate a diff of this commit: cvs rdiff -u -r1.6.6.1 -r1.6.6.2 src/sys/arch/arm/acpi/acpi_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/arch/arm/acpi
Module Name:src
Committed By: martin
Date: Mon Aug 12 17:32:09 UTC 2019
Modified Files:
src/sys/arch/arm/acpi [netbsd-9]: acpi_machdep.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #48):
sys/arch/arm/acpi/acpi_machdep.c: revision 1.9
sys/arch/arm/acpi/acpi_machdep.c: revision 1.10
Correct the test for writeable memory. There aren't any users of this at
this point.
Use same style test as acpi_md_OsWritable
To generate a diff of this commit:
cvs rdiff -u -r1.6.6.1 -r1.6.6.2 src/sys/arch/arm/acpi/acpi_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/acpi/acpi_machdep.c
diff -u src/sys/arch/arm/acpi/acpi_machdep.c:1.6.6.1 src/sys/arch/arm/acpi/acpi_machdep.c:1.6.6.2
--- src/sys/arch/arm/acpi/acpi_machdep.c:1.6.6.1 Sun Aug 4 11:37:56 2019
+++ src/sys/arch/arm/acpi/acpi_machdep.c Mon Aug 12 17:32:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_machdep.c,v 1.6.6.1 2019/08/04 11:37:56 martin Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.6.6.2 2019/08/12 17:32:09 martin Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include "pci.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.6.6.1 2019/08/04 11:37:56 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.6.6.2 2019/08/12 17:32:09 martin Exp $");
#include
#include
@@ -210,7 +210,7 @@ acpi_md_OsReadable(void *va, UINT32 len)
for (; sva < eva; sva += PAGE_SIZE) {
pte = kvtopte(sva);
- if ((*pte & (LX_BLKPAG_AF|LX_BLKPAG_AP_RO)) != (LX_BLKPAG_AF|LX_BLKPAG_AP_RO))
+ if ((*pte & (LX_BLKPAG_AF|LX_BLKPAG_AP)) != (LX_BLKPAG_AF|LX_BLKPAG_AP_RO))
return FALSE;
}
@@ -231,7 +231,7 @@ acpi_md_OsWritable(void *va, UINT32 len)
for (; sva < eva; sva += PAGE_SIZE) {
pte = kvtopte(sva);
- if ((*pte & (LX_BLKPAG_AF|LX_BLKPAG_AP_RW)) != (LX_BLKPAG_AF|LX_BLKPAG_AP_RW))
+ if ((*pte & (LX_BLKPAG_AF|LX_BLKPAG_AP)) != (LX_BLKPAG_AF|LX_BLKPAG_AP_RW))
return FALSE;
}
CVS commit: [netbsd-9] src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: martin Date: Mon Aug 12 17:29:46 UTC 2019 Modified Files: src/external/gpl3/gdb/dist/gdb [netbsd-9]: auxv.c Log Message: Pull up following revision(s) (requested by christos in ticket #47): external/gpl3/gdb/dist/gdb/auxv.c: revision 1.2 On NetBSD the auxv tag is always 32 bits long. Gdb assumes it is 64 on _LP64. This works most of the time, except for 64 bit big endian (sparc64 eg). To generate a diff of this commit: cvs rdiff -u -r1.1.1.7 -r1.1.1.7.2.1 src/external/gpl3/gdb/dist/gdb/auxv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/external/mit/xorg/lib/libdrm
Module Name:src
Committed By: martin
Date: Mon Aug 12 17:23:20 UTC 2019
Modified Files:
src/external/mit/xorg/lib/libdrm [netbsd-9]: Makefile
Log Message:
Pull up following revision(s) (requested by maya in ticket #46):
external/mit/xorg/lib/libdrm/Makefile: revision 1.17
We need to link against libm for real, not just in spirit.
XXX pullup-9
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.2.1 src/external/mit/xorg/lib/libdrm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libdrm/Makefile
diff -u src/external/mit/xorg/lib/libdrm/Makefile:1.16 src/external/mit/xorg/lib/libdrm/Makefile:1.16.2.1
--- src/external/mit/xorg/lib/libdrm/Makefile:1.16 Sun Sep 9 01:53:23 2018
+++ src/external/mit/xorg/lib/libdrm/Makefile Mon Aug 12 17:23:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2018/09/09 01:53:23 riastradh Exp $
+# $NetBSD: Makefile,v 1.16.2.1 2019/08/12 17:23:20 martin Exp $
.include
@@ -23,7 +23,7 @@ COPTS.xf86drm.c+= ${${ACTIVE_CC} == "cla
CWARNFLAGS.clang+= -Wno-conversion -Wno-tautological-compare
LIBDPLIBS= m ${.CURDIR}/../../../../../lib/libm
-LIBDPLIBS= pci ${.CURDIR}/../../../../../lib/libpci
+LIBDPLIBS+= pci ${.CURDIR}/../../../../../lib/libpci
.if 0
MAN= drm.7 \
CVS commit: [netbsd-9] src/external/mit/xorg/lib/libdrm
Module Name:src Committed By: martin Date: Mon Aug 12 17:23:20 UTC 2019 Modified Files: src/external/mit/xorg/lib/libdrm [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by maya in ticket #46): external/mit/xorg/lib/libdrm/Makefile: revision 1.17 We need to link against libm for real, not just in spirit. XXX pullup-9 To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.16.2.1 src/external/mit/xorg/lib/libdrm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Aug 12 17:20:03 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Ticket #1334 To generate a diff of this commit: cvs rdiff -u -r1.1.2.23 -r1.1.2.24 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.2 diff -u src/doc/CHANGES-8.2:1.1.2.23 src/doc/CHANGES-8.2:1.1.2.24 --- src/doc/CHANGES-8.2:1.1.2.23 Sun Aug 11 10:05:06 2019 +++ src/doc/CHANGES-8.2 Mon Aug 12 17:20:03 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.2,v 1.1.2.23 2019/08/11 10:05:06 martin Exp $ +# $NetBSD: CHANGES-8.2,v 1.1.2.24 2019/08/12 17:20:03 martin Exp $ A complete list of changes from the NetBSD 8.1 release to the NetBSD 8.2 release: @@ -555,3 +555,9 @@ sys/kern/sys_lwp.c1.69 (patch) Fix info leak in sys___sigaltstack14(). [maxv, ticket #1333] +sys/dev/usb/ohci.c1.289 +sys/dev/usb/ohci.c1.290 + + Adjust KASSERT()s to handle polling case. + [mrg, ticket #1334] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Aug 12 17:20:03 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Ticket #1334 To generate a diff of this commit: cvs rdiff -u -r1.1.2.23 -r1.1.2.24 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Mon Aug 12 17:19:02 UTC 2019
Modified Files:
src/sys/dev/usb [netbsd-8]: ohci.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1334):
sys/dev/usb/ohci.c: revision 1.289
sys/dev/usb/ohci.c: revision 1.290
adjust KASSERT() for sc_lock to handle polling case.
should fix usb kdb in ddb. reported by martin.
-
relax an assert to be mutex_owned || polling.
half of the patch i sent for netbsd-8 in PR#54331.
the other half is already applied.
To generate a diff of this commit:
cvs rdiff -u -r1.273.6.4 -r1.273.6.5 src/sys/dev/usb/ohci.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/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.273.6.4 src/sys/dev/usb/ohci.c:1.273.6.5
--- src/sys/dev/usb/ohci.c:1.273.6.4 Thu Sep 27 14:52:26 2018
+++ src/sys/dev/usb/ohci.c Mon Aug 12 17:19:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.273.6.4 2018/09/27 14:52:26 martin Exp $ */
+/* $NetBSD: ohci.c,v 1.273.6.5 2019/08/12 17:19:02 martin Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.273.6.4 2018/09/27 14:52:26 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.273.6.5 2019/08/12 17:19:02 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -587,7 +587,7 @@ ohci_reset_std_chain(ohci_softc_t *sc, s
OHCIHIST_FUNC(); OHCIHIST_CALLED();
DPRINTF("start len=%jd", alen, 0, 0, 0);
- KASSERT(mutex_owned(>sc_lock));
+ KASSERT(sc->sc_bus.ub_usepolling || mutex_owned(>sc_lock));
DPRINTFN(8, "addr=%jd endpt=%jd len=%jd speed=%jd",
xfer->ux_pipe->up_dev->ud_addr,
@@ -1675,7 +1675,7 @@ ohci_device_bulk_done(struct usbd_xfer *
int isread =
(UE_GET_DIR(xfer->ux_pipe->up_endpoint->ue_edesc->bEndpointAddress) == UE_DIR_IN);
- KASSERT(mutex_owned(>sc_lock));
+ KASSERT(sc->sc_bus.ub_usepolling || mutex_owned(>sc_lock));
OHCIHIST_FUNC(); OHCIHIST_CALLED();
DPRINTFN(10, "xfer=%#jx, actlen=%jd", (uintptr_t)xfer, xfer->ux_actlen,
CVS commit: [netbsd-8] src/sys/dev/usb
Module Name:src Committed By: martin Date: Mon Aug 12 17:19:02 UTC 2019 Modified Files: src/sys/dev/usb [netbsd-8]: ohci.c Log Message: Pull up following revision(s) (requested by mrg in ticket #1334): sys/dev/usb/ohci.c: revision 1.289 sys/dev/usb/ohci.c: revision 1.290 adjust KASSERT() for sc_lock to handle polling case. should fix usb kdb in ddb. reported by martin. - relax an assert to be mutex_owned || polling. half of the patch i sent for netbsd-8 in PR#54331. the other half is already applied. To generate a diff of this commit: cvs rdiff -u -r1.273.6.4 -r1.273.6.5 src/sys/dev/usb/ohci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src Committed By: skrll Date: Mon Aug 12 15:47:02 UTC 2019 Modified Files: src/sys/arch/aarch64/aarch64: efi_machdep.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/aarch64/aarch64/efi_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src
Committed By: skrll
Date: Mon Aug 12 15:47:02 UTC 2019
Modified Files:
src/sys/arch/aarch64/aarch64: efi_machdep.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/aarch64/aarch64/efi_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/aarch64/aarch64/efi_machdep.c
diff -u src/sys/arch/aarch64/aarch64/efi_machdep.c:1.3 src/sys/arch/aarch64/aarch64/efi_machdep.c:1.4
--- src/sys/arch/aarch64/aarch64/efi_machdep.c:1.3 Wed Oct 31 14:15:12 2018
+++ src/sys/arch/aarch64/aarch64/efi_machdep.c Mon Aug 12 15:47:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: efi_machdep.c,v 1.3 2018/10/31 14:15:12 jmcneill Exp $ */
+/* $NetBSD: efi_machdep.c,v 1.4 2019/08/12 15:47:02 skrll Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: efi_machdep.c,v 1.3 2018/10/31 14:15:12 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efi_machdep.c,v 1.4 2019/08/12 15:47:02 skrll Exp $");
#include
#include
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: efi_machdep.
void
arm_efirt_md_map_range(vaddr_t va, paddr_t pa, size_t sz, enum arm_efirt_mem_type type)
-{
+{
pt_entry_t attr;
switch (type) {
CVS commit: src/sys/arch/arm/acpi
Module Name:src
Committed By: skrll
Date: Mon Aug 12 15:37:26 UTC 2019
Modified Files:
src/sys/arch/arm/acpi: acpi_machdep.c
Log Message:
Use same style test as acpi_md_OsWritable
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/acpi/acpi_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/acpi/acpi_machdep.c
diff -u src/sys/arch/arm/acpi/acpi_machdep.c:1.9 src/sys/arch/arm/acpi/acpi_machdep.c:1.10
--- src/sys/arch/arm/acpi/acpi_machdep.c:1.9 Mon Aug 12 15:29:48 2019
+++ src/sys/arch/arm/acpi/acpi_machdep.c Mon Aug 12 15:37:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_machdep.c,v 1.9 2019/08/12 15:29:48 skrll Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.10 2019/08/12 15:37:26 skrll Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include "pci.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.9 2019/08/12 15:29:48 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.10 2019/08/12 15:37:26 skrll Exp $");
#include
#include
@@ -210,7 +210,7 @@ acpi_md_OsReadable(void *va, UINT32 len)
for (; sva < eva; sva += PAGE_SIZE) {
pte = kvtopte(sva);
- if ((*pte & (LX_BLKPAG_AF|LX_BLKPAG_AP_RO)) != (LX_BLKPAG_AF|LX_BLKPAG_AP_RO))
+ if ((*pte & (LX_BLKPAG_AF|LX_BLKPAG_AP)) != (LX_BLKPAG_AF|LX_BLKPAG_AP_RO))
return FALSE;
}
CVS commit: src/sys/arch/arm/acpi
Module Name:src Committed By: skrll Date: Mon Aug 12 15:37:26 UTC 2019 Modified Files: src/sys/arch/arm/acpi: acpi_machdep.c Log Message: Use same style test as acpi_md_OsWritable To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/acpi/acpi_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/acpi
Module Name:src Committed By: skrll Date: Mon Aug 12 15:29:48 UTC 2019 Modified Files: src/sys/arch/arm/acpi: acpi_machdep.c Log Message: Correct the test for writeable memory. There aren't any users of this at this point. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/acpi/acpi_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/acpi
Module Name:src
Committed By: skrll
Date: Mon Aug 12 15:29:48 UTC 2019
Modified Files:
src/sys/arch/arm/acpi: acpi_machdep.c
Log Message:
Correct the test for writeable memory. There aren't any users of this at
this point.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/acpi/acpi_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/acpi/acpi_machdep.c
diff -u src/sys/arch/arm/acpi/acpi_machdep.c:1.8 src/sys/arch/arm/acpi/acpi_machdep.c:1.9
--- src/sys/arch/arm/acpi/acpi_machdep.c:1.8 Thu Aug 1 18:59:10 2019
+++ src/sys/arch/arm/acpi/acpi_machdep.c Mon Aug 12 15:29:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_machdep.c,v 1.8 2019/08/01 18:59:10 jmcneill Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.9 2019/08/12 15:29:48 skrll Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include "pci.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.8 2019/08/01 18:59:10 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.9 2019/08/12 15:29:48 skrll Exp $");
#include
#include
@@ -231,7 +231,7 @@ acpi_md_OsWritable(void *va, UINT32 len)
for (; sva < eva; sva += PAGE_SIZE) {
pte = kvtopte(sva);
- if ((*pte & (LX_BLKPAG_AF|LX_BLKPAG_AP_RW)) != (LX_BLKPAG_AF|LX_BLKPAG_AP_RW))
+ if ((*pte & (LX_BLKPAG_AF|LX_BLKPAG_AP)) != (LX_BLKPAG_AF|LX_BLKPAG_AP_RW))
return FALSE;
}
CVS commit: src/external/mit/xorg/lib/libdrm
Module Name:src
Committed By: maya
Date: Mon Aug 12 14:21:54 UTC 2019
Modified Files:
src/external/mit/xorg/lib/libdrm: Makefile
Log Message:
We need to link against libm for real, not just in spirit.
XXX pullup-9
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/lib/libdrm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libdrm/Makefile
diff -u src/external/mit/xorg/lib/libdrm/Makefile:1.16 src/external/mit/xorg/lib/libdrm/Makefile:1.17
--- src/external/mit/xorg/lib/libdrm/Makefile:1.16 Sun Sep 9 01:53:23 2018
+++ src/external/mit/xorg/lib/libdrm/Makefile Mon Aug 12 14:21:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2018/09/09 01:53:23 riastradh Exp $
+# $NetBSD: Makefile,v 1.17 2019/08/12 14:21:54 maya Exp $
.include
@@ -23,7 +23,7 @@ COPTS.xf86drm.c+= ${${ACTIVE_CC} == "cla
CWARNFLAGS.clang+= -Wno-conversion -Wno-tautological-compare
LIBDPLIBS= m ${.CURDIR}/../../../../../lib/libm
-LIBDPLIBS= pci ${.CURDIR}/../../../../../lib/libpci
+LIBDPLIBS+= pci ${.CURDIR}/../../../../../lib/libpci
.if 0
MAN= drm.7 \
CVS commit: src/external/mit/xorg/lib/libdrm
Module Name:src Committed By: maya Date: Mon Aug 12 14:21:54 UTC 2019 Modified Files: src/external/mit/xorg/lib/libdrm: Makefile Log Message: We need to link against libm for real, not just in spirit. XXX pullup-9 To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/lib/libdrm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: skrll Date: Mon Aug 12 11:46:40 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: IMX Log Message: Add a9ptmr To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/IMX Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: skrll Date: Mon Aug 12 11:45:53 UTC 2019 Modified Files: src/sys/arch/arm/imx/fdt: files.imx6 src/sys/arch/evbarm/conf: files.imx Log Message: Rearrange so that sys/arch/arm/imx/fdt/files.imx6 can be included by sys/arch/evbarm/conf/files.generic To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/imx/fdt/files.imx6 cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/files.imx 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/fdt/files.imx6 diff -u src/sys/arch/arm/imx/fdt/files.imx6:1.4 src/sys/arch/arm/imx/fdt/files.imx6:1.5 --- src/sys/arch/arm/imx/fdt/files.imx6:1.4 Tue Jul 30 06:52:57 2019 +++ src/sys/arch/arm/imx/fdt/files.imx6 Mon Aug 12 11:45:53 2019 @@ -1,16 +1,8 @@ -# $NetBSD: files.imx6,v 1.4 2019/07/30 06:52:57 hkenken Exp $ +# $NetBSD: files.imx6,v 1.5 2019/08/12 11:45:53 skrll Exp $ # # Configuration info for the Freescale i.MX6 # -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/arm/arm32/armv7_generic_space.c -file arch/arm/arm/arm_generic_dma.c -file arch/arm/arm/bus_space_a4x.S - file arch/arm/imx/fdt/imx6_platform.c soc_imx # SOC parameters Index: src/sys/arch/evbarm/conf/files.imx diff -u src/sys/arch/evbarm/conf/files.imx:1.1 src/sys/arch/evbarm/conf/files.imx:1.2 --- src/sys/arch/evbarm/conf/files.imx:1.1 Wed Jul 24 13:12:34 2019 +++ src/sys/arch/evbarm/conf/files.imx Mon Aug 12 11:45:53 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.imx,v 1.1 2019/07/24 13:12:34 hkenken Exp $ +# $NetBSD: files.imx,v 1.2 2019/08/12 11:45:53 skrll Exp $ # # NXP(Freescale) i.MX configuration info # @@ -8,5 +8,13 @@ include "arch/arm/cortex/files.cortex" include "arch/evbarm/conf/files.fdt" +file arch/arm/arm32/arm32_boot.c arm32 +file arch/arm/arm32/arm32_kvminit.c arm32 +file arch/arm/arm32/arm32_reboot.c arm32 +file arch/arm/arm32/irq_dispatch.S arm32 +file arch/arm/arm32/armv7_generic_space.c arm32 +file arch/arm/arm/arm_generic_dma.c arm32 +file arch/arm/arm/bus_space_a4x.S arm32 + include "arch/arm/imx/fdt/files.imx6"
CVS commit: src/sys/arch
Module Name:src Committed By: skrll Date: Mon Aug 12 11:45:53 UTC 2019 Modified Files: src/sys/arch/arm/imx/fdt: files.imx6 src/sys/arch/evbarm/conf: files.imx Log Message: Rearrange so that sys/arch/arm/imx/fdt/files.imx6 can be included by sys/arch/evbarm/conf/files.generic To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/imx/fdt/files.imx6 cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/files.imx Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: nia Date: Mon Aug 12 11:11:28 UTC 2019 Modified Files: src/share/man/man4: wsdisplay.4 wskbd.4 Log Message: Fix some apparant typos of wscons defines. These don't exist anywhere in /usr/include, but the corrected variants do. No idea why WSMOUSE_EVENT_VERSION is the odd one out. That seems incorrect too. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/share/man/man4/wsdisplay.4 cvs rdiff -u -r1.16 -r1.17 src/share/man/man4/wskbd.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/wsdisplay.4 diff -u src/share/man/man4/wsdisplay.4:1.46 src/share/man/man4/wsdisplay.4:1.47 --- src/share/man/man4/wsdisplay.4:1.46 Sat Jan 13 23:43:46 2018 +++ src/share/man/man4/wsdisplay.4 Mon Aug 12 11:11:28 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: wsdisplay.4,v 1.46 2018/01/13 23:43:46 wiz Exp $ +.\" $NetBSD: wsdisplay.4,v 1.47 2019/08/12 11:11:28 nia Exp $ .\" .\" Copyright (c) 1999 Matthias Drochner. .\" Copyright (c) 2002 Ben Harris. @@ -564,7 +564,7 @@ and is currently 1. All new code should use a call similar to the below to ensure the correct version is returned. .Bd -literal -offset indent -int ver = WSDISPLAY_EVENT_VERSION; +int ver = WSDISPLAYIO_EVENT_VERSION; if (ioctl(fd, WSDISPLAYIO_SETVERSION, ) == -1) err(EXIT_FAILURE, "cannot set version"); .Ed Index: src/share/man/man4/wskbd.4 diff -u src/share/man/man4/wskbd.4:1.16 src/share/man/man4/wskbd.4:1.17 --- src/share/man/man4/wskbd.4:1.16 Sun May 27 12:05:40 2012 +++ src/share/man/man4/wskbd.4 Mon Aug 12 11:11:28 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: wskbd.4,v 1.16 2012/05/27 12:05:40 wiz Exp $ +.\" $NetBSD: wskbd.4,v 1.17 2019/08/12 11:11:28 nia Exp $ .\" .\" Copyright (c) 1999 .\" Matthias Drochner. All rights reserved. @@ -142,12 +142,12 @@ Set the wscons_event protocol version. The default is 0 for binary compatibility. The latest version is always available as -.Dv WSKBD_EVENT_VERSION , +.Dv WSKBDIO_EVENT_VERSION , and is currently 1. All new code should use a call similar to the below to ensure the correct version is returned. .Bd -literal -offset indent -int ver = WSKBD_EVENT_VERSION; +int ver = WSKBDIO_EVENT_VERSION; if (ioctl(fd, WSKBDIO_SETVERSION, ) == -1) err(EXIT_FAILURE, "cannot set version"); .Ed
CVS commit: src/share/man/man4
Module Name:src Committed By: nia Date: Mon Aug 12 11:11:28 UTC 2019 Modified Files: src/share/man/man4: wsdisplay.4 wskbd.4 Log Message: Fix some apparant typos of wscons defines. These don't exist anywhere in /usr/include, but the corrected variants do. No idea why WSMOUSE_EVENT_VERSION is the odd one out. That seems incorrect too. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/share/man/man4/wsdisplay.4 cvs rdiff -u -r1.16 -r1.17 src/share/man/man4/wskbd.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/aarch64
Module Name:src
Committed By: skrll
Date: Mon Aug 12 10:28:04 UTC 2019
Modified Files:
src/sys/arch/aarch64/aarch64: pmap.c
src/sys/arch/aarch64/include: pmap.h
Log Message:
Use PMAP_DEV in DEVMAP_ENTRY rather than pmap_map_chunk. It's clearer and
means pmap_map_chunk can be made to map other memory types.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/aarch64/aarch64/pmap.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/aarch64/include/pmap.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/aarch64/aarch64/pmap.c
diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.41 src/sys/arch/aarch64/aarch64/pmap.c:1.42
--- src/sys/arch/aarch64/aarch64/pmap.c:1.41 Fri May 17 06:05:07 2019
+++ src/sys/arch/aarch64/aarch64/pmap.c Mon Aug 12 10:28:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.41 2019/05/17 06:05:07 mrg Exp $ */
+/* $NetBSD: pmap.c,v 1.42 2019/08/12 10:28:04 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.41 2019/05/17 06:05:07 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.42 2019/08/12 10:28:04 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
@@ -283,7 +283,7 @@ pmap_map_chunk(vaddr_t va, paddr_t pa, v
blocksize = L2_SIZE;
attr = _pmap_pte_adjust_prot(L2_BLOCK, prot, VM_PROT_ALL, false);
- attr = _pmap_pte_adjust_cacheflags(attr, flags | PMAP_DEV);
+ attr = _pmap_pte_adjust_cacheflags(attr, flags);
/* user cannot execute, and kernel follows the prot */
attr |= (LX_BLKPAG_UXN|LX_BLKPAG_PXN);
if (prot & VM_PROT_EXECUTE)
Index: src/sys/arch/aarch64/include/pmap.h
diff -u src/sys/arch/aarch64/include/pmap.h:1.24 src/sys/arch/aarch64/include/pmap.h:1.25
--- src/sys/arch/aarch64/include/pmap.h:1.24 Mon Apr 8 21:18:22 2019
+++ src/sys/arch/aarch64/include/pmap.h Mon Aug 12 10:28:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.24 2019/04/08 21:18:22 ryo Exp $ */
+/* $NetBSD: pmap.h,v 1.25 2019/08/12 10:28:04 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -207,7 +207,7 @@ paddr_t pmap_alloc_pdp(struct pmap *, st
.pd_pa = DEVMAP_TRUNC_ADDR(pa), \
.pd_size = DEVMAP_ROUND_SIZE(sz), \
.pd_prot = VM_PROT_READ|VM_PROT_WRITE, \
- .pd_flags = PMAP_NOCACHE \
+ .pd_flags = PMAP_DEV \
}
#define DEVMAP_ENTRY_END { 0 }
CVS commit: src/sys/arch/aarch64
Module Name:src Committed By: skrll Date: Mon Aug 12 10:28:04 UTC 2019 Modified Files: src/sys/arch/aarch64/aarch64: pmap.c src/sys/arch/aarch64/include: pmap.h Log Message: Use PMAP_DEV in DEVMAP_ENTRY rather than pmap_map_chunk. It's clearer and means pmap_map_chunk can be made to map other memory types. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/arch/aarch64/aarch64/pmap.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/aarch64/include/pmap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/utils/libhack
Module Name:src Committed By: martin Date: Mon Aug 12 09:34:53 UTC 2019 Modified Files: src/distrib/utils/libhack: strcasecmp.c Log Message: Make this at least work for ASCII strings (there are way more users than libcurses in various crunched environments, so the original assumption of a very limited set of inputs was wrong). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/libhack/strcasecmp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/utils/libhack
Module Name:src
Committed By: martin
Date: Mon Aug 12 09:34:53 UTC 2019
Modified Files:
src/distrib/utils/libhack: strcasecmp.c
Log Message:
Make this at least work for ASCII strings (there are way more users
than libcurses in various crunched environments, so the original assumption
of a very limited set of inputs was wrong).
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/libhack/strcasecmp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/libhack/strcasecmp.c
diff -u src/distrib/utils/libhack/strcasecmp.c:1.1 src/distrib/utils/libhack/strcasecmp.c:1.2
--- src/distrib/utils/libhack/strcasecmp.c:1.1 Sun Jul 28 10:21:18 2019
+++ src/distrib/utils/libhack/strcasecmp.c Mon Aug 12 09:34:53 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: strcasecmp.c,v 1.1 2019/07/28 10:21:18 martin Exp $ */
+/* $NetBSD: strcasecmp.c,v 1.2 2019/08/12 09:34:53 martin Exp $ */
/*
* Written by Martin Husemann
@@ -8,13 +8,21 @@
#include
/*
- * Cheap and dirty strcasecmp() - implements just enough
- * for our libcurses in crunched environments: since we
- * know all compared strings are fixed, uppercase, and plain ASCII,
- * just use strcmp()
+ * Simple strcasecmp, try to avoid pulling in real locales
*/
int
strcasecmp(const char *s1, const char *s2)
{
- return strcmp(s1, s2);
+ unsigned int c1, c2;
+
+ do {
+ c1 = *s1++;
+ c2 = *s2++;
+ if (c1 >= 'A' && c1 <= 'Z')
+ c1 += 'a' - 'A';
+ if (c2 >= 'A' && c2 <= 'Z')
+ c2 += 'a' - 'A';
+ } while (c1 == c2 && c1 != 0 && c2 != 0);
+
+ return ((c1 == c2) ? 0 : ((c1 > c2) ? 1 : -1));
}
CVS commit: src/sys/arch/hppa/include
Module Name:src
Committed By: skrll
Date: Mon Aug 12 09:18:30 UTC 2019
Modified Files:
src/sys/arch/hppa/include: pmap.h
Log Message:
Use __BIT()
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/hppa/include/pmap.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/hppa/include/pmap.h
diff -u src/sys/arch/hppa/include/pmap.h:1.37 src/sys/arch/hppa/include/pmap.h:1.38
--- src/sys/arch/hppa/include/pmap.h:1.37 Mon Jan 7 16:57:28 2013
+++ src/sys/arch/hppa/include/pmap.h Mon Aug 12 09:18:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.37 2013/01/07 16:57:28 chs Exp $ */
+/* $NetBSD: pmap.h,v 1.38 2019/08/12 09:18:30 skrll Exp $ */
/* $OpenBSD: pmap.h,v 1.35 2007/12/14 18:32:23 deraadt Exp $ */
@@ -83,7 +83,7 @@ struct pv_entry { /* locked by its lis
struct pmap *pv_pmap; /* the pmap */
vaddr_t pv_va; /* the virtual address + flags */
#define PV_VAMASK (~(PAGE_SIZE - 1))
-#define PV_KENTER 0x001
+#define PV_KENTER __BIT(0)
struct vm_page *pv_ptp; /* the vm_page of the PTP */
};
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Mon Aug 12 09:18:30 UTC 2019 Modified Files: src/sys/arch/hppa/include: pmap.h Log Message: Use __BIT() To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/arch/hppa/include/pmap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Mon Aug 12 08:52:39 UTC 2019
Modified Files:
src/sys/dev/usb: if_cdce.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/usb/if_cdce.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/usb/if_cdce.c
diff -u src/sys/dev/usb/if_cdce.c:1.63 src/sys/dev/usb/if_cdce.c:1.64
--- src/sys/dev/usb/if_cdce.c:1.63 Sun Aug 11 02:37:03 2019
+++ src/sys/dev/usb/if_cdce.c Mon Aug 12 08:52:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cdce.c,v 1.63 2019/08/11 02:37:03 mrg Exp $ */
+/* $NetBSD: if_cdce.c,v 1.64 2019/08/12 08:52:39 skrll Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.63 2019/08/11 02:37:03 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.64 2019/08/12 08:52:39 skrll Exp $");
#include
#include
@@ -109,7 +109,7 @@ cdce_match(device_t parent, cfdata_t mat
static void
cdce_attach(device_t parent, device_t self, void *aux)
{
- struct usbnet * const un = device_private(self);
+ struct usbnet * const un = device_private(self);
struct usbif_attach_arg *uiaa = aux;
char*devinfop;
struct usbd_device *dev = uiaa->uiaa_device;
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Mon Aug 12 08:52:39 UTC 2019 Modified Files: src/sys/dev/usb: if_cdce.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/dev/usb/if_cdce.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Mon Aug 12 08:40:09 UTC 2019 Modified Files: src/sys/dev/usb: if_smscreg.h Log Message: Fix an unused register field define To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/usb/if_smscreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Mon Aug 12 08:40:09 UTC 2019 Modified Files: src/sys/dev/usb: if_smscreg.h Log Message: Fix an unused register field define To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/usb/if_smscreg.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/if_smscreg.h diff -u src/sys/dev/usb/if_smscreg.h:1.5 src/sys/dev/usb/if_smscreg.h:1.6 --- src/sys/dev/usb/if_smscreg.h:1.5 Thu Aug 21 14:02:10 2014 +++ src/sys/dev/usb/if_smscreg.h Mon Aug 12 08:40:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_smscreg.h,v 1.5 2014/08/21 14:02:10 reinoud Exp $ */ +/* $NetBSD: if_smscreg.h,v 1.6 2019/08/12 08:40:09 skrll Exp $ */ /* $OpenBSD: if_smscreg.h,v 1.2 2012/09/27 12:38:11 jsg Exp $ */ /*- @@ -52,8 +52,8 @@ * * Where the headers have the following fields: * - * TX_CTRL_0 <31:18> Reserved - * TX_CTRL_0 <17:16> Data offset (alignment padding 0-3) + * TX_CTRL_0 <31:21> Reserved + * TX_CTRL_0 <20:16> Data offset (alignment padding 0-3) * TX_CTRL_0 <13> First segment of frame indicator * TX_CTRL_0 <12> Last segment of frame indicator * TX_CTRL_0 <10:0> Buffer size (payload size) @@ -64,7 +64,7 @@ * TX_CTRL_1 <10:0> Packet byte length * */ -#define SMSC_TX_CTRL_0_OFFSET(x) (((x) & 0x3UL) << 16) +#define SMSC_TX_CTRL_0_OFFSET(x) (((x) & 0x1FUL) << 16) #define SMSC_TX_CTRL_0_FIRST_SEG (0x1UL << 13) #define SMSC_TX_CTRL_0_LAST_SEG (0x1UL << 12) #define SMSC_TX_CTRL_0_BUF_SIZE(x) ((x) & 0x07FFUL)
CVS commit: src/distrib
Module Name:src
Committed By: martin
Date: Mon Aug 12 08:04:28 UTC 2019
Modified Files:
src/distrib/common: Makefile.mdset
src/distrib/evbarm/instkernel/instkernel: Makefile
Log Message:
Allow individual MDSETTARGETS/MDSET_SUFFIXES to define optional dependencies
between themselves.
Use that to make netbsd-RPI_INSTALL.img depend on netbsd-RPI_INSTALL.bin,
resolving the parallel build race.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/distrib/common/Makefile.mdset
cvs rdiff -u -r1.31 -r1.32 src/distrib/evbarm/instkernel/instkernel/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.mdset
diff -u src/distrib/common/Makefile.mdset:1.45 src/distrib/common/Makefile.mdset:1.46
--- src/distrib/common/Makefile.mdset:1.45 Sun Aug 11 17:50:26 2019
+++ src/distrib/common/Makefile.mdset Mon Aug 12 08:04:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mdset,v 1.45 2019/08/11 17:50:26 martin Exp $
+# $NetBSD: Makefile.mdset,v 1.46 2019/08/12 08:04:28 martin Exp $
#
# Makefile snippet to ${TOOL_MDSETIMAGE} file system images into kernels
#
@@ -94,7 +94,7 @@ _KERNEL.${_K}.${_F}:= ${_F}
.for _S _C in ${MDSET_SUFFIXES.${_F}} # {
CLEANFILES+= ${_KERNEL.${_K}.${_F}}.${_S}
-${_KERNEL.${_K}.${_F}}.${_S}: ${_KERNEL.${_K}.${_F}}
+${_KERNEL.${_K}.${_F}}.${_S}: ${_KERNEL.${_K}.${_F}} ${MDSET_.${_K}.${_F}.${_S}.deps}
.if defined(${_C})
${${_C}}
.else
Index: src/distrib/evbarm/instkernel/instkernel/Makefile
diff -u src/distrib/evbarm/instkernel/instkernel/Makefile:1.31 src/distrib/evbarm/instkernel/instkernel/Makefile:1.32
--- src/distrib/evbarm/instkernel/instkernel/Makefile:1.31 Sat May 18 07:33:10 2019
+++ src/distrib/evbarm/instkernel/instkernel/Makefile Mon Aug 12 08:04:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2019/05/18 07:33:10 skrll Exp $
+# $NetBSD: Makefile,v 1.32 2019/08/12 08:04:28 martin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -15,6 +15,7 @@ MDSETTARGETS=
.if ${i} == "RPI_INSTALL"
MDSETTARGETS+= ${i} ${SSHRAMDISK} netbsd-${i}
MDSET_SUFFIXES.netbsd-${i}= bin create-bin img create-img
+MDSET_.RPI_INSTALL.netbsd-RPI_INSTALL.img.deps= netbsd-RPI_INSTALL.bin
.else
MDSETTARGETS+= ${i} ${RAMDISK} -
.endif
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: skrll Date: Mon Aug 12 07:59:17 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: BCM5301X Log Message: Update for recent a9wdt changes To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/conf/BCM5301X Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/BCM5301X diff -u src/sys/arch/evbarm/conf/BCM5301X:1.33 src/sys/arch/evbarm/conf/BCM5301X:1.34 --- src/sys/arch/evbarm/conf/BCM5301X:1.33 Tue Oct 23 19:58:52 2018 +++ src/sys/arch/evbarm/conf/BCM5301X Mon Aug 12 07:59:17 2019 @@ -1,5 +1,5 @@ # -# $NetBSD: BCM5301X,v 1.33 2018/10/23 19:58:52 jdolecek Exp $ +# $NetBSD: BCM5301X,v 1.34 2019/08/12 07:59:17 skrll Exp $ # # BCM5301X -- Broadcom BCM5301X Eval Board Kernel # @@ -170,7 +170,7 @@ armperiph0 at mainbus? # A9 On-Chip Per armgic0 at armperiph? # ARM Generic Interrupt Controller arml2cc0 at armperiph? flags 0 # ARM PL310 L2CC arma9tmr0 at armperiph? # A9 Global Timer -a9wdt0 at armperiph? flags 1 # A9 Watchdog Timer +arma9wdt0 at armperiph? flags 1 # A9 Watchdog Timer # ChipCommonA Peripherals bcmcca0 at mainbus? # ChipCommonA
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: skrll Date: Mon Aug 12 07:59:17 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: BCM5301X Log Message: Update for recent a9wdt changes To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/conf/BCM5301X Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
