CVS commit: src
Module Name:src Committed By: maya Date: Tue Apr 23 03:25:39 UTC 2024 Modified Files: src: UPDATING src/share/mk: bsd.own.mk Log Message: Switch to mesa 21 Works well enough for me on various GPUs, let's try it out. Can be easily reverted if anyone encounters major issues. To generate a diff of this commit: cvs rdiff -u -r1.348 -r1.349 src/UPDATING cvs rdiff -u -r1.1367 -r1.1368 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.
CVS commit: src
Module Name:src
Committed By: maya
Date: Tue Apr 23 03:25:39 UTC 2024
Modified Files:
src: UPDATING
src/share/mk: bsd.own.mk
Log Message:
Switch to mesa 21
Works well enough for me on various GPUs, let's try it out. Can be easily
reverted if anyone encounters major issues.
To generate a diff of this commit:
cvs rdiff -u -r1.348 -r1.349 src/UPDATING
cvs rdiff -u -r1.1367 -r1.1368 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/UPDATING
diff -u src/UPDATING:1.348 src/UPDATING:1.349
--- src/UPDATING:1.348 Sat Apr 20 14:06:47 2024
+++ src/UPDATING Tue Apr 23 03:25:39 2024
@@ -1,4 +1,4 @@
-$NetBSD: UPDATING,v 1.348 2024/04/20 14:06:47 rillig Exp $
+$NetBSD: UPDATING,v 1.349 2024/04/23 03:25:39 maya Exp $
This file (UPDATING) is intended to be a brief reference to recent
changes that might cause problems in the build process, and a guide for
@@ -19,6 +19,9 @@ See also: BUILDING, build.sh, Makefile.
Recent changes:
^^^
+20240423:
+ Update builds with x11 may fail after switching to Mesa 21.
+
20240410:
Update builds may require manually deleting
$DESTDIR/var/run/named (and, potentially,
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1367 src/share/mk/bsd.own.mk:1.1368
--- src/share/mk/bsd.own.mk:1.1367 Sun Apr 7 14:40:34 2024
+++ src/share/mk/bsd.own.mk Tue Apr 23 03:25:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1367 2024/04/07 14:40:34 tsutsui Exp $
+# $NetBSD: bsd.own.mk,v 1.1368 2024/04/23 03:25:39 maya Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1320,7 +1320,7 @@ MKDTB.earmv7hfeb= yes
MKDTB.riscv32= yes
MKDTB.riscv64= yes
-HAVE_MESA_VER?= 19
+HAVE_MESA_VER?= 21
.if ${HAVE_MESA_VER} == 19
EXTERNAL_MESALIB_DIR?= MesaLib.old
.elif ${HAVE_MESA_VER} == 21
CVS commit: src/external/mit/xorg/lib/libGL
Module Name:src Committed By: maya Date: Mon Apr 22 03:38:49 UTC 2024 Modified Files: src/external/mit/xorg/lib/libGL: Makefile Log Message: mesa21: link against libxcb-sync for missing symbols Not super obvious in practice, but it does show if you run GL programs with LD_BIND_NOW. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/external/mit/xorg/lib/libGL/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/libGL
Module Name:src
Committed By: maya
Date: Mon Apr 22 03:38:49 UTC 2024
Modified Files:
src/external/mit/xorg/lib/libGL: Makefile
Log Message:
mesa21: link against libxcb-sync for missing symbols
Not super obvious in practice, but it does show if you run GL programs
with LD_BIND_NOW.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/external/mit/xorg/lib/libGL/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/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.34 src/external/mit/xorg/lib/libGL/Makefile:1.35
--- src/external/mit/xorg/lib/libGL/Makefile:1.34 Sun Jul 16 22:20:54 2023
+++ src/external/mit/xorg/lib/libGL/Makefile Mon Apr 22 03:38:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2023/07/16 22:20:54 rjs Exp $
+# $NetBSD: Makefile,v 1.35 2024/04/22 03:38:49 maya Exp $
.include
@@ -217,6 +217,7 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \
xcb-dri2 ${.CURDIR}/../libxcb/dri2 \
xcb-glx ${.CURDIR}/../libxcb/glx \
xcb-shm ${.CURDIR}/../libxcb/shm \
+ xcb-sync ${.CURDIR}/../libxcb/sync \
expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat \
m ${NETBSDSRCDIR}/lib/libm \
pthread ${NETBSDSRCDIR}/lib/libpthread
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: maya
Date: Sun Apr 21 00:23:23 UTC 2024
Modified Files:
src/external/mit/xorg/lib/dri: Makefile
Log Message:
Mesa 21: Add some intel files so we don't have missing symbols
seen as error messages when running "glxgears" on intel.
This also avoids graphical corruption (changed areas of terminal
emulator take a few seconds to gradually update) when the modesetting
driver is explicitly chosen.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/external/mit/xorg/lib/dri/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/dri/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.39 src/external/mit/xorg/lib/dri/Makefile:1.40
--- src/external/mit/xorg/lib/dri/Makefile:1.39 Sun Jul 16 22:20:54 2023
+++ src/external/mit/xorg/lib/dri/Makefile Sun Apr 21 00:23:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2023/07/16 22:20:54 rjs Exp $
+# $NetBSD: Makefile,v 1.40 2024/04/21 00:23:23 maya Exp $
# Link the mesa_dri_drivers mega driver.
@@ -121,9 +121,11 @@ DRI_SOURCES.i965+= \
blorp.c \
blorp_blit.c \
blorp_clear.c \
+ brw_batch.c \
brw_binding_tables.c \
brw_blit.c \
brw_blorp.c \
+ brw_mipmap_tree.c \
brw_buffer_objects.c \
brw_buffers.c \
brw_bufmgr.c \
@@ -158,6 +160,7 @@ DRI_SOURCES.i965+= \
brw_eu_util.c \
brw_eu_validate.c \
brw_extensions.c \
+ brw_fbo.c \
brw_fs.cpp \
brw_fs_bank_conflicts.cpp \
brw_fs_cmod_propagation.cpp \
@@ -171,20 +174,22 @@ DRI_SOURCES.i965+= \
brw_fs_lower_regioning.cpp \
brw_fs_nir.cpp \
brw_fs_reg_allocate.cpp \
+ brw_ff_gs.c \
+ brw_formatquery.c \
brw_fs_register_coalesce.cpp \
brw_fs_saturate_propagation.cpp \
brw_fs_scoreboard.cpp \
brw_fs_sel_peephole.cpp \
brw_fs_validate.cpp \
brw_fs_visitor.cpp \
- brw_ff_gs.c \
- brw_formatquery.c \
brw_generate_mipmap.c \
brw_gs.c \
brw_gs_surface_state.c \
brw_interpolation_map.c \
brw_ir_performance.cpp \
+ brw_link.cpp \
brw_meta_util.c \
+ brw_mipmap_tree.c \
brw_misc_state.c \
brw_nir.c \
brw_nir_analyze_boolean_resolves.c \
@@ -204,6 +209,7 @@ DRI_SOURCES.i965+= \
brw_nir_rt.c \
brw_nir_tcs_workarounds.c \
brw_nir_trig_workarounds.c \
+ brw_nir_uniforms.cpp \
brw_object_purgeable.c \
brw_packed_float.c \
brw_performance_query.c \
@@ -277,6 +283,7 @@ DRI_SOURCES.i965+= \
gfx8_multisample_state.c \
hsw_queryobj.c \
hsw_sol.c \
+ intel_perf_metrics.c \
isl.c \
isl_aux_info.c \
isl_drm.c \
@@ -311,8 +318,9 @@ I965_INTEL_DEV_FILES = \
intel_device_info.c
I965_INTEL_PERF_FILES = \
- intel_pps_driver.cc \
- intel_pps_perf.cc
+ intel_perf.c \
+ intel_perf_query.c \
+ intel_perf_mdapi.c
INTEL_GENS_BLORP= 40 45 50 60 70 75 80 90 110
@@ -346,6 +354,11 @@ DRI_SOURCES.i965+= i965_${_f}
BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/intel/dev/${_f} i965_${_f}
DRI_SOURCES.i965+= i965_${_f}
.endfor
+.for _f in ${I965_INTEL_PERF_FILES}
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/intel/perf/${_f} i965_${_f}
+DRI_SOURCES.i965+= i965_${_f}
+CPPFLAGS.i965_${_f}+= -I${X11SRCDIR.Mesa}/src/intel/perf
+.endfor
.for _f in ${DRI_SOURCES.i965}
CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/i965 \
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src Committed By: maya Date: Sun Apr 21 00:23:23 UTC 2024 Modified Files: src/external/mit/xorg/lib/dri: Makefile Log Message: Mesa 21: Add some intel files so we don't have missing symbols seen as error messages when running "glxgears" on intel. This also avoids graphical corruption (changed areas of terminal emulator take a few seconds to gradually update) when the modesetting driver is explicitly chosen. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/external/mit/xorg/lib/dri/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/MesaLib/dist/src/amd/common
Module Name:xsrc Committed By: maya Date: Sat Apr 20 15:57:17 UTC 2024 Modified Files: xsrc/external/mit/MesaLib/dist/src/amd/common: ac_rtld.c Log Message: Fix build of mesa 21 This definition is missing from elftoolchain's elfdefinitions.h (via libelf.h), which conflicts with sys/exec_elf.h so we can't get it from sys/exec_elf.h. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/MesaLib/dist/src/amd/common/ac_rtld.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/MesaLib/dist/src/amd/common/ac_rtld.c diff -u xsrc/external/mit/MesaLib/dist/src/amd/common/ac_rtld.c:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/amd/common/ac_rtld.c:1.2 --- xsrc/external/mit/MesaLib/dist/src/amd/common/ac_rtld.c:1.1.1.1 Mon May 9 01:23:25 2022 +++ xsrc/external/mit/MesaLib/dist/src/amd/common/ac_rtld.c Sat Apr 20 15:57:17 2024 @@ -65,6 +65,10 @@ #define R_AMDGPU_RELATIVE6413 #endif +#ifndef STN_UNDEF +#define STN_UNDEF 0 +#endif + /* For the UMR disassembler. */ #define DEBUGGER_END_OF_CODE_MARKER 0xbf9f /* invalid instruction */ #define DEBUGGER_NUM_MARKERS5
CVS commit: xsrc/external/mit/MesaLib/dist/src/amd/common
Module Name:xsrc Committed By: maya Date: Sat Apr 20 15:57:17 UTC 2024 Modified Files: xsrc/external/mit/MesaLib/dist/src/amd/common: ac_rtld.c Log Message: Fix build of mesa 21 This definition is missing from elftoolchain's elfdefinitions.h (via libelf.h), which conflicts with sys/exec_elf.h so we can't get it from sys/exec_elf.h. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/MesaLib/dist/src/amd/common/ac_rtld.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: maya
Date: Wed Apr 17 02:34:45 UTC 2024
Modified Files:
src/sys/dev/usb: uftdi.c
Log Message:
Add support for a range of USB serial adapters
>From Cameron Williams in PR kern/58127
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/usb/uftdi.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/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.77 src/sys/dev/usb/uftdi.c:1.78
--- src/sys/dev/usb/uftdi.c:1.77 Tue Mar 26 03:38:02 2024
+++ src/sys/dev/usb/uftdi.c Wed Apr 17 02:34:45 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.77 2024/03/26 03:38:02 thorpej Exp $ */
+/* $NetBSD: uftdi.c,v 1.78 2024/04/17 02:34:45 maya Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.77 2024/03/26 03:38:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.78 2024/04/17 02:34:45 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -126,6 +126,25 @@ static const struct ucom_methods uftdi_m
*/
static const struct usb_devno uftdi_devs[] = {
{ USB_VENDOR_BBELECTRONICS, USB_PRODUCT_BBELECTRONICS_USOTL4 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US101 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US159 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US235 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US257 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_12 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_34 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_56 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_78 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US313 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US320 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US324 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US346_12 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US346_34 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US701_12 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US701_34 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_12 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_34 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_56 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_78 },
{ USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_TWIST },
{ USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_SAMBA },
{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_230X },
CVS commit: src/sys/dev/usb
Module Name:src Committed By: maya Date: Wed Apr 17 02:34:45 UTC 2024 Modified Files: src/sys/dev/usb: uftdi.c Log Message: Add support for a range of USB serial adapters >From Cameron Williams in PR kern/58127 To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/sys/dev/usb/uftdi.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: maya Date: Wed Apr 17 02:33:04 UTC 2024 Modified Files: src/sys/dev/usb: usbdevs.h usbdevs_data.h Log Message: Regen after usbdevs change To generate a diff of this commit: cvs rdiff -u -r1.806 -r1.807 src/sys/dev/usb/usbdevs.h \ src/sys/dev/usb/usbdevs_data.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: maya Date: Wed Apr 17 02:32:09 UTC 2024 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add some USB serial adapters >From Cameron Williams in PR kern/58127 To generate a diff of this commit: cvs rdiff -u -r1.814 -r1.815 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/usbdevs diff -u src/sys/dev/usb/usbdevs:1.814 src/sys/dev/usb/usbdevs:1.815 --- src/sys/dev/usb/usbdevs:1.814 Wed Feb 28 21:50:51 2024 +++ src/sys/dev/usb/usbdevs Wed Apr 17 02:32:08 2024 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.814 2024/02/28 21:50:51 dholland Exp $ +$NetBSD: usbdevs,v 1.815 2024/04/17 02:32:08 maya Exp $ /*- * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -1118,6 +1118,27 @@ product BILLIONTON USBEL100 0x0988 USB10 product BILLIONTON USBE100 0x8511 USBE100 product BILLIONTON USB2AR 0x90ff USB2AR Ethernet +/* Brainboxes Limited products */ +product BRAINBOXES US101 0x1011 US-101 USB2Serial 1xRS232 +product BRAINBOXES US159 0x1021 US-159 USB2Serial 1xRS232 +product BRAINBOXES US235 0x1017 US-235 USB2Serial 1xRS232 +product BRAINBOXES US257 0x5001 US-257 USB2Serial 2xRS232 +product BRAINBOXES US279_12 0x2021 US-279 USB2Serial 8xRS232 (Port 1 and 2) +product BRAINBOXES US279_34 0x2022 US-279 USB2Serial 8xRS232 (Port 3 and 4) +product BRAINBOXES US279_56 0x2023 US-279 USB2Serial 8xRS232 (Port 5 and 6) +product BRAINBOXES US279_78 0x2024 US-279 USB2Serial 8xRS232 (Port 7 and 8) +product BRAINBOXES US313 0x6001 US-313 USB2Serial 2xRS422/485 +product BRAINBOXES US320 0x1019 US-320 USB2Serial 1xRS422/485 +product BRAINBOXES US324 0x1013 US-324 USB2Serial 1xRS422/485 +product BRAINBOXES US346_12 0x3011 US-346 USB2Serial 4xRS422/485 (Port 1 and 2) +product BRAINBOXES US346_34 0x3012 US-346 USB2Serial 4xRS422/485 (Port 3 and 4) +product BRAINBOXES US701_12 0x2011 US-701 USB2Serial 4xRS232 (Port 1 and 2) +product BRAINBOXES US701_34 0x2012 US-701 USB2Serial 4xRS232 (Port 3 and 4) +product BRAINBOXES US842_12 0x8001 US-842 USB2Serial 8xRS422/485 (Port 1 and 2) +product BRAINBOXES US842_34 0x8002 US-842 USB2Serial 8xRS422/485 (Port 3 and 4) +product BRAINBOXES US842_56 0x8003 US-842 USB2Serial 8xRS422/485 (Port 5 and 6) +product BRAINBOXES US842_78 0x8004 US-842 USB2Serial 8xRS422/485 (Port 7 and 8) + /* Broadcom products */ product BROADCOM BCMFW 0x0bdc BCMFW product BROADCOM BCM2033 0x2000 BCM2033
CVS commit: src/sys/dev/usb
Module Name:src Committed By: maya Date: Wed Apr 17 02:32:09 UTC 2024 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add some USB serial adapters >From Cameron Williams in PR kern/58127 To generate a diff of this commit: cvs rdiff -u -r1.814 -r1.815 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/amd64/liveimage/emuimage
Module Name:src Committed By: maya Date: Tue Apr 16 16:13:45 UTC 2024 Modified Files: src/distrib/amd64/liveimage/emuimage: Makefile rc.conf.emuimage spec.emuimage Log Message: restore amd64 live image support for resize root after combined mbr/gpt commit we need to resize_gpt now, as it takes precedence over mbr/disklabel this change brings us to behave like the evbarm images. XXX: we don't seem to touch disklabel and MBR, but they exist. Not sure whether that has any negative repercussions, maybe another system might regard MBR as the sole source of truth when GPT also exists. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/distrib/amd64/liveimage/emuimage/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/liveimage/emuimage/spec.emuimage Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/amd64/liveimage/emuimage
Module Name:src
Committed By: maya
Date: Tue Apr 16 16:13:45 UTC 2024
Modified Files:
src/distrib/amd64/liveimage/emuimage: Makefile rc.conf.emuimage
spec.emuimage
Log Message:
restore amd64 live image support for resize root after combined mbr/gpt commit
we need to resize_gpt now, as it takes precedence over mbr/disklabel
this change brings us to behave like the evbarm images.
XXX: we don't seem to touch disklabel and MBR, but they exist. Not sure whether
that has any negative repercussions, maybe another system might regard MBR as
the
sole source of truth when GPT also exists.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/amd64/liveimage/emuimage/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/liveimage/emuimage/spec.emuimage
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/liveimage/emuimage/Makefile
diff -u src/distrib/amd64/liveimage/emuimage/Makefile:1.9 src/distrib/amd64/liveimage/emuimage/Makefile:1.10
--- src/distrib/amd64/liveimage/emuimage/Makefile:1.9 Sat Jul 24 16:13:44 2021
+++ src/distrib/amd64/liveimage/emuimage/Makefile Tue Apr 16 16:13:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/07/24 16:13:44 jmcneill Exp $
+# $NetBSD: Makefile,v 1.10 2024/04/16 16:13:44 maya Exp $
LIVEIMGBASE= NetBSD-${DISTRIBVER}-amd64-live # gives ${IMGBASE}.img
@@ -13,6 +13,6 @@ SPEC_EXTRA= ${.CURDIR}/spec.emuimage
RC_CONF_EXTRA= ${.CURDIR}/rc.conf.emuimage
IMGFILE_EXTRA=\
${FILESDIR}/ec2_init etc/rc.d/ec2_init \
- ${FILESDIR}/resize_disklabel etc/rc.d/resize_disklabel
+ ${FILESDIR}/resize_gpt etc/rc.d/resize_gpt
.include "${.CURDIR}/../Makefile.liveimage"
Index: src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage
diff -u src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage:1.3 src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage:1.4
--- src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage:1.3 Wed Sep 27 00:24:12 2023
+++ src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage Tue Apr 16 16:13:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: rc.conf.emuimage,v 1.3 2023/09/27 00:24:12 riastradh Exp $
+# $NetBSD: rc.conf.emuimage,v 1.4 2024/04/16 16:13:44 maya Exp $
is_ec2() {
val=NO
@@ -25,7 +25,7 @@ is_ec2() {
}
certctl_init=YES
-resize_disklabel=YES
+resize_gpt=YES
resize_root=YES
resize_root_flags="-p"
resize_root_postcmd="/sbin/reboot -n"
Index: src/distrib/amd64/liveimage/emuimage/spec.emuimage
diff -u src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.2 src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.3
--- src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.2 Sat Jul 24 16:13:44 2021
+++ src/distrib/amd64/liveimage/emuimage/spec.emuimage Tue Apr 16 16:13:44 2024
@@ -1,3 +1,3 @@
-# $NetBSD: spec.emuimage,v 1.2 2021/07/24 16:13:44 jmcneill Exp $
+# $NetBSD: spec.emuimage,v 1.3 2024/04/16 16:13:44 maya Exp $
./etc/rc.d/ec2_init type=file mode=0555 uname=root gname=wheel
-./etc/rc.d/resize_disklabel type=file mode=0555 uname=root gname=wheel
+./etc/rc.d/resize_gpt type=file mode=0555 uname=root gname=wheel
CVS commit: src/distrib/amd64/liveimage
Module Name:src
Committed By: maya
Date: Sat Apr 13 18:38:17 UTC 2024
Modified Files:
src/distrib/amd64/liveimage: Makefile.liveimage
Log Message:
amd64 live image: support EFI as well as BIOS boot
The biggest caveat is that there's a small number of machines that try to
EFI boot but fail, so would prefer a BIOS only image. I'm not adding a
separate BIOS only image because the live image is pretty niche.
(For regular installation images, we do create a separate BIOS-only version)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/liveimage/Makefile.liveimage
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/liveimage/Makefile.liveimage
diff -u src/distrib/amd64/liveimage/Makefile.liveimage:1.2 src/distrib/amd64/liveimage/Makefile.liveimage:1.3
--- src/distrib/amd64/liveimage/Makefile.liveimage:1.2 Sat Dec 15 18:03:17 2018
+++ src/distrib/amd64/liveimage/Makefile.liveimage Sat Apr 13 18:38:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.liveimage,v 1.2 2018/12/15 18:03:17 gson Exp $
+# $NetBSD: Makefile.liveimage,v 1.3 2024/04/13 18:38:17 maya Exp $
.include
@@ -7,6 +7,11 @@ PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
SECONDARY_BOOT_ARG= # unnecessary
+EFIBOOT= ${WORKDIR}/usr/mdec/bootx64.efi
+EFIBOOT+= ${WORKDIR}/usr/mdec/bootia32.efi
+
USE_MBR= yes
+USE_GPT= yes
+USE_GPTMBR= yes
.include "${.CURDIR}/../../../common/bootimage/Makefile.liveimage"
CVS commit: src/distrib/amd64/liveimage
Module Name:src Committed By: maya Date: Sat Apr 13 18:38:17 UTC 2024 Modified Files: src/distrib/amd64/liveimage: Makefile.liveimage Log Message: amd64 live image: support EFI as well as BIOS boot The biggest caveat is that there's a small number of machines that try to EFI boot but fail, so would prefer a BIOS only image. I'm not adding a separate BIOS only image because the live image is pretty niche. (For regular installation images, we do create a separate BIOS-only version) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/liveimage/Makefile.liveimage 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: maya Date: Sat Jan 6 00:26:26 UTC 2024 Modified Files: src/sys/dev/usb: if_urtwn.c Log Message: Add Mercusys NW150US V2 USB support No changes needed, other than recognizing it as working. >From Daeil Lee in PR/57819 To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 src/sys/dev/usb/if_urtwn.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: maya
Date: Sat Jan 6 00:26:26 UTC 2024
Modified Files:
src/sys/dev/usb: if_urtwn.c
Log Message:
Add Mercusys NW150US V2 USB support
No changes needed, other than recognizing it as working.
>From Daeil Lee in PR/57819
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/sys/dev/usb/if_urtwn.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_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.107 src/sys/dev/usb/if_urtwn.c:1.108
--- src/sys/dev/usb/if_urtwn.c:1.107 Tue Aug 1 07:04:16 2023
+++ src/sys/dev/usb/if_urtwn.c Sat Jan 6 00:26:26 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.107 2023/08/01 07:04:16 mrg Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.108 2024/01/06 00:26:26 maya Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */
/*-
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.107 2023/08/01 07:04:16 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.108 2024/01/06 00:26:26 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -215,6 +215,7 @@ static const struct urtwn_dev {
/* URTWN_RTL8188E */
URTWN_RTL8188E_DEV(DLINK, DWA125D1),
URTWN_RTL8188E_DEV(ELECOM, WDC150SU2M),
+ URTWN_RTL8188E_DEV(MERCUSYS, MW150USV2),
URTWN_RTL8188E_DEV(REALTEK, RTL8188ETV),
URTWN_RTL8188E_DEV(REALTEK, RTL8188EU),
URTWN_RTL8188E_DEV(ABOCOM, RTL8188EU),
CVS commit: src/sys/dev/usb
Module Name:src Committed By: maya Date: Sat Jan 6 00:24:37 UTC 2024 Modified Files: src/sys/dev/usb: usbdevs.h usbdevs_data.h Log Message: Regen usbdevs To generate a diff of this commit: cvs rdiff -u -r1.803 -r1.804 src/sys/dev/usb/usbdevs.h \ src/sys/dev/usb/usbdevs_data.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: maya Date: Sat Jan 6 00:24:07 UTC 2024 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add Mercusys and Mercusys MW150USV2 >From Daeil Lee in PR/57819 To generate a diff of this commit: cvs rdiff -u -r1.811 -r1.812 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/usbdevs diff -u src/sys/dev/usb/usbdevs:1.811 src/sys/dev/usb/usbdevs:1.812 --- src/sys/dev/usb/usbdevs:1.811 Sun Dec 24 02:42:51 2023 +++ src/sys/dev/usb/usbdevs Sat Jan 6 00:24:07 2024 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.811 2023/12/24 02:42:51 gutteridge Exp $ +$NetBSD: usbdevs,v 1.812 2024/01/06 00:24:07 maya Exp $ /*- * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -586,6 +586,7 @@ vendor HIROSE 0x2631 Hirose Electric vendor ONEPLUS 0x2717 ONEPLUS vendor NHJ 0x2770 NHJ vendor PLANEX 0x2c02 Planex Communications +vendor MERCUSYS 0x2c4e Mercusys vendor VIDZMEDIA 0x3275 VidzMedia Pte Ltd vendor AEI 0x3334 AEI vendor HANK 0x3353 Hank Connection @@ -2288,6 +2289,9 @@ product MELCO WLIUCGNM 0x01a2 WLI-UC-GN product MELCO WLIUCGNM2T 0x01ee WLI-UC-GNM2T product MELCO WIU2300D 0x0241 WI-U2-300D +/* Mercusys products */ +product MERCUSYS MW150USV2 0x0102 MW150US V2 + /* Merlin products */ product MERLIN V620 0x1110 Merlin V620
CVS commit: src/sys/dev/usb
Module Name:src Committed By: maya Date: Sat Jan 6 00:24:07 UTC 2024 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add Mercusys and Mercusys MW150USV2 >From Daeil Lee in PR/57819 To generate a diff of this commit: cvs rdiff -u -r1.811 -r1.812 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/common/bootimage
Module Name:src Committed By: maya Date: Sun Jan 29 22:12:25 UTC 2023 Modified Files: src/distrib/common/bootimage: fstab.in Log Message: Make sure to mount /var/shm Programs such as firefox seem to require it, and this file is used by the live image as well. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/common/bootimage/fstab.in 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/bootimage/fstab.in diff -u src/distrib/common/bootimage/fstab.in:1.3 src/distrib/common/bootimage/fstab.in:1.4 --- src/distrib/common/bootimage/fstab.in:1.3 Sat Dec 15 18:03:17 2018 +++ src/distrib/common/bootimage/fstab.in Sun Jan 29 22:12:25 2023 @@ -1,5 +1,6 @@ -ROOT.a / ffs rw 1 1 -ROOT.b none none sw 0 0 -ptyfs /dev/pts ptyfs rw 0 0 -kernfs /kern kernfs rw,noauto 0 0 -procfs /proc procfs rw,noauto 0 0 +ROOT.a / ffs rw 1 1 +ROOT.b none none sw 0 0 +ptyfs /dev/pts ptyfs rw 0 0 +kernfs /kern kernfs rw,noauto 0 0 +procfs /proc procfs rw,noauto 0 0 +tmpfs /var/shm tmpfs rw,-m1777,-sram%25 0 0
CVS commit: src/distrib/common/bootimage
Module Name:src Committed By: maya Date: Sun Jan 29 22:12:25 UTC 2023 Modified Files: src/distrib/common/bootimage: fstab.in Log Message: Make sure to mount /var/shm Programs such as firefox seem to require it, and this file is used by the live image as well. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/common/bootimage/fstab.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: maya Date: Wed Jul 27 18:29:35 UTC 2022 Modified Files: src/distrib/sets/lists/modules: md.amd64 md.i386 src/share/mk: bsd.own.mk src/sys/modules: Makefile Log Message: Enable amdgpu module & firmware on x86 Make it easier to test this one out, add `load amdgpu` before boot netbsd. XXX there should probably be a drm block in sys/modules/Makefile which includes aarch64. To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/distrib/sets/lists/modules/md.amd64 cvs rdiff -u -r1.91 -r1.92 src/distrib/sets/lists/modules/md.i386 cvs rdiff -u -r1.1286 -r1.1287 src/share/mk/bsd.own.mk cvs rdiff -u -r1.267 -r1.268 src/sys/modules/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/sets/lists/modules/md.amd64 diff -u src/distrib/sets/lists/modules/md.amd64:1.93 src/distrib/sets/lists/modules/md.amd64:1.94 --- src/distrib/sets/lists/modules/md.amd64:1.93 Sat Sep 25 17:55:37 2021 +++ src/distrib/sets/lists/modules/md.amd64 Wed Jul 27 18:29:35 2022 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.93 2021/09/25 17:55:37 maya Exp $ +# $NetBSD: md.amd64,v 1.94 2022/07/27 18:29:35 maya Exp $ # ./@MODULEDIR@/acpiacadmodules-base-kernel kmod ./@MODULEDIR@/acpiacad/acpiacad.kmod modules-base-kernel kmod @@ -28,6 +28,8 @@ ./@MODULEDIR@/acpiwmi/acpiwmi.kmod modules-base-kernel kmod ./@MODULEDIR@/aibsmodules-base-kernel kmod ./@MODULEDIR@/aibs/aibs.kmod modules-base-kernel kmod +./@MODULEDIR@/amdgpumodules-base-kernel kmod +./@MODULEDIR@/amdgpu/amdgpu.kmod modules-base-kernel kmod ./@MODULEDIR@/amdsmnmodules-base-kernel kmod ./@MODULEDIR@/amdsmn/amdsmn.kmod modules-base-kernel kmod ./@MODULEDIR@/amdtempmodules-base-kernel kmod Index: src/distrib/sets/lists/modules/md.i386 diff -u src/distrib/sets/lists/modules/md.i386:1.91 src/distrib/sets/lists/modules/md.i386:1.92 --- src/distrib/sets/lists/modules/md.i386:1.91 Sat Sep 25 17:55:37 2021 +++ src/distrib/sets/lists/modules/md.i386 Wed Jul 27 18:29:35 2022 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.91 2021/09/25 17:55:37 maya Exp $ +# $NetBSD: md.i386,v 1.92 2022/07/27 18:29:35 maya Exp $ # ./@MODULEDIR@/acpiacadmodules-base-kernel kmod ./@MODULEDIR@/acpiacad/acpiacad.kmod modules-base-kernel kmod @@ -28,6 +28,8 @@ ./@MODULEDIR@/acpiwmi/acpiwmi.kmod modules-base-kernel kmod ./@MODULEDIR@/aibsmodules-base-kernel kmod ./@MODULEDIR@/aibs/aibs.kmod modules-base-kernel kmod +./@MODULEDIR@/amdgpumodules-base-kernel kmod +./@MODULEDIR@/amdgpu/amdgpu.kmod modules-base-kernel kmod ./@MODULEDIR@/amdsmnmodules-base-kernel kmod ./@MODULEDIR@/amdsmn/amdsmn.kmod modules-base-kernel kmod ./@MODULEDIR@/amdtempmodules-base-kernel kmod Index: src/share/mk/bsd.own.mk diff -u src/share/mk/bsd.own.mk:1.1286 src/share/mk/bsd.own.mk:1.1287 --- src/share/mk/bsd.own.mk:1.1286 Thu Jul 14 03:48:49 2022 +++ src/share/mk/bsd.own.mk Wed Jul 27 18:29:35 2022 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.1286 2022/07/14 03:48:49 mrg Exp $ +# $NetBSD: bsd.own.mk,v 1.1287 2022/07/27 18:29:35 maya Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -1249,6 +1249,8 @@ MKNOUVEAUFIRMWARE.aarch64= yes MKRADEONFIRMWARE.x86_64= yes MKRADEONFIRMWARE.i386= yes MKRADEONFIRMWARE.aarch64= yes +MKAMDGPUFIRMWARE.x86_64= yes +MKAMDGPUFIRMWARE.i386= yes # Only install the tegra firmware on evbarm. MKTEGRAFIRMWARE.evbarm= yes Index: src/sys/modules/Makefile diff -u src/sys/modules/Makefile:1.267 src/sys/modules/Makefile:1.268 --- src/sys/modules/Makefile:1.267 Sun Jul 17 15:36:05 2022 +++ src/sys/modules/Makefile Wed Jul 27 18:29:35 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.267 2022/07/17 15:36:05 riastradh Exp $ +# $NetBSD: Makefile,v 1.268 2022/07/27 18:29:35 maya Exp $ .include @@ -356,6 +356,7 @@ SUBDIR+= drm #SUBDIR+= drmkms_pci #SUBDIR+= drmkms_ttm SUBDIR+= i915drm +SUBDIR+= amdgpu #SUBDIR+= i915drmkms # # ISA modules
CVS commit: src
Module Name:src Committed By: maya Date: Wed Jul 27 18:29:35 UTC 2022 Modified Files: src/distrib/sets/lists/modules: md.amd64 md.i386 src/share/mk: bsd.own.mk src/sys/modules: Makefile Log Message: Enable amdgpu module & firmware on x86 Make it easier to test this one out, add `load amdgpu` before boot netbsd. XXX there should probably be a drm block in sys/modules/Makefile which includes aarch64. To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/distrib/sets/lists/modules/md.amd64 cvs rdiff -u -r1.91 -r1.92 src/distrib/sets/lists/modules/md.i386 cvs rdiff -u -r1.1286 -r1.1287 src/share/mk/bsd.own.mk cvs rdiff -u -r1.267 -r1.268 src/sys/modules/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
Module Name:src
Committed By: maya
Date: Mon Jan 24 00:15:09 UTC 2022
Modified Files:
src/sys/arch/amd64/conf: kern.ldscript.Xen
src/sys/arch/i386/conf: kern.ldscript.Xen
Log Message:
put .note.Xen into PT_NOTE
this is where grub 2.02 and possibly other things expect
to find it.
Fixes booting with grub2 on prgmr.com.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/amd64/conf/kern.ldscript.Xen
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/i386/conf/kern.ldscript.Xen
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/amd64/conf/kern.ldscript.Xen
diff -u src/sys/arch/amd64/conf/kern.ldscript.Xen:1.17 src/sys/arch/amd64/conf/kern.ldscript.Xen:1.18
--- src/sys/arch/amd64/conf/kern.ldscript.Xen:1.17 Thu May 21 09:36:24 2020
+++ src/sys/arch/amd64/conf/kern.ldscript.Xen Mon Jan 24 00:15:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.Xen,v 1.17 2020/05/21 09:36:24 jdolecek Exp $ */
+/* $NetBSD: kern.ldscript.Xen,v 1.18 2022/01/24 00:15:09 maya Exp $ */
#include "assym.h"
@@ -13,7 +13,7 @@ SECTIONS
*(.text.*)
*(.stub)
. = ALIGN(__PAGE_SIZE);
- } =0xCC
+ } :main =0xCC
_etext = . ;
PROVIDE (etext = .) ;
@@ -80,5 +80,14 @@ SECTIONS
{
KEEP(*(.note.netbsd.ident));
}
+ .note.Xen :
+ {
+ KEEP(*(.note.Xen));
+ } :notes
}
+PHDRS
+{
+ main PT_LOAD;
+ notes PT_NOTE;
+}
Index: src/sys/arch/i386/conf/kern.ldscript.Xen
diff -u src/sys/arch/i386/conf/kern.ldscript.Xen:1.16 src/sys/arch/i386/conf/kern.ldscript.Xen:1.17
--- src/sys/arch/i386/conf/kern.ldscript.Xen:1.16 Sun Jun 24 18:24:53 2018
+++ src/sys/arch/i386/conf/kern.ldscript.Xen Mon Jan 24 00:15:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.Xen,v 1.16 2018/06/24 18:24:53 maxv Exp $ */
+/* $NetBSD: kern.ldscript.Xen,v 1.17 2022/01/24 00:15:09 maya Exp $ */
#include "assym.h"
@@ -12,7 +12,7 @@ SECTIONS
*(.text.*)
*(.stub)
. = ALIGN(__PAGE_SIZE);
- } =0xCC
+ } :main =0xCC
_etext = . ;
PROVIDE (etext = .) ;
@@ -75,5 +75,14 @@ SECTIONS
{
KEEP(*(.note.netbsd.ident));
}
+ .note.Xen :
+ {
+ KEEP(*(.note.Xen));
+ } :notes
}
+PHDRS
+{
+ main PT_LOAD;
+ notes PT_NOTE;
+}
CVS commit: src/sys/arch
Module Name:src Committed By: maya Date: Mon Jan 24 00:15:09 UTC 2022 Modified Files: src/sys/arch/amd64/conf: kern.ldscript.Xen src/sys/arch/i386/conf: kern.ldscript.Xen Log Message: put .note.Xen into PT_NOTE this is where grub 2.02 and possibly other things expect to find it. Fixes booting with grub2 on prgmr.com. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/amd64/conf/kern.ldscript.Xen cvs rdiff -u -r1.16 -r1.17 src/sys/arch/i386/conf/kern.ldscript.Xen Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/nvidia-firmware/nouveau/gm200/gr
Module Name:src
Committed By: maya
Date: Tue Dec 14 22:47:07 UTC 2021
Modified Files:
src/external/nvidia-firmware/nouveau/gm200/gr: Makefile
Log Message:
Don't install a symlink for when there's already a file.
Caused some cryptic issues in the builds far further along.
Pointed out by paulg, thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/nvidia-firmware/nouveau/gm200/gr/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/nvidia-firmware/nouveau/gm200/gr/Makefile
diff -u src/external/nvidia-firmware/nouveau/gm200/gr/Makefile:1.1 src/external/nvidia-firmware/nouveau/gm200/gr/Makefile:1.2
--- src/external/nvidia-firmware/nouveau/gm200/gr/Makefile:1.1 Mon Dec 13 23:59:36 2021
+++ src/external/nvidia-firmware/nouveau/gm200/gr/Makefile Tue Dec 14 22:47:07 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/12/13 23:59:36 maya Exp $
+# $NetBSD: Makefile,v 1.2 2021/12/14 22:47:07 maya Exp $
NOMAN= # defined
@@ -77,11 +77,5 @@ SYMLINKS+= ${FIRMWAREDIR}/nouveau/nvidia
SYMLINKS+= ${FIRMWAREDIR}/nouveau/nvidia/gp102/gr/fecs_bl.bin \
${FIRMWAREDIR}/nouveau/nvidia/gp106/gr/fecs_bl.bin
-SYMLINKS+= ${FIRMWAREDIR}/nouveau/nvidia/gp102/gr/fecs_bl.bin \
- ${FIRMWAREDIR}/nouveau/nvidia/gp107/gr/fecs_bl.bin
-
-SYMLINKS+= ${FIRMWAREDIR}/nouveau/nvidia/gp102/gr/fecs_bl.bin \
- ${FIRMWAREDIR}/nouveau/nvidia/gp108/gr/fecs_bl.bin
-
.include
.include
CVS commit: src/external/nvidia-firmware/nouveau/gm200/gr
Module Name:src Committed By: maya Date: Tue Dec 14 22:47:07 UTC 2021 Modified Files: src/external/nvidia-firmware/nouveau/gm200/gr: Makefile Log Message: Don't install a symlink for when there's already a file. Caused some cryptic issues in the builds far further along. Pointed out by paulg, thanks. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/nvidia-firmware/nouveau/gm200/gr/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/gpufw
Module Name:src Committed By: maya Date: Tue Dec 14 12:13:39 UTC 2021 Modified Files: src/distrib/sets/lists/gpufw: mi Log Message: don't conditionalize the installation of nouveau directories To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/gpufw/mi 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/gpufw/mi diff -u src/distrib/sets/lists/gpufw/mi:1.5 src/distrib/sets/lists/gpufw/mi:1.6 --- src/distrib/sets/lists/gpufw/mi:1.5 Mon Dec 13 23:59:35 2021 +++ src/distrib/sets/lists/gpufw/mi Tue Dec 14 12:13:38 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.5 2021/12/13 23:59:35 maya Exp $ +# $NetBSD: mi,v 1.6 2021/12/14 12:13:38 maya Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -365,7 +365,7 @@ ./libdata/firmware/amdgpu/verde_rlc.bin base-gpufw amdgpufirmware ./libdata/firmware/amdgpu/verde_smc.bin base-gpufw amdgpufirmware ./libdata/firmware/nouveau/nvidia/LICENCE.nvidia base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gk20abase-gpufw nouveaufirmware +./libdata/firmware/nouveau/nvidia/gk20abase-gpufw ./libdata/firmware/nouveau/nvidia/gk20a/fecs_data.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gk20a/fecs_inst.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gk20a/gpccs_data.bin base-gpufw nouveaufirmware @@ -374,12 +374,12 @@ ./libdata/firmware/nouveau/nvidia/gk20a/sw_ctx.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gk20a/sw_method_init.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gk20a/sw_nonctx.bin base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gm200base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gm200/acr base-gpufw nouveaufirmware +./libdata/firmware/nouveau/nvidia/gm200base-gpufw +./libdata/firmware/nouveau/nvidia/gm200/acr base-gpufw ./libdata/firmware/nouveau/nvidia/gm200/acr/bl.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm200/acr/ucode_load.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm200/acr/ucode_unload.bin base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gm200/gr base-gpufw nouveaufirmware +./libdata/firmware/nouveau/nvidia/gm200/gr base-gpufw ./libdata/firmware/nouveau/nvidia/gm200/gr/fecs_bl.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm200/gr/fecs_data.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm200/gr/fecs_inst.bin base-gpufw nouveaufirmware @@ -392,12 +392,12 @@ ./libdata/firmware/nouveau/nvidia/gm200/gr/sw_ctx.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm200/gr/sw_method_init.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm200/gr/sw_nonctx.bin base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gm204base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gm204/acr base-gpufw nouveaufirmware +./libdata/firmware/nouveau/nvidia/gm204base-gpufw +./libdata/firmware/nouveau/nvidia/gm204/acr base-gpufw ./libdata/firmware/nouveau/nvidia/gm204/acr/bl.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm204/acr/ucode_load.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm204/acr/ucode_unload.bin base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gm204/gr base-gpufw nouveaufirmware +./libdata/firmware/nouveau/nvidia/gm204/gr base-gpufw ./libdata/firmware/nouveau/nvidia/gm204/gr/fecs_bl.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm204/gr/fecs_data.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm204/gr/fecs_inst.bin base-gpufw nouveaufirmware @@ -410,15 +410,16 @@ ./libdata/firmware/nouveau/nvidia/gm204/gr/sw_ctx.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm204/gr/sw_method_init.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm204/gr/sw_nonctx.bin base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gm206/acr base-gpufw nouveaufirmware +./libdata/firmware/nouveau/nvidia/gm206base-gpufw +./libdata/firmware/nouveau/nvidia/gm206/acr base-gpufw ./libdata/firmware/nouveau/nvidia/gm206/acr/bl.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm206/acr/ucode_load.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm206/acr/ucode_unload.bin base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gm206/fecs_data.bin base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gm206/fecs_inst.bin base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gm206/gpccs_data.bin base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gm206/gpccs_inst.bin base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gm206/gr base-gpufw nouveaufirmware
CVS commit: src/distrib/sets/lists/gpufw
Module Name:src Committed By: maya Date: Tue Dec 14 12:13:39 UTC 2021 Modified Files: src/distrib/sets/lists/gpufw: mi Log Message: don't conditionalize the installation of nouveau directories To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/gpufw/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/nvidia-firmware/nouveau/dist
Module Name:src Committed By: maya Date: Tue Dec 14 08:36:51 UTC 2021 Update of /cvsroot/src/external/nvidia-firmware/nouveau/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4483 Log Message: Import nvidia firmware from linux-firmware repository at commit: commit 2984e265cac6ef19a0de4fb21396fb87f45273d9 Merge: 6f5aada 359ab77 Author: Josh Boyer Date: Fri Sep 3 11:11:05 2021 -0400 Merge tag 'iwlwifi-fw-2021-09-02' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware into main Revert accidentally released untested binaries Signed-off-by: Josh Boyer Only LICENCE.nvidia file, which I've omitted by accident. Status: Vendor Tag: LINUX-FIRMWARE Release Tags: linux-firmware-2021-09-03-2984e265 N src/external/nvidia-firmware/nouveau/dist/LICENCE.nvidia No conflicts created by this import
CVS import: src/external/nvidia-firmware/nouveau/dist
Module Name:src Committed By: maya Date: Tue Dec 14 08:36:51 UTC 2021 Update of /cvsroot/src/external/nvidia-firmware/nouveau/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4483 Log Message: Import nvidia firmware from linux-firmware repository at commit: commit 2984e265cac6ef19a0de4fb21396fb87f45273d9 Merge: 6f5aada 359ab77 Author: Josh Boyer Date: Fri Sep 3 11:11:05 2021 -0400 Merge tag 'iwlwifi-fw-2021-09-02' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware into main Revert accidentally released untested binaries Signed-off-by: Josh Boyer Only LICENCE.nvidia file, which I've omitted by accident. Status: Vendor Tag: LINUX-FIRMWARE Release Tags: linux-firmware-2021-09-03-2984e265 N src/external/nvidia-firmware/nouveau/dist/LICENCE.nvidia No conflicts created by this import
CVS commit: src
Module Name:src Committed By: maya Date: Mon Dec 13 23:59:42 UTC 2021 Modified Files: src/distrib/sets/lists/gpufw: mi src/etc/mtree: NetBSD.dist.base src/external/nvidia-firmware: Makefile Added Files: src/external/nvidia-firmware/nouveau: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/common: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gk20a: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm200: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm200/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm200/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm204: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm204/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm206: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm206/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm206/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm20b: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm20b/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm20b/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm20b/pmu: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp100: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp100/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp100/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp102: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp102/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp102/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp102/nvdec: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp102/sec2: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp104: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp104/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp106: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp106/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp107: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp107/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp108: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp108/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp10b: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp10b/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp10b/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp10b/pmu: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gv100: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gv100/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gv100/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gv100/nvdec: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gv100/sec2: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu102: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu102/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu102/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu102/nvdec: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu102/sec2: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu104: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu104/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu106: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu106/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu116: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu116/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu116/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu116/nvdec: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu116/sec2: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu117: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu117/gr: Makefile Makefile.inc Log Message: Add newer nouveau firmware build goo Symlinks inferred from linux-firmware/WHENCE and compared to a linux distro's firmware. Note: said linux distro appears to have some mistakes compared to the linux-firmware repo in linking ucode_unload.bin to unload_bl.bin and vice versa in some places. I didn't replicate this aspect, and lack the hardware to test it. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/gpufw/mi cvs rdiff
CVS commit: src
Module Name:src Committed By: maya Date: Mon Dec 13 23:59:42 UTC 2021 Modified Files: src/distrib/sets/lists/gpufw: mi src/etc/mtree: NetBSD.dist.base src/external/nvidia-firmware: Makefile Added Files: src/external/nvidia-firmware/nouveau: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/common: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gk20a: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm200: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm200/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm200/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm204: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm204/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm206: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm206/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm206/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm20b: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm20b/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm20b/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm20b/pmu: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp100: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp100/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp100/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp102: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp102/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp102/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp102/nvdec: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp102/sec2: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp104: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp104/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp106: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp106/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp107: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp107/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp108: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp108/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp10b: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp10b/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp10b/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp10b/pmu: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gv100: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gv100/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gv100/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gv100/nvdec: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gv100/sec2: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu102: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu102/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu102/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu102/nvdec: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu102/sec2: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu104: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu104/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu106: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu106/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu116: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu116/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu116/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu116/nvdec: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu116/sec2: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu117: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu117/gr: Makefile Makefile.inc Log Message: Add newer nouveau firmware build goo Symlinks inferred from linux-firmware/WHENCE and compared to a linux distro's firmware. Note: said linux distro appears to have some mistakes compared to the linux-firmware repo in linking ucode_unload.bin to unload_bl.bin and vice versa in some places. I didn't replicate this aspect, and lack the hardware to test it. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/gpufw/mi cvs rdiff
CVS commit: src
Module Name:src Committed By: maya Date: Sun Dec 12 20:33:22 UTC 2021 Modified Files: src/distrib/sets/lists/gpufw: mi src/etc/mtree: NetBSD.dist.base src/external: Makefile src/share/mk: bsd.own.mk Added Files: src/external/amdgpu-firmware: Makefile src/external/amdgpu-firmware/amdgpu: Makefile Makefile.inc Log Message: Add amdgpu firmware build goo (disabled) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/gpufw/mi cvs rdiff -u -r1.238 -r1.239 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.22 -r1.23 src/external/Makefile cvs rdiff -u -r0 -r1.1 src/external/amdgpu-firmware/Makefile cvs rdiff -u -r0 -r1.1 src/external/amdgpu-firmware/amdgpu/Makefile \ src/external/amdgpu-firmware/amdgpu/Makefile.inc cvs rdiff -u -r1.1269 -r1.1270 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.
CVS commit: src
Module Name:src Committed By: maya Date: Sun Dec 12 20:33:22 UTC 2021 Modified Files: src/distrib/sets/lists/gpufw: mi src/etc/mtree: NetBSD.dist.base src/external: Makefile src/share/mk: bsd.own.mk Added Files: src/external/amdgpu-firmware: Makefile src/external/amdgpu-firmware/amdgpu: Makefile Makefile.inc Log Message: Add amdgpu firmware build goo (disabled) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/gpufw/mi cvs rdiff -u -r1.238 -r1.239 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.22 -r1.23 src/external/Makefile cvs rdiff -u -r0 -r1.1 src/external/amdgpu-firmware/Makefile cvs rdiff -u -r0 -r1.1 src/external/amdgpu-firmware/amdgpu/Makefile \ src/external/amdgpu-firmware/amdgpu/Makefile.inc cvs rdiff -u -r1.1269 -r1.1270 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/distrib/sets/lists/gpufw/mi diff -u src/distrib/sets/lists/gpufw/mi:1.3 src/distrib/sets/lists/gpufw/mi:1.4 --- src/distrib/sets/lists/gpufw/mi:1.3 Sat Sep 25 21:26:04 2021 +++ src/distrib/sets/lists/gpufw/mi Sun Dec 12 20:33:21 2021 @@ -1,8 +1,369 @@ -# $NetBSD: mi,v 1.3 2021/09/25 21:26:04 maya Exp $ +# $NetBSD: mi,v 1.4 2021/12/12 20:33:21 maya Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # ./etc/mtree/set.gpufwbase-gpufw +./libdata/firmware/amdgpubase-gpufw +./libdata/firmware/amdgpu/LICENSE.amdgpu base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/arcturus_asd.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/arcturus_gpu_info.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/arcturus_mec.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/arcturus_mec2.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/arcturus_rlc.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/arcturus_sdma.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/arcturus_smc.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/arcturus_sos.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/arcturus_ta.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/arcturus_vcn.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/banks_k_2_smc.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/bonaire_ce.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/bonaire_k_smc.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/bonaire_mc.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/bonaire_me.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/fiji_ce.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/bonaire_mec.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/bonaire_pfp.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/bonaire_rlc.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/bonaire_sdma.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/bonaire_sdma1.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/bonaire_smc.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/bonaire_uvd.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/bonaire_vce.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/carrizo_ce.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/carrizo_me.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/carrizo_mec.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/carrizo_mec2.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/carrizo_pfp.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/carrizo_rlc.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/carrizo_sdma.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/carrizo_sdma1.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/carrizo_uvd.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/carrizo_vce.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/fiji_me.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/fiji_mec.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/fiji_mec2.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/fiji_pfp.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/fiji_rlc.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/fiji_sdma.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/fiji_sdma1.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/fiji_smc.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/fiji_uvd.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/fiji_vce.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/hainan_ce.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/hainan_k_smc.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/hainan_mc.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/hainan_me.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/hainan_pfp.bin
CVS import: src/external/nvidia-firmware/nouveau/dist
Module Name:src Committed By: maya Date: Sun Dec 12 18:35:59 UTC 2021 Update of /cvsroot/src/external/nvidia-firmware/nouveau/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9744 Log Message: Import nvidia firmware from linux-firmware repository at commit: commit 2984e265cac6ef19a0de4fb21396fb87f45273d9 Merge: 6f5aada 359ab77 Author: Josh Boyer Date: Fri Sep 3 11:11:05 2021 -0400 Merge tag 'iwlwifi-fw-2021-09-02' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware into main Revert accidentally released untested binaries Signed-off-by: Josh Boyer Done by removing tegra related directories in linux-firmware. Status: Vendor Tag: LINUX-FIRMWARE Release Tags: linux-firmware-2021-09-03-2984e265 N src/external/nvidia-firmware/nouveau/dist/gk20a/fecs_data.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/fecs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/gpccs_data.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/gpccs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/sw_bundle_init.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/sw_ctx.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/sw_method_init.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/sw_nonctx.bin N src/external/nvidia-firmware/nouveau/dist/gm200/acr/bl.bin N src/external/nvidia-firmware/nouveau/dist/gm200/acr/ucode_load.bin N src/external/nvidia-firmware/nouveau/dist/gm200/acr/ucode_unload.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/fecs_bl.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/fecs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/fecs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/fecs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/gpccs_bl.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/gpccs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/gpccs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/gpccs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/sw_bundle_init.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/sw_ctx.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/sw_method_init.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/sw_nonctx.bin N src/external/nvidia-firmware/nouveau/dist/gm204/gr/fecs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm204/gr/fecs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm204/gr/gpccs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm204/gr/gpccs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm206/acr/ucode_load.bin N src/external/nvidia-firmware/nouveau/dist/gm206/acr/ucode_unload.bin N src/external/nvidia-firmware/nouveau/dist/gm206/gr/fecs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm206/gr/fecs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm206/gr/gpccs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm206/gr/gpccs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/acr/bl.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/acr/ucode_load.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/fecs_bl.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/fecs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/fecs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/fecs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/gpccs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/gpccs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/sw_bundle_init.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/sw_ctx.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/sw_nonctx.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/pmu/desc.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/pmu/image.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/pmu/sig.bin N src/external/nvidia-firmware/nouveau/dist/gp100/acr/bl.bin N src/external/nvidia-firmware/nouveau/dist/gp100/acr/ucode_load.bin N src/external/nvidia-firmware/nouveau/dist/gp100/acr/ucode_unload.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/fecs_data.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/fecs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/fecs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/gpccs_data.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/gpccs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/gpccs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/sw_bundle_init.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/sw_ctx.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/sw_method_init.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/sw_nonctx.bin N src/external/nvidia-firmware/nouveau/dist/gp102/acr/bl.bin N src/external/nvidia-firmware/nouveau/dist/gp102/acr/ucode_load.bin N
CVS import: src/external/nvidia-firmware/nouveau/dist
Module Name:src Committed By: maya Date: Sun Dec 12 18:35:59 UTC 2021 Update of /cvsroot/src/external/nvidia-firmware/nouveau/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9744 Log Message: Import nvidia firmware from linux-firmware repository at commit: commit 2984e265cac6ef19a0de4fb21396fb87f45273d9 Merge: 6f5aada 359ab77 Author: Josh Boyer Date: Fri Sep 3 11:11:05 2021 -0400 Merge tag 'iwlwifi-fw-2021-09-02' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware into main Revert accidentally released untested binaries Signed-off-by: Josh Boyer Done by removing tegra related directories in linux-firmware. Status: Vendor Tag: LINUX-FIRMWARE Release Tags: linux-firmware-2021-09-03-2984e265 N src/external/nvidia-firmware/nouveau/dist/gk20a/fecs_data.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/fecs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/gpccs_data.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/gpccs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/sw_bundle_init.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/sw_ctx.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/sw_method_init.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/sw_nonctx.bin N src/external/nvidia-firmware/nouveau/dist/gm200/acr/bl.bin N src/external/nvidia-firmware/nouveau/dist/gm200/acr/ucode_load.bin N src/external/nvidia-firmware/nouveau/dist/gm200/acr/ucode_unload.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/fecs_bl.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/fecs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/fecs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/fecs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/gpccs_bl.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/gpccs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/gpccs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/gpccs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/sw_bundle_init.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/sw_ctx.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/sw_method_init.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/sw_nonctx.bin N src/external/nvidia-firmware/nouveau/dist/gm204/gr/fecs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm204/gr/fecs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm204/gr/gpccs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm204/gr/gpccs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm206/acr/ucode_load.bin N src/external/nvidia-firmware/nouveau/dist/gm206/acr/ucode_unload.bin N src/external/nvidia-firmware/nouveau/dist/gm206/gr/fecs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm206/gr/fecs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm206/gr/gpccs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm206/gr/gpccs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/acr/bl.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/acr/ucode_load.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/fecs_bl.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/fecs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/fecs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/fecs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/gpccs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/gpccs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/sw_bundle_init.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/sw_ctx.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/sw_nonctx.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/pmu/desc.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/pmu/image.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/pmu/sig.bin N src/external/nvidia-firmware/nouveau/dist/gp100/acr/bl.bin N src/external/nvidia-firmware/nouveau/dist/gp100/acr/ucode_load.bin N src/external/nvidia-firmware/nouveau/dist/gp100/acr/ucode_unload.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/fecs_data.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/fecs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/fecs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/gpccs_data.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/gpccs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/gpccs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/sw_bundle_init.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/sw_ctx.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/sw_method_init.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/sw_nonctx.bin N src/external/nvidia-firmware/nouveau/dist/gp102/acr/bl.bin N src/external/nvidia-firmware/nouveau/dist/gp102/acr/ucode_load.bin N
CVS import: src/external/amdgpu-firmware/amdgpu/dist
Module Name:src Committed By: maya Date: Sun Dec 12 16:40:08 UTC 2021 Update of /cvsroot/src/external/amdgpu-firmware/amdgpu/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5223 Log Message: Import AMDGPU firmware from linux-firmware repository at commit: commit 2984e265cac6ef19a0de4fb21396fb87f45273d9 Merge: 6f5aada 359ab77 Author: Josh Boyer Date: Fri Sep 3 11:11:05 2021 -0400 Merge tag 'iwlwifi-fw-2021-09-02' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware into main Revert accidentally released untested binaries Signed-off-by: Josh Boyer Cherry picking files using the following method: grep -R MODULE_FIRMWARE bsd/drm2/dist/drm/amd Replace macros as needed. Exclues navi10_mes.bin which doesn't exist on linux-firmware for some reason. Status: Vendor Tag: LINUX-FIRMWARE Release Tags: linux-firmware-2021-09-03-2984e265 N src/external/amdgpu-firmware/amdgpu/dist/arcturus_asd.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_gpu_info.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_mec2.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_sdma.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_sos.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_ta.bin N src/external/amdgpu-firmware/amdgpu/dist/banks_k_2_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_k_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_mc.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_me.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_sdma.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_sdma1.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_me.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_mec2.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_sdma.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_sdma1.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_me.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_mec2.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_sdma.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_sdma1.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_mc.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_k_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_me.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_k_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_mc.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_me.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_sdma.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_sdma1.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_me.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/si58_mc.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_sdma.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_sdma1.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_me.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_mec2.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_sdma.bin N
CVS import: src/external/amdgpu-firmware/amdgpu/dist
Module Name:src Committed By: maya Date: Sun Dec 12 16:40:08 UTC 2021 Update of /cvsroot/src/external/amdgpu-firmware/amdgpu/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5223 Log Message: Import AMDGPU firmware from linux-firmware repository at commit: commit 2984e265cac6ef19a0de4fb21396fb87f45273d9 Merge: 6f5aada 359ab77 Author: Josh Boyer Date: Fri Sep 3 11:11:05 2021 -0400 Merge tag 'iwlwifi-fw-2021-09-02' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware into main Revert accidentally released untested binaries Signed-off-by: Josh Boyer Cherry picking files using the following method: grep -R MODULE_FIRMWARE bsd/drm2/dist/drm/amd Replace macros as needed. Exclues navi10_mes.bin which doesn't exist on linux-firmware for some reason. Status: Vendor Tag: LINUX-FIRMWARE Release Tags: linux-firmware-2021-09-03-2984e265 N src/external/amdgpu-firmware/amdgpu/dist/arcturus_asd.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_gpu_info.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_mec2.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_sdma.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_sos.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_ta.bin N src/external/amdgpu-firmware/amdgpu/dist/banks_k_2_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_k_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_mc.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_me.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_sdma.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_sdma1.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_me.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_mec2.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_sdma.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_sdma1.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_me.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_mec2.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_sdma.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_sdma1.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_mc.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_k_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_me.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_k_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_mc.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_me.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_sdma.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_sdma1.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_me.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/si58_mc.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_sdma.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_sdma1.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_me.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_mec2.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_sdma.bin N
CVS commit: src/distrib/amd64
Module Name:src
Committed By: maya
Date: Fri Oct 8 20:24:06 UTC 2021
Modified Files:
src/distrib/amd64: Makefile
Added Files:
src/distrib/amd64/installimage-bios: Makefile boot.cfg.in etc.rc
etc.ttys install.sh spec.inst
Log Message:
Restore having a BIOS-only amd64 USB image.
Several people reported having hardware that struggles booting the mix
EFI+BIOS image, and it's better to offer them a working image.
Keeping the EFI image as having the obvious name, this is going to become
more likely to work by default as newer hardware may not support BIOS boot.
(XXX pullup-9)
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/amd64/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/amd64/installimage-bios/Makefile \
src/distrib/amd64/installimage-bios/boot.cfg.in \
src/distrib/amd64/installimage-bios/etc.rc \
src/distrib/amd64/installimage-bios/etc.ttys \
src/distrib/amd64/installimage-bios/install.sh \
src/distrib/amd64/installimage-bios/spec.inst
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/Makefile
diff -u src/distrib/amd64/Makefile:1.14 src/distrib/amd64/Makefile:1.15
--- src/distrib/amd64/Makefile:1.14 Wed May 27 22:27:58 2020
+++ src/distrib/amd64/Makefile Fri Oct 8 20:24:06 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/05/27 22:27:58 maya Exp $
+# $NetBSD: Makefile,v 1.15 2021/10/08 20:24:06 maya Exp $
.include
@@ -14,6 +14,7 @@ SUBDIR+= .WAIT
SUBDIR+= cdroms
SUBDIR+= liveimage
SUBDIR+= installimage
+SUBDIR+= installimage-bios
TARGETS+= release
iso_image:
@@ -24,5 +25,6 @@ live_image:
install_image:
${MAKEDIRTARGET} installimage install_image
+ ${MAKEDIRTARGET} installimage-bios install_image
.include
Added files:
Index: src/distrib/amd64/installimage-bios/Makefile
diff -u /dev/null src/distrib/amd64/installimage-bios/Makefile:1.1
--- /dev/null Fri Oct 8 20:24:06 2021
+++ src/distrib/amd64/installimage-bios/Makefile Fri Oct 8 20:24:06 2021
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile,v 1.1 2021/10/08 20:24:06 maya Exp $
+
+.include
+
+INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-bios-install # gives ${IMGBASE}.img
+
+INSTIMAGEMB?= 1800 # for all installation binaries
+
+PRIMARY_BOOT= bootxx_ffsv1
+SECONDARY_BOOT= boot
+SECONDARY_BOOT_ARG= # unnecessary
+
+USE_MBR= yes
+
+CLEANFILES+= boot.cfg
+
+prepare_md_post:
+ ${TOOL_SED} \
+ -e "s/@@MACHINE@@/${MACHINE}/"\
+ -e "s/@@VERSION@@/${DISTRIBVER}/"\
+ < ${.CURDIR}/boot.cfg.in > boot.cfg
+
+DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd
+SYSINSTDIR!= cd ${.CURDIR}/../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR}
+
+SPEC_EXTRA= ${.CURDIR}/spec.inst
+IMGFILE_EXTRA=\
+ ${.CURDIR}/etc.ttys etc/ttys \
+ ${.CURDIR}/etc.rc etc/rc\
+ ${.CURDIR}/install.sh .\
+ ${.OBJDIR}/boot.cfg .\
+ ${SYSINSTDIR}/sysinstmsgs.de .\
+ ${SYSINSTDIR}/sysinstmsgs.es .\
+ ${SYSINSTDIR}/sysinstmsgs.fr .\
+ ${SYSINSTDIR}/sysinstmsgs.pl .\
+ ${SYSINSTDIR}/sysinst .
+
+.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage"
Index: src/distrib/amd64/installimage-bios/boot.cfg.in
diff -u /dev/null src/distrib/amd64/installimage-bios/boot.cfg.in:1.1
--- /dev/null Fri Oct 8 20:24:06 2021
+++ src/distrib/amd64/installimage-bios/boot.cfg.in Fri Oct 8 20:24:06 2021
@@ -0,0 +1,9 @@
+banner=Welcome to the NetBSD/@@MACHINE@@ @@VERSION@@ installation image
+banner
+banner=
+banner=If you encounter a problem while booting, report a bug at
+banner=https://www.NetBSD.org/.
+menu=Install NetBSD:boot netbsd
+menu=Drop to boot prompt:prompt
+timeout=30
+clear=1
Index: src/distrib/amd64/installimage-bios/etc.rc
diff -u /dev/null src/distrib/amd64/installimage-bios/etc.rc:1.1
--- /dev/null Fri Oct 8 20:24:06 2021
+++ src/distrib/amd64/installimage-bios/etc.rc Fri Oct 8 20:24:06 2021
@@ -0,0 +1,49 @@
+# $NetBSD: etc.rc,v 1.1 2021/10/08 20:24:06 maya Exp $
+#
+# Copyright (c) 1997 Perry E. Metzger
+# Copyright (c) 1994 Christopher G. Demetriou
+# 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.
+# 3. All advertising materials mentioning features or use of this software
+#must display the following acknowledgement:
+# This product includes software developed for the
+# NetBSD Project. See http://www.NetBSD.org/ for
CVS commit: src/distrib/amd64
Module Name:src Committed By: maya Date: Fri Oct 8 20:24:06 UTC 2021 Modified Files: src/distrib/amd64: Makefile Added Files: src/distrib/amd64/installimage-bios: Makefile boot.cfg.in etc.rc etc.ttys install.sh spec.inst Log Message: Restore having a BIOS-only amd64 USB image. Several people reported having hardware that struggles booting the mix EFI+BIOS image, and it's better to offer them a working image. Keeping the EFI image as having the obvious name, this is going to become more likely to work by default as newer hardware may not support BIOS boot. (XXX pullup-9) To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/distrib/amd64/Makefile cvs rdiff -u -r0 -r1.1 src/distrib/amd64/installimage-bios/Makefile \ src/distrib/amd64/installimage-bios/boot.cfg.in \ src/distrib/amd64/installimage-bios/etc.rc \ src/distrib/amd64/installimage-bios/etc.ttys \ src/distrib/amd64/installimage-bios/install.sh \ src/distrib/amd64/installimage-bios/spec.inst Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: maya
Date: Sun Sep 26 15:52:41 UTC 2021
Modified Files:
src/etc: Makefile
src/external/nvidia-firmware: Makefile
src/share/mk: bsd.README bsd.own.mk
src/sys/dev/microcode/radeon: Makefile
src/usr.sbin/sysinst: Makefile.inc defs.h util.c
Log Message:
Restore MKNOUVEAUFIRMWARE and MKRADEONFIRMWARE and make gpufw set unconditional
Simplifies logic.
(Second commit - first one was partial)
Restoring MK* requested by mrg on tech-kern discussion
https://mail-index.netbsd.org/tech-kern/2021/09/25/msg027695.html
To generate a diff of this commit:
cvs rdiff -u -r1.451 -r1.452 src/etc/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/nvidia-firmware/Makefile
cvs rdiff -u -r1.417 -r1.418 src/share/mk/bsd.README
cvs rdiff -u -r1.1261 -r1.1262 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/microcode/radeon/Makefile
cvs rdiff -u -r1.42 -r1.43 src/usr.sbin/sysinst/Makefile.inc
cvs rdiff -u -r1.73 -r1.74 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.60 -r1.61 src/usr.sbin/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.451 src/etc/Makefile:1.452
--- src/etc/Makefile:1.451 Sat Sep 25 08:54:30 2021
+++ src/etc/Makefile Sun Sep 26 15:52:40 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.451 2021/09/25 08:54:30 maya Exp $
+# $NetBSD: Makefile,v 1.452 2021/09/26 15:52:40 maya Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -368,16 +368,13 @@ install-etc-files: .PHONY .MAKE check_DE
# Install var/db/obsolete set lists; this is performed by "make build"
#
OBSOLETE.dir= ${.OBJDIR}/obsolete.dir
-OBSOLETE.files= base comp etc games man misc rescue text
+OBSOLETE.files= base comp etc games gpufw man misc rescue text
.if ${MKDEBUG} != "no"
OBSOLETE.files+= debug
.endif
.if ${MKDTB} != "no"
OBSOLETE.files+= dtb
.endif
-.if ${MKGPUFIRMWARE} != "no"
-OBSOLETE.files+= gpufw
-.endif
.if ${MKKMOD} != "no"
OBSOLETE.files+= modules
.endif
Index: src/external/nvidia-firmware/Makefile
diff -u src/external/nvidia-firmware/Makefile:1.4 src/external/nvidia-firmware/Makefile:1.5
--- src/external/nvidia-firmware/Makefile:1.4 Sat Sep 25 08:54:30 2021
+++ src/external/nvidia-firmware/Makefile Sun Sep 26 15:52:40 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2021/09/25 08:54:30 maya Exp $
+# $NetBSD: Makefile,v 1.5 2021/09/26 15:52:40 maya Exp $
.include
-.if ${MKGPUFIRMWARE} != "no"
+.if ${MKNOUVEAUFIRMWARE} != "no"
SUBDIR+= gm20x
.endif
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.417 src/share/mk/bsd.README:1.418
--- src/share/mk/bsd.README:1.417 Sat Sep 25 08:54:30 2021
+++ src/share/mk/bsd.README Sun Sep 26 15:52:40 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.417 2021/09/25 08:54:30 maya Exp $
+# $NetBSD: bsd.README,v 1.418 2021/09/26 15:52:40 maya Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -218,10 +218,6 @@ MKFIRMWARE If not "no", install the
Default: yes on amd64, cobalt, evbarm evbmips, evbppc, hpcarm,
hppa, i386, mac68k, macppc, sandpoint, and sparc64, no elsewhere.
-MKGPUFIRMWARE If not "no", install the /libdata/firmware directory,
- which is necessary for GPU drivers.
- Default: yes on amd64, i386, evbarm. No elsewhere.
-
MKGCC If "no", don't build gcc(1) or any of the GCC-related
libraries (libgcc, libobjc, libstdc++).
Default: yes
@@ -373,6 +369,10 @@ MKNLS If "no", don't build or install t
definition files.
Default: yes
+MKNOUVEAUFIRMWARE If "yes", install the /libdata/firmware/nouveau directory,
+ which is necessary for the nouveau DRM driver.
+ Default: yes on amd64 and i386, no elsewhere.
+
MKNPF If "no", don't build or install the NPF and its modules.
Default: yes
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1261 src/share/mk/bsd.own.mk:1.1262
--- src/share/mk/bsd.own.mk:1.1261 Sat Sep 25 08:54:30 2021
+++ src/share/mk/bsd.own.mk Sun Sep 26 15:52:40 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1261 2021/09/25 08:54:30 maya Exp $
+# $NetBSD: bsd.own.mk,v 1.1262 2021/09/26 15:52:40 maya Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1236,9 +1236,12 @@ MKFIRMWARE.sandpoint= yes
MKFIRMWARE.sparc64= yes
# Only install the GPU firmware on DRM-happy systems.
-MKGPUFIRMWARE.x86_64= yes
-MKGPUFIRMWARE.i386= yes
-MKGPUFIRMWARE.aarch64= yes
+MKNOUVEAUFIRMWARE.x86_64= yes
+MKNOUVEAUFIRMWARE.i386= yes
+MKNOUVEAUFIRMWARE.aarch64= yes
+MKRADEONFIRMWARE.x86_64= yes
+MKRADEONFIRMWARE.i386= yes
+MKRADEONFIRMWARE.aarch64= yes
# Only install the tegra firmware on evbarm.
MKTEGRAFIRMWARE.evbarm= yes
@@ -1288,9 +1291,10 @@ _MKVARS.no= \
MKKYUA \
MKLIBCXX MKLLD MKLLDB MKLLVM MKLLVMRT MKLINT \
MKMANZ
CVS commit: src
Module Name:src Committed By: maya Date: Sun Sep 26 15:52:41 UTC 2021 Modified Files: src/etc: Makefile src/external/nvidia-firmware: Makefile src/share/mk: bsd.README bsd.own.mk src/sys/dev/microcode/radeon: Makefile src/usr.sbin/sysinst: Makefile.inc defs.h util.c Log Message: Restore MKNOUVEAUFIRMWARE and MKRADEONFIRMWARE and make gpufw set unconditional Simplifies logic. (Second commit - first one was partial) Restoring MK* requested by mrg on tech-kern discussion https://mail-index.netbsd.org/tech-kern/2021/09/25/msg027695.html To generate a diff of this commit: cvs rdiff -u -r1.451 -r1.452 src/etc/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/nvidia-firmware/Makefile cvs rdiff -u -r1.417 -r1.418 src/share/mk/bsd.README cvs rdiff -u -r1.1261 -r1.1262 src/share/mk/bsd.own.mk cvs rdiff -u -r1.7 -r1.8 src/sys/dev/microcode/radeon/Makefile cvs rdiff -u -r1.42 -r1.43 src/usr.sbin/sysinst/Makefile.inc cvs rdiff -u -r1.73 -r1.74 src/usr.sbin/sysinst/defs.h cvs rdiff -u -r1.60 -r1.61 src/usr.sbin/sysinst/util.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib
Module Name:src
Committed By: maya
Date: Sat Sep 25 21:26:04 UTC 2021
Modified Files:
src/distrib/common/bootimage: Makefile.installimage
src/distrib/sets: sets.subr
src/distrib/sets/lists/gpufw: mi
Log Message:
Restore MKNOUVEAUFIRMWARE and MKRADEONFIRMWARE and make gpufw set unconditional
Simplifies logic.
Restoring MK* requested by mrg on tech-kern discussion
https://mail-index.netbsd.org/tech-kern/2021/09/25/msg027695.html
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/common/bootimage/Makefile.installimage
cvs rdiff -u -r1.196 -r1.197 src/distrib/sets/sets.subr
cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/gpufw/mi
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/bootimage/Makefile.installimage
diff -u src/distrib/common/bootimage/Makefile.installimage:1.9 src/distrib/common/bootimage/Makefile.installimage:1.10
--- src/distrib/common/bootimage/Makefile.installimage:1.9 Sat Sep 25 08:54:29 2021
+++ src/distrib/common/bootimage/Makefile.installimage Sat Sep 25 21:26:03 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.installimage,v 1.9 2021/09/25 08:54:29 maya Exp $
+# $NetBSD: Makefile.installimage,v 1.10 2021/09/25 21:26:03 maya Exp $
#
# Common Makefile to create a bootable installation image for USB flash etc.
#
@@ -32,10 +32,7 @@ IMAGEMB= ${INSTIMAGEMB}
SWAPMB= 0 # no swap
KERN_SET?= kern-GENERIC
-SETS?= modules base etc
-.if ${MKGPUFIRMWARE:Uno} != "no"
-SETS+= gpufw
-.endif
+SETS?= gpufw modules base etc
FSTAB_IN?= ${NETBSDSRCDIR}/distrib/common/bootimage/fstab.install.in
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.196 src/distrib/sets/sets.subr:1.197
--- src/distrib/sets/sets.subr:1.196 Sat Sep 25 08:54:30 2021
+++ src/distrib/sets/sets.subr Sat Sep 25 21:26:03 2021
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.196 2021/09/25 08:54:30 maya Exp $
+# $NetBSD: sets.subr,v 1.197 2021/09/25 21:26:03 maya Exp $
#
#
@@ -143,11 +143,6 @@ else
module=yes
modset="modules"
fi
-if [ "${MKGPUFIRMWARE}" = "no" ]; then
- gpufwset=""
-else
- gpufwset="gpufw"
-fi
if [ "${MKATF}" = "no" ]; then
testset=""
else
@@ -176,7 +171,7 @@ stlib=$shlib
if [ "${MKPIC}" = "no" ]; then
shlib=no
fi
-nlists="base comp $debugset $dtbset etc games $gpufwset man misc $modset rescue $testset text"
+nlists="base comp $debugset $dtbset etc games gpufw man misc $modset rescue $testset text"
xlists="xbase xcomp $xdebugset xetc xfont xserver"
extlists="extbase extcomp extetc"
@@ -197,7 +192,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.196 2021/09/25 08:54:30 maya Exp $
+# # $NetBSD: sets.subr,v 1.197 2021/09/25 21:26:03 maya Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
Index: src/distrib/sets/lists/gpufw/mi
diff -u src/distrib/sets/lists/gpufw/mi:1.2 src/distrib/sets/lists/gpufw/mi:1.3
--- src/distrib/sets/lists/gpufw/mi:1.2 Sat Sep 25 21:18:22 2021
+++ src/distrib/sets/lists/gpufw/mi Sat Sep 25 21:26:04 2021
@@ -1,171 +1,171 @@
-# $NetBSD: mi,v 1.2 2021/09/25 21:18:22 maya Exp $
+# $NetBSD: mi,v 1.3 2021/09/25 21:26:04 maya Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
./etc/mtree/set.gpufwbase-gpufw
-./libdata/firmware/nouveau/nvidia/LICENCE.nvidiabase-gpufw gpufirmware
-./libdata/firmware/nouveau/nvidia/gm206/fecs_data.bin base-gpufw gpufirmware
-./libdata/firmware/nouveau/nvidia/gm206/fecs_inst.bin base-gpufw gpufirmware
-./libdata/firmware/nouveau/nvidia/gm206/gpccs_data.bin base-gpufw gpufirmware
-./libdata/firmware/nouveau/nvidia/gm206/gpccs_inst.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/ARUBA_me.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/ARUBA_pfp.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/ARUBA_rlc.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/BARTS_mc.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/BARTS_me.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/BARTS_pfp.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/BARTS_smc.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/BONAIRE_ce.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/BONAIRE_mc.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/BONAIRE_mc2.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/BONAIRE_me.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/BONAIRE_mec.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/BONAIRE_pfp.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/BONAIRE_rlc.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/BONAIRE_sdma.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/BONAIRE_smc.bin base-gpufw gpufirmware
CVS commit: src/distrib
Module Name:src Committed By: maya Date: Sat Sep 25 21:26:04 UTC 2021 Modified Files: src/distrib/common/bootimage: Makefile.installimage src/distrib/sets: sets.subr src/distrib/sets/lists/gpufw: mi Log Message: Restore MKNOUVEAUFIRMWARE and MKRADEONFIRMWARE and make gpufw set unconditional Simplifies logic. Restoring MK* requested by mrg on tech-kern discussion https://mail-index.netbsd.org/tech-kern/2021/09/25/msg027695.html To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/distrib/common/bootimage/Makefile.installimage cvs rdiff -u -r1.196 -r1.197 src/distrib/sets/sets.subr cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/gpufw/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/gpufw
Module Name:src Committed By: maya Date: Sat Sep 25 21:18:22 UTC 2021 Modified Files: src/distrib/sets/lists/gpufw: mi Log Message: Remove duplicate line - also appears in base/mi. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/gpufw/mi 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/gpufw/mi diff -u src/distrib/sets/lists/gpufw/mi:1.1 src/distrib/sets/lists/gpufw/mi:1.2 --- src/distrib/sets/lists/gpufw/mi:1.1 Sat Sep 25 08:54:30 2021 +++ src/distrib/sets/lists/gpufw/mi Sat Sep 25 21:18:22 2021 @@ -1,10 +1,9 @@ -# $NetBSD: mi,v 1.1 2021/09/25 08:54:30 maya Exp $ +# $NetBSD: mi,v 1.2 2021/09/25 21:18:22 maya Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # ./etc/mtree/set.gpufwbase-gpufw ./libdata/firmware/nouveau/nvidia/LICENCE.nvidiabase-gpufw gpufirmware -./libdata/firmware/nouveau/nvidia/gm206 base-gpufw ./libdata/firmware/nouveau/nvidia/gm206/fecs_data.bin base-gpufw gpufirmware ./libdata/firmware/nouveau/nvidia/gm206/fecs_inst.bin base-gpufw gpufirmware ./libdata/firmware/nouveau/nvidia/gm206/gpccs_data.bin base-gpufw gpufirmware
CVS commit: src/distrib/sets/lists/gpufw
Module Name:src Committed By: maya Date: Sat Sep 25 21:18:22 UTC 2021 Modified Files: src/distrib/sets/lists/gpufw: mi Log Message: Remove duplicate line - also appears in base/mi. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/gpufw/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: maya Date: Sat Sep 25 17:55:37 UTC 2021 Modified Files: src/distrib/sets/lists/debug: module.md.amd64 module.md.i386 src/distrib/sets/lists/modules: md.amd64 md.i386 src/sys/modules: Makefile Log Message: Disable drmkms module builds. They haven't been functional (and won't be before fixing genfb abi). In a new drm update, we haven't prioritized fixing the build either. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug/module.md.amd64 cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/debug/module.md.i386 cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/lists/modules/md.amd64 cvs rdiff -u -r1.90 -r1.91 src/distrib/sets/lists/modules/md.i386 cvs rdiff -u -r1.255 -r1.256 src/sys/modules/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/sets/lists/debug/module.md.amd64 diff -u src/distrib/sets/lists/debug/module.md.amd64:1.5 src/distrib/sets/lists/debug/module.md.amd64:1.6 --- src/distrib/sets/lists/debug/module.md.amd64:1.5 Thu Mar 25 21:37:10 2021 +++ src/distrib/sets/lists/debug/module.md.amd64 Sat Sep 25 17:55:37 2021 @@ -1,4 +1,4 @@ -# $NetBSD: module.md.amd64,v 1.5 2021/03/25 21:37:10 nia Exp $ +# $NetBSD: module.md.amd64,v 1.6 2021/09/25 17:55:37 maya Exp $ ./usr/libdata/debug/@MODULEDIR@/acpiacadmodules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/acpiacad/acpiacad.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/acpibatmodules-base-kernel kmod,debug @@ -105,14 +105,14 @@ ./usr/libdata/debug/@MODULEDIR@/cxdtv/cxdtv.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/drmmodules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/drm/drm.kmod.debug modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkmsmodules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms/drmkms.kmod.debug modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms_agp modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms_agp/drmkms_agp.kmod.debug modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms_linux modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms_linux/drmkms_linux.kmod.debug modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms_pci modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms_pci/drmkms_pci.kmod.debug modules-base-kernel kmod,debug +./usr/libdata/debug/@MODULEDIR@/drmkmsmodules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms/drmkms.kmod.debug modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms_agp modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms_agp/drmkms_agp.kmod.debug modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms_linux modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms_linux/drmkms_linux.kmod.debug modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms_pci modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms_pci/drmkms_pci.kmod.debug modules-obsolete obsolete ./usr/libdata/debug/@MODULEDIR@/dtrace_syscall_linux modules-base-kernel kmod,dtrace,debug ./usr/libdata/debug/@MODULEDIR@/dtrace_syscall_linux/dtrace_syscall_linux.kmod.debug modules-base-kernel kmod,dtrace,debug ./usr/libdata/debug/@MODULEDIR@/dtrace_syscall_linux32 modules-base-kernel kmod,dtrace,debug @@ -149,8 +149,8 @@ ./usr/libdata/debug/@MODULEDIR@/hpqlb/hpqlb.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/i915drmmodules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/i915drm/i915drm.kmod.debug modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/i915drmkms modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/i915drmkms/i915drmkms.kmod.debug modules-base-kernel kmod,debug +./usr/libdata/debug/@MODULEDIR@/i915drmkms modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/i915drmkms/i915drmkms.kmod.debug modules-obsolete obsolete ./usr/libdata/debug/@MODULEDIR@/ichsmbmodules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/ichsmb/ichsmb.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/if_iavfmodules-base-kernel kmod,debug Index: src/distrib/sets/lists/debug/module.md.i386 diff -u src/distrib/sets/lists/debug/module.md.i386:1.3 src/distrib/sets/lists/debug/module.md.i386:1.4 --- src/distrib/sets/lists/debug/module.md.i386:1.3 Thu Mar 25 21:37:10 2021 +++ src/distrib/sets/lists/debug/module.md.i386 Sat Sep 25 17:55:37 2021 @@ -1,4 +1,4 @@ -# $NetBSD: module.md.i386,v 1.3 2021/03/25 21:37:10 nia Exp $ +# $NetBSD: module.md.i386,v 1.4 2021/09/25 17:55:37 maya Exp $ ./usr/libdata/debug/@MODULEDIR@/acpiacadmodules-base-kernel kmod,debug
CVS commit: src
Module Name:src Committed By: maya Date: Sat Sep 25 17:55:37 UTC 2021 Modified Files: src/distrib/sets/lists/debug: module.md.amd64 module.md.i386 src/distrib/sets/lists/modules: md.amd64 md.i386 src/sys/modules: Makefile Log Message: Disable drmkms module builds. They haven't been functional (and won't be before fixing genfb abi). In a new drm update, we haven't prioritized fixing the build either. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug/module.md.amd64 cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/debug/module.md.i386 cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/lists/modules/md.amd64 cvs rdiff -u -r1.90 -r1.91 src/distrib/sets/lists/modules/md.i386 cvs rdiff -u -r1.255 -r1.256 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: maya
Date: Sat Sep 25 08:54:31 UTC 2021
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/common/bootimage: Makefile.bootimage Makefile.installimage
src/distrib/i386/cdroms: Makefile.cdrom
src/distrib/notes/amd64: contents
src/distrib/notes/evbarm: contents
src/distrib/notes/i386: contents
src/distrib/sets: README maketars regpkgset sets.subr
src/distrib/sets/lists/base: mi
src/distrib/utils/embedded: mkimage
src/etc: Makefile
src/external/nvidia-firmware: Makefile
src/share/mk: bsd.README bsd.own.mk
src/sys/dev/microcode/radeon: Makefile
src/usr.sbin/sysinst: Makefile.inc defs.h msg.mi.de msg.mi.en msg.mi.es
msg.mi.fr msg.mi.pl util.c
src/usr.sbin/sysinst/arch/amd64: md.h
src/usr.sbin/sysinst/arch/evbarm: md.h
src/usr.sbin/sysinst/arch/i386: md.h
Added Files:
src/distrib/sets/lists/gpufw: mi
Log Message:
Move DRM-driver firmware from base to its own set, gpufw
This set is only installed on amd64,i386,evbarm.
This set is installed on minimal installs and on install media, in
case someone needs it for basic driver functionality.
Comments:
Switched to a single MK tunable for it - that is probably unneeded.
An upcoming DRM update will include even fatter firmware, and we'd
like to minimize the impact of it.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.28 -r1.29 src/distrib/common/bootimage/Makefile.bootimage
cvs rdiff -u -r1.8 -r1.9 src/distrib/common/bootimage/Makefile.installimage
cvs rdiff -u -r1.41 -r1.42 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.12 -r1.13 src/distrib/notes/amd64/contents
cvs rdiff -u -r1.14 -r1.15 src/distrib/notes/evbarm/contents
cvs rdiff -u -r1.34 -r1.35 src/distrib/notes/i386/contents
cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/README
cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/maketars
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/regpkgset
cvs rdiff -u -r1.195 -r1.196 src/distrib/sets/sets.subr
cvs rdiff -u -r1.1283 -r1.1284 src/distrib/sets/lists/base/mi
cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/gpufw/mi
cvs rdiff -u -r1.77 -r1.78 src/distrib/utils/embedded/mkimage
cvs rdiff -u -r1.450 -r1.451 src/etc/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/nvidia-firmware/Makefile
cvs rdiff -u -r1.416 -r1.417 src/share/mk/bsd.README
cvs rdiff -u -r1.1260 -r1.1261 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/microcode/radeon/Makefile
cvs rdiff -u -r1.41 -r1.42 src/usr.sbin/sysinst/Makefile.inc
cvs rdiff -u -r1.72 -r1.73 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.33 -r1.34 src/usr.sbin/sysinst/msg.mi.de
cvs rdiff -u -r1.35 -r1.36 src/usr.sbin/sysinst/msg.mi.en \
src/usr.sbin/sysinst/msg.mi.pl
cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/sysinst/msg.mi.es
cvs rdiff -u -r1.34 -r1.35 src/usr.sbin/sysinst/msg.mi.fr
cvs rdiff -u -r1.59 -r1.60 src/usr.sbin/sysinst/util.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/amd64/md.h
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/evbarm/md.h
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/arch/i386/md.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.26 src/distrib/amd64/cdroms/Makefile.cdrom:1.27
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.26 Sun Mar 7 03:55:47 2021
+++ src/distrib/amd64/cdroms/Makefile.cdrom Sat Sep 25 08:54:29 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.26 2021/03/07 03:55:47 dbj Exp $
+# $NetBSD: Makefile.cdrom,v 1.27 2021/09/25 08:54:29 maya Exp $
.include
.include
@@ -17,7 +17,7 @@ CDMAKEFSOPTIONS= bootimage=i386;bootxx.$
CDINSTKERNEL= ../../instkernel
CDKERNELS= netbsd-GENERIC.gz netbsd
CDRELEASE_NOISOS= true
-CD_SETS= base etc
+CD_SETS= base etc gpufw
.if ${MKKMOD} != "no"
CD_SETS+= modules
.endif
Index: src/distrib/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.28 src/distrib/common/bootimage/Makefile.bootimage:1.29
--- src/distrib/common/bootimage/Makefile.bootimage:1.28 Sat Jul 24 13:59:28 2021
+++ src/distrib/common/bootimage/Makefile.bootimage Sat Sep 25 08:54:29 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.28 2021/07/24 13:59:28 jmcneill Exp $
+# $NetBSD: Makefile.bootimage,v 1.29 2021/09/25 08:54:29 maya Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -71,8 +71,8 @@
# (default: kern-GENERIC)
# SETS
# binary sets that should be extracted into image
-# (default: modules base etc comp games man misc rescue tests
-# text xbase xcomp xetc xfont xserver)
+# (default: modules base etc comp games gpufw man misc
+# rescue tests text xbase xcomp xetc xfont xserver)
#
CVS commit: src
Module Name:src Committed By: maya Date: Sat Sep 25 08:54:31 UTC 2021 Modified Files: src/distrib/amd64/cdroms: Makefile.cdrom src/distrib/common/bootimage: Makefile.bootimage Makefile.installimage src/distrib/i386/cdroms: Makefile.cdrom src/distrib/notes/amd64: contents src/distrib/notes/evbarm: contents src/distrib/notes/i386: contents src/distrib/sets: README maketars regpkgset sets.subr src/distrib/sets/lists/base: mi src/distrib/utils/embedded: mkimage src/etc: Makefile src/external/nvidia-firmware: Makefile src/share/mk: bsd.README bsd.own.mk src/sys/dev/microcode/radeon: Makefile src/usr.sbin/sysinst: Makefile.inc defs.h msg.mi.de msg.mi.en msg.mi.es msg.mi.fr msg.mi.pl util.c src/usr.sbin/sysinst/arch/amd64: md.h src/usr.sbin/sysinst/arch/evbarm: md.h src/usr.sbin/sysinst/arch/i386: md.h Added Files: src/distrib/sets/lists/gpufw: mi Log Message: Move DRM-driver firmware from base to its own set, gpufw This set is only installed on amd64,i386,evbarm. This set is installed on minimal installs and on install media, in case someone needs it for basic driver functionality. Comments: Switched to a single MK tunable for it - that is probably unneeded. An upcoming DRM update will include even fatter firmware, and we'd like to minimize the impact of it. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/distrib/amd64/cdroms/Makefile.cdrom cvs rdiff -u -r1.28 -r1.29 src/distrib/common/bootimage/Makefile.bootimage cvs rdiff -u -r1.8 -r1.9 src/distrib/common/bootimage/Makefile.installimage cvs rdiff -u -r1.41 -r1.42 src/distrib/i386/cdroms/Makefile.cdrom cvs rdiff -u -r1.12 -r1.13 src/distrib/notes/amd64/contents cvs rdiff -u -r1.14 -r1.15 src/distrib/notes/evbarm/contents cvs rdiff -u -r1.34 -r1.35 src/distrib/notes/i386/contents cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/README cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/maketars cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/regpkgset cvs rdiff -u -r1.195 -r1.196 src/distrib/sets/sets.subr cvs rdiff -u -r1.1283 -r1.1284 src/distrib/sets/lists/base/mi cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/gpufw/mi cvs rdiff -u -r1.77 -r1.78 src/distrib/utils/embedded/mkimage cvs rdiff -u -r1.450 -r1.451 src/etc/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/nvidia-firmware/Makefile cvs rdiff -u -r1.416 -r1.417 src/share/mk/bsd.README cvs rdiff -u -r1.1260 -r1.1261 src/share/mk/bsd.own.mk cvs rdiff -u -r1.6 -r1.7 src/sys/dev/microcode/radeon/Makefile cvs rdiff -u -r1.41 -r1.42 src/usr.sbin/sysinst/Makefile.inc cvs rdiff -u -r1.72 -r1.73 src/usr.sbin/sysinst/defs.h cvs rdiff -u -r1.33 -r1.34 src/usr.sbin/sysinst/msg.mi.de cvs rdiff -u -r1.35 -r1.36 src/usr.sbin/sysinst/msg.mi.en \ src/usr.sbin/sysinst/msg.mi.pl cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/sysinst/msg.mi.es cvs rdiff -u -r1.34 -r1.35 src/usr.sbin/sysinst/msg.mi.fr cvs rdiff -u -r1.59 -r1.60 src/usr.sbin/sysinst/util.c cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/amd64/md.h cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/evbarm/md.h cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/arch/i386/md.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-modesetting/dist
Module Name:xsrc Committed By: maya Date: Sat Aug 28 13:30:25 UTC 2021 Removed Files: xsrc/external/mit/xf86-video-modesetting/dist: COPYING ChangeLog INSTALL Makefile.am Makefile.in README aclocal.m4 config.guess config.h.in config.sub configure configure.ac depcomp install-sh ltmain.sh missing xsrc/external/mit/xf86-video-modesetting/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 xsrc/external/mit/xf86-video-modesetting/dist/man: Makefile.am Makefile.in modesetting.man xsrc/external/mit/xf86-video-modesetting/dist/src: Makefile.am Makefile.in compat-api.h driver.c driver.h drmmode_display.c drmmode_display.h Log Message: Remove unused standalone modesetting driver. We use the one embedded into xorg-server. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xf86-video-modesetting/dist/COPYING \ xsrc/external/mit/xf86-video-modesetting/dist/ChangeLog \ xsrc/external/mit/xf86-video-modesetting/dist/INSTALL \ xsrc/external/mit/xf86-video-modesetting/dist/Makefile.am \ xsrc/external/mit/xf86-video-modesetting/dist/Makefile.in \ xsrc/external/mit/xf86-video-modesetting/dist/README \ xsrc/external/mit/xf86-video-modesetting/dist/aclocal.m4 \ xsrc/external/mit/xf86-video-modesetting/dist/config.guess \ xsrc/external/mit/xf86-video-modesetting/dist/config.h.in \ xsrc/external/mit/xf86-video-modesetting/dist/config.sub \ xsrc/external/mit/xf86-video-modesetting/dist/configure \ xsrc/external/mit/xf86-video-modesetting/dist/configure.ac \ xsrc/external/mit/xf86-video-modesetting/dist/depcomp \ xsrc/external/mit/xf86-video-modesetting/dist/install-sh \ xsrc/external/mit/xf86-video-modesetting/dist/ltmain.sh \ xsrc/external/mit/xf86-video-modesetting/dist/missing cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xf86-video-modesetting/dist/m4/libtool.m4 \ xsrc/external/mit/xf86-video-modesetting/dist/m4/ltoptions.m4 \ xsrc/external/mit/xf86-video-modesetting/dist/m4/ltsugar.m4 \ xsrc/external/mit/xf86-video-modesetting/dist/m4/ltversion.m4 \ xsrc/external/mit/xf86-video-modesetting/dist/m4/lt~obsolete.m4 cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xf86-video-modesetting/dist/man/Makefile.am \ xsrc/external/mit/xf86-video-modesetting/dist/man/Makefile.in \ xsrc/external/mit/xf86-video-modesetting/dist/man/modesetting.man cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xf86-video-modesetting/dist/src/Makefile.am \ xsrc/external/mit/xf86-video-modesetting/dist/src/Makefile.in \ xsrc/external/mit/xf86-video-modesetting/dist/src/compat-api.h \ xsrc/external/mit/xf86-video-modesetting/dist/src/driver.h \ xsrc/external/mit/xf86-video-modesetting/dist/src/drmmode_display.h cvs rdiff -u -r1.2 -r0 \ xsrc/external/mit/xf86-video-modesetting/dist/src/driver.c \ xsrc/external/mit/xf86-video-modesetting/dist/src/drmmode_display.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-modesetting/dist
Module Name:xsrc Committed By: maya Date: Sat Aug 28 13:30:25 UTC 2021 Removed Files: xsrc/external/mit/xf86-video-modesetting/dist: COPYING ChangeLog INSTALL Makefile.am Makefile.in README aclocal.m4 config.guess config.h.in config.sub configure configure.ac depcomp install-sh ltmain.sh missing xsrc/external/mit/xf86-video-modesetting/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 xsrc/external/mit/xf86-video-modesetting/dist/man: Makefile.am Makefile.in modesetting.man xsrc/external/mit/xf86-video-modesetting/dist/src: Makefile.am Makefile.in compat-api.h driver.c driver.h drmmode_display.c drmmode_display.h Log Message: Remove unused standalone modesetting driver. We use the one embedded into xorg-server. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xf86-video-modesetting/dist/COPYING \ xsrc/external/mit/xf86-video-modesetting/dist/ChangeLog \ xsrc/external/mit/xf86-video-modesetting/dist/INSTALL \ xsrc/external/mit/xf86-video-modesetting/dist/Makefile.am \ xsrc/external/mit/xf86-video-modesetting/dist/Makefile.in \ xsrc/external/mit/xf86-video-modesetting/dist/README \ xsrc/external/mit/xf86-video-modesetting/dist/aclocal.m4 \ xsrc/external/mit/xf86-video-modesetting/dist/config.guess \ xsrc/external/mit/xf86-video-modesetting/dist/config.h.in \ xsrc/external/mit/xf86-video-modesetting/dist/config.sub \ xsrc/external/mit/xf86-video-modesetting/dist/configure \ xsrc/external/mit/xf86-video-modesetting/dist/configure.ac \ xsrc/external/mit/xf86-video-modesetting/dist/depcomp \ xsrc/external/mit/xf86-video-modesetting/dist/install-sh \ xsrc/external/mit/xf86-video-modesetting/dist/ltmain.sh \ xsrc/external/mit/xf86-video-modesetting/dist/missing cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xf86-video-modesetting/dist/m4/libtool.m4 \ xsrc/external/mit/xf86-video-modesetting/dist/m4/ltoptions.m4 \ xsrc/external/mit/xf86-video-modesetting/dist/m4/ltsugar.m4 \ xsrc/external/mit/xf86-video-modesetting/dist/m4/ltversion.m4 \ xsrc/external/mit/xf86-video-modesetting/dist/m4/lt~obsolete.m4 cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xf86-video-modesetting/dist/man/Makefile.am \ xsrc/external/mit/xf86-video-modesetting/dist/man/Makefile.in \ xsrc/external/mit/xf86-video-modesetting/dist/man/modesetting.man cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xf86-video-modesetting/dist/src/Makefile.am \ xsrc/external/mit/xf86-video-modesetting/dist/src/Makefile.in \ xsrc/external/mit/xf86-video-modesetting/dist/src/compat-api.h \ xsrc/external/mit/xf86-video-modesetting/dist/src/driver.h \ xsrc/external/mit/xf86-video-modesetting/dist/src/drmmode_display.h cvs rdiff -u -r1.2 -r0 \ xsrc/external/mit/xf86-video-modesetting/dist/src/driver.c \ xsrc/external/mit/xf86-video-modesetting/dist/src/drmmode_display.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: maya
Date: Sat Aug 28 08:56:10 UTC 2021
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Removed Files:
src/external/mit/xorg/server/drivers/xf86-video-modesetting: Makefile
Log Message:
Remove unused xf86-video-modesetting.
In newer xorg-server, it is integrated into the server
No users of old xorg-server use modesetting.
It requires drm drivers, but also, the sole possible user of old
xorg-server that could be handled by this Makefile is netwinder,
but it has a different ${MACHINE} and so seems like it never built the
driver.
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.2 -r0 \
src/external/mit/xorg/server/drivers/xf86-video-modesetting/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/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.102 src/external/mit/xorg/server/drivers/Makefile:1.103
--- src/external/mit/xorg/server/drivers/Makefile:1.102 Thu May 27 04:54:21 2021
+++ src/external/mit/xorg/server/drivers/Makefile Sat Aug 28 08:56:10 2021
@@ -1,14 +1,7 @@
-# $NetBSD: Makefile,v 1.102 2021/05/27 04:54:21 jdc Exp $
+# $NetBSD: Makefile,v 1.103 2021/08/28 08:56:10 maya Exp $
.include
-# modesetting is builtin to xorg-server 1.18 tree
-.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-MODE_SETTING= xf86-video-modesetting
-.else
-MODE_SETTING=
-.endif
-
# xf86-input drivers
SUBDIR= \
@@ -44,7 +37,6 @@ SUBDIR+= \
xf86-video-intel \
xf86-video-mach64 \
xf86-video-mga \
- ${MODE_SETTING} \
xf86-video-neomagic \
xf86-video-nv \
xf86-video-nouveau \
@@ -181,7 +173,6 @@ SUBDIR+= \
.if ${MACHINE} == "evbarm"
SUBDIR+= \
xf86-video-ati \
- ${MODE_SETTING} \
xf86-video-nouveau \
xf86-video-radeon \
xf86-video-radeon-kms \
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: maya
Date: Sat Aug 28 08:56:10 UTC 2021
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Removed Files:
src/external/mit/xorg/server/drivers/xf86-video-modesetting: Makefile
Log Message:
Remove unused xf86-video-modesetting.
In newer xorg-server, it is integrated into the server
No users of old xorg-server use modesetting.
It requires drm drivers, but also, the sole possible user of old
xorg-server that could be handled by this Makefile is netwinder,
but it has a different ${MACHINE} and so seems like it never built the
driver.
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.2 -r0 \
src/external/mit/xorg/server/drivers/xf86-video-modesetting/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: maya Date: Tue Nov 12 19:44:46 UTC 2019 Modified Files: src/sys/dev/pci: if_vte.c Log Message: Fix whitespace. From vezhlys To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/if_vte.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/if_vte.c diff -u src/sys/dev/pci/if_vte.c:1.27 src/sys/dev/pci/if_vte.c:1.28 --- src/sys/dev/pci/if_vte.c:1.27 Wed Oct 30 07:26:28 2019 +++ src/sys/dev/pci/if_vte.c Tue Nov 12 19:44:46 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_vte.c,v 1.27 2019/10/30 07:26:28 msaitoh Exp $ */ +/* $NetBSD: if_vte.c,v 1.28 2019/11/12 19:44:46 maya Exp $ */ /* * Copyright (c) 2011 Manuel Bouyer. All rights reserved. @@ -55,7 +55,7 @@ /* Driver for DM Electronics, Inc, Vortex86 RDC R6040 FastEthernet. */ #include -__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.27 2019/10/30 07:26:28 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.28 2019/11/12 19:44:46 maya Exp $"); #include #include @@ -847,7 +847,7 @@ vte_mediachange(struct ifnet *ifp) aprint_error_dev(sc->vte_dev, "could not set media\n"); return error; } - return 0; + return 0; }
CVS commit: src/sys/dev/pci
Module Name:src Committed By: maya Date: Tue Nov 12 19:44:46 UTC 2019 Modified Files: src/sys/dev/pci: if_vte.c Log Message: Fix whitespace. From vezhlys To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/if_vte.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: maya Date: Thu Oct 31 11:59:40 UTC 2019 Modified Files: src/sys/dev/usb: if_urndis.c Log Message: check if buf/bufsz are non-NULL before freeing. not all control messages that can be received result in buf being initialized, we might get a spurious different control message seen in practice when swapping modes a few times on a urndis device urndis0: SAMSUNG ... autoconfiguration error: urndis0: invalid address panic: kernel diagnostic assertion "p != NULL" failed: file "/cvs/src/sys/kern/subr_kmem.c", line 263 cpu0: Begin traceback... vpanic() at netbsd:vpanic+0x178 kern_assert() at netbsd:kern_assert+0x48 kmem_intr_free() at netbsd:kmem_intr_free+0xca urndis_attach() at netbsd:urndis_attach+0x4c2 To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/dev/usb/if_urndis.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: maya
Date: Thu Oct 31 11:59:40 UTC 2019
Modified Files:
src/sys/dev/usb: if_urndis.c
Log Message:
check if buf/bufsz are non-NULL before freeing.
not all control messages that can be received result in buf being
initialized, we might get a spurious different control message
seen in practice when swapping modes a few times on a urndis device
urndis0: SAMSUNG ...
autoconfiguration error: urndis0: invalid address
panic: kernel diagnostic assertion "p != NULL" failed: file
"/cvs/src/sys/kern/subr_kmem.c", line 263
cpu0: Begin traceback...
vpanic() at netbsd:vpanic+0x178
kern_assert() at netbsd:kern_assert+0x48
kmem_intr_free() at netbsd:kmem_intr_free+0xca
urndis_attach() at netbsd:urndis_attach+0x4c2
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/usb/if_urndis.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_urndis.c
diff -u src/sys/dev/usb/if_urndis.c:1.33 src/sys/dev/usb/if_urndis.c:1.34
--- src/sys/dev/usb/if_urndis.c:1.33 Tue Aug 20 06:37:06 2019
+++ src/sys/dev/usb/if_urndis.c Thu Oct 31 11:59:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urndis.c,v 1.33 2019/08/20 06:37:06 mrg Exp $ */
+/* $NetBSD: if_urndis.c,v 1.34 2019/10/31 11:59:40 maya Exp $ */
/* $OpenBSD: if_urndis.c,v 1.31 2011/07/03 15:47:17 matthew Exp $ */
/*
@@ -21,7 +21,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.33 2019/08/20 06:37:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.34 2019/10/31 11:59:40 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1068,7 +1068,8 @@ urndis_attach(device_t parent, device_t
kmem_free(buf, bufsz);
} else {
aprint_error("%s: invalid address\n", DEVNAME(un));
- kmem_free(buf, bufsz);
+ if (buf && bufsz)
+ kmem_free(buf, bufsz);
usbnet_lock(un);
usbnet_stop(un, ifp, 1);
usbnet_unlock(un);
CVS commit: src/sys/arch/aarch64
Module Name:src Committed By: maya Date: Tue Oct 29 20:01:22 UTC 2019 Modified Files: src/sys/arch/aarch64/aarch64: pmap.c src/sys/arch/aarch64/include: pmap.h Log Message: Define PMAP_NEED_PROCWR, providing strategically placed i-cache synchronization where just-changed memory is about to be executed. Fixes SIGILLs seen when running Mono 6 on QEMU Cortex-A57. ok ryo To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sys/arch/aarch64/aarch64/pmap.c cvs rdiff -u -r1.25 -r1.26 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/sys/arch/aarch64
Module Name:src
Committed By: maya
Date: Tue Oct 29 20:01:22 UTC 2019
Modified Files:
src/sys/arch/aarch64/aarch64: pmap.c
src/sys/arch/aarch64/include: pmap.h
Log Message:
Define PMAP_NEED_PROCWR, providing strategically placed i-cache
synchronization where just-changed memory is about to be executed.
Fixes SIGILLs seen when running Mono 6 on QEMU Cortex-A57.
ok ryo
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/aarch64/aarch64/pmap.c
cvs rdiff -u -r1.25 -r1.26 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.47 src/sys/arch/aarch64/aarch64/pmap.c:1.48
--- src/sys/arch/aarch64/aarch64/pmap.c:1.47 Sun Sep 22 13:57:55 2019
+++ src/sys/arch/aarch64/aarch64/pmap.c Tue Oct 29 20:01:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.47 2019/09/22 13:57:55 jmcneill Exp $ */
+/* $NetBSD: pmap.c,v 1.48 2019/10/29 20:01:22 maya Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.47 2019/09/22 13:57:55 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.48 2019/10/29 20:01:22 maya Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
@@ -877,6 +877,22 @@ pmap_icache_sync_range(pmap_t pm, vaddr_
pm_unlock(pm);
}
+/*
+ * Routine: pmap_procwr
+ *
+ * Function:
+ * Synchronize caches corresponding to [addr, addr+len) in p.
+ *
+ */
+void
+pmap_procwr(struct proc *p, vaddr_t va, int len)
+{
+
+ /* We only need to do anything if it is the current process. */
+ if (p == curproc)
+ cpu_icache_sync_range(va, len);
+}
+
static pt_entry_t
_pmap_pte_adjust_prot(pt_entry_t pte, vm_prot_t prot, vm_prot_t protmask,
bool user)
Index: src/sys/arch/aarch64/include/pmap.h
diff -u src/sys/arch/aarch64/include/pmap.h:1.25 src/sys/arch/aarch64/include/pmap.h:1.26
--- src/sys/arch/aarch64/include/pmap.h:1.25 Mon Aug 12 10:28:04 2019
+++ src/sys/arch/aarch64/include/pmap.h Tue Oct 29 20:01:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.25 2019/08/12 10:28:04 skrll Exp $ */
+/* $NetBSD: pmap.h,v 1.26 2019/10/29 20:01:22 maya Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -46,6 +46,7 @@
#include
+#define PMAP_NEED_PROCWR
#define PMAP_GROWKERNEL
#define PMAP_STEAL_MEMORY
@@ -272,6 +273,7 @@ aarch64_mmap_flags(paddr_t mdpgno)
#define pmap_wired_count(pmap) ((pmap)->pm_stats.wired_count)
#define pmap_resident_count(pmap) ((pmap)->pm_stats.resident_count)
+void pmap_procwr(struct proc *, vaddr_t, int);
bool pmap_extract_coherency(pmap_t, vaddr_t, paddr_t *, bool *);
void pmap_icache_sync_range(pmap_t, vaddr_t, vaddr_t);
CVS commit: src
Module Name:src Committed By: maya Date: Mon Oct 28 13:19:50 UTC 2019 Modified Files: src/distrib/sets/lists/modules: mi src/sys/modules: Makefile Log Message: Disable filemon. It isn't suited for general use (that is, it poses security risks), but the existence of the module means it is auto-loaded when /dev/filemon is opened, which can be done by any user. Thanks Ilja van Sprundel for the heads up. To generate a diff of this commit: cvs rdiff -u -r1.126 -r1.127 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.228 -r1.229 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: maya Date: Mon Oct 28 13:19:50 UTC 2019 Modified Files: src/distrib/sets/lists/modules: mi src/sys/modules: Makefile Log Message: Disable filemon. It isn't suited for general use (that is, it poses security risks), but the existence of the module means it is auto-loaded when /dev/filemon is opened, which can be done by any user. Thanks Ilja van Sprundel for the heads up. To generate a diff of this commit: cvs rdiff -u -r1.126 -r1.127 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.228 -r1.229 src/sys/modules/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/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.126 src/distrib/sets/lists/modules/mi:1.127 --- src/distrib/sets/lists/modules/mi:1.126 Sun Sep 22 22:59:37 2019 +++ src/distrib/sets/lists/modules/mi Mon Oct 28 13:19:50 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.126 2019/09/22 22:59:37 christos Exp $ +# $NetBSD: mi,v 1.127 2019/10/28 13:19:50 maya Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -168,8 +168,8 @@ ./@MODULEDIR@/ffs/ffs.kmod base-kernel-modules kmod ./@MODULEDIR@/filecorebase-kernel-modules kmod ./@MODULEDIR@/filecore/filecore.kmod base-kernel-modules kmod -./@MODULEDIR@/filemonbase-kernel-modules kmod -./@MODULEDIR@/filemon/filemon.kmod base-kernel-modules kmod +./@MODULEDIR@/filemonbase-obsolete obsolete +./@MODULEDIR@/filemon/filemon.kmod base-obsolete obsolete ./@MODULEDIR@/flashbase-kernel-modules kmod ./@MODULEDIR@/flash/flash.kmod base-kernel-modules kmod ./@MODULEDIR@/fssbase-kernel-modules kmod Index: src/sys/modules/Makefile diff -u src/sys/modules/Makefile:1.228 src/sys/modules/Makefile:1.229 --- src/sys/modules/Makefile:1.228 Mon Oct 28 02:56:40 2019 +++ src/sys/modules/Makefile Mon Oct 28 13:19:50 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.228 2019/10/28 02:56:40 ozaki-r Exp $ +# $NetBSD: Makefile,v 1.229 2019/10/28 13:19:50 maya Exp $ .include @@ -54,7 +54,7 @@ SUBDIR+= exec_script SUBDIR+= fdesc SUBDIR+= ffs SUBDIR+= filecore -SUBDIR+= filemon +#SUBDIR+= filemon SUBDIR+= flash SUBDIR+= fss SUBDIR+= gpio
CVS commit: xsrc/external/mit/mkfontscale/dist
Module Name:xsrc
Committed By: maya
Date: Sun Oct 27 17:38:08 UTC 2019
Modified Files:
xsrc/external/mit/mkfontscale/dist: mkfontscale.c
Log Message:
Use a case insensitive comparison. Add ExtraBold.
Fixes PR xsrc/40609: Problem with mkfontscale and fonts/freefonts with
xfree/xorg
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/mkfontscale/dist/mkfontscale.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/mkfontscale/dist/mkfontscale.c
diff -u xsrc/external/mit/mkfontscale/dist/mkfontscale.c:1.8 xsrc/external/mit/mkfontscale/dist/mkfontscale.c:1.9
--- xsrc/external/mit/mkfontscale/dist/mkfontscale.c:1.8 Sun Mar 3 09:27:12 2019
+++ xsrc/external/mit/mkfontscale/dist/mkfontscale.c Sun Oct 27 17:38:08 2019
@@ -435,33 +435,37 @@ t1Weight(const char *weight)
{
if(!weight)
return NULL;
-if(strcmp(weight, "Thin") == 0)
+if(strcasecmp(weight, "Thin") == 0)
return "thin";
-if(strcmp(weight, "ExtraLight") == 0) /* FontForge uses this for 200*/
+if(strcasecmp(weight, "ExtraLight") == 0) /* FontForge uses this for 200*/
return "extralight";
-if(strcmp(weight, "Light") == 0)
+if(strcasecmp(weight, "Light") == 0)
return "light";
-if(strcmp(weight, "Regular") == 0)
+if(strcasecmp(weight, "Regular") == 0)
return "medium";
-if(strcmp(weight, "Normal") == 0)
+if(strcasecmp(weight, "Plain") == 0)
return "medium";
-if(strcmp(weight, "Medium") == 0)
+if(strcasecmp(weight, "Normal") == 0)
return "medium";
-if(strcmp(weight, "Book") == 0)
+if(strcasecmp(weight, "Medium") == 0)
return "medium";
-if(strcmp(weight, "Roman") == 0) /* Some URW++ fonts do that! */
+if(strcasecmp(weight, "Book") == 0)
return "medium";
-if(strcmp(weight, "Demi") == 0)
+if(strcasecmp(weight, "Roman") == 0) /* Some URW++ fonts do that! */
+return "medium";
+if(strcasecmp(weight, "Demi") == 0)
return "semibold";
-if(strcmp(weight, "DemiBold") == 0)
+if(strcasecmp(weight, "DemiBold") == 0)
return "semibold";
-if(strcmp(weight, "SemiBold") == 0) /* some TeX fonts apparently do that */
+if(strcasecmp(weight, "SemiBold") == 0) /* some TeX fonts apparently do that */
return "semibold";
-else if(strcmp(weight, "Bold") == 0)
+else if(strcasecmp(weight, "Bold") == 0)
return "bold";
-else if(strcmp(weight, "Heavy") == 0) /* FontForge uses this for 800*/
+else if(strcasecmp(weight, "Heavy") == 0) /* FontForge uses this for 800*/
+return "extrabold";
+else if(strcasecmp(weight, "ExtraBold") == 0) /* freefonts uses this */
return "extrabold";
-else if(strcmp(weight, "Black") == 0)
+else if(strcasecmp(weight, "Black") == 0)
return "black";
else {
fprintf(stderr, "Unknown Type 1 weight \"%s\"\n", weight);
CVS commit: xsrc/external/mit/mkfontscale/dist
Module Name:xsrc Committed By: maya Date: Sun Oct 27 17:38:08 UTC 2019 Modified Files: xsrc/external/mit/mkfontscale/dist: mkfontscale.c Log Message: Use a case insensitive comparison. Add ExtraBold. Fixes PR xsrc/40609: Problem with mkfontscale and fonts/freefonts with xfree/xorg To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/mkfontscale/dist/mkfontscale.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: maya
Date: Wed Oct 23 01:30:54 UTC 2019
Modified Files:
src/sys/dev/usb: uvideo.c
Log Message:
we want to check that the allocation is going to be zero, not whether
some pointer is NULL (oops).
Should be the right version this time!
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/usb/uvideo.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/uvideo.c
diff -u src/sys/dev/usb/uvideo.c:1.51 src/sys/dev/usb/uvideo.c:1.52
--- src/sys/dev/usb/uvideo.c:1.51 Wed Oct 23 01:03:36 2019
+++ src/sys/dev/usb/uvideo.c Wed Oct 23 01:30:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvideo.c,v 1.51 2019/10/23 01:03:36 maya Exp $ */
+/* $NetBSD: uvideo.c,v 1.52 2019/10/23 01:30:54 maya Exp $ */
/*
* Copyright (c) 2008 Patrick Mahoney
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.51 2019/10/23 01:03:36 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.52 2019/10/23 01:30:54 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -999,7 +999,7 @@ static usbd_status
uvideo_unit_alloc_controls(struct uvideo_unit *vu, uint8_t size,
const uint8_t *controls)
{
- if ((vu->vu_controls == 0) || (size == 0))
+ if (size == 0)
return USBD_INVAL;
vu->vu_controls = kmem_alloc(sizeof(*vu->vu_controls) * size, KM_SLEEP);
CVS commit: src/sys/dev/usb
Module Name:src Committed By: maya Date: Wed Oct 23 01:30:54 UTC 2019 Modified Files: src/sys/dev/usb: uvideo.c Log Message: we want to check that the allocation is going to be zero, not whether some pointer is NULL (oops). Should be the right version this time! To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/dev/usb/uvideo.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: maya Date: Wed Oct 23 01:03:36 UTC 2019 Modified Files: src/sys/dev/usb: uvideo.c Log Message: Check if size is zero, too. PR kern/53734 To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/dev/usb/uvideo.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: maya
Date: Wed Oct 23 01:03:36 UTC 2019
Modified Files:
src/sys/dev/usb: uvideo.c
Log Message:
Check if size is zero, too.
PR kern/53734
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/usb/uvideo.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/uvideo.c
diff -u src/sys/dev/usb/uvideo.c:1.50 src/sys/dev/usb/uvideo.c:1.51
--- src/sys/dev/usb/uvideo.c:1.50 Wed Oct 23 00:52:39 2019
+++ src/sys/dev/usb/uvideo.c Wed Oct 23 01:03:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvideo.c,v 1.50 2019/10/23 00:52:39 maya Exp $ */
+/* $NetBSD: uvideo.c,v 1.51 2019/10/23 01:03:36 maya Exp $ */
/*
* Copyright (c) 2008 Patrick Mahoney
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.50 2019/10/23 00:52:39 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.51 2019/10/23 01:03:36 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -999,7 +999,7 @@ static usbd_status
uvideo_unit_alloc_controls(struct uvideo_unit *vu, uint8_t size,
const uint8_t *controls)
{
- if (vu->vu_controls == 0)
+ if ((vu->vu_controls == 0) || (size == 0))
return USBD_INVAL;
vu->vu_controls = kmem_alloc(sizeof(*vu->vu_controls) * size, KM_SLEEP);
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: maya
Date: Wed Oct 23 00:52:39 UTC 2019
Modified Files:
src/sys/dev/usb: uvideo.c
Log Message:
Avoid kmem_alloc(0,..), which hits an assertion.
PR kern/53734: Prevent kernel panic during Wide Vision FHD Camera detection
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/usb/uvideo.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/uvideo.c
diff -u src/sys/dev/usb/uvideo.c:1.49 src/sys/dev/usb/uvideo.c:1.50
--- src/sys/dev/usb/uvideo.c:1.49 Tue Oct 1 18:00:08 2019
+++ src/sys/dev/usb/uvideo.c Wed Oct 23 00:52:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvideo.c,v 1.49 2019/10/01 18:00:08 chs Exp $ */
+/* $NetBSD: uvideo.c,v 1.50 2019/10/23 00:52:39 maya Exp $ */
/*
* Copyright (c) 2008 Patrick Mahoney
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.49 2019/10/01 18:00:08 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.50 2019/10/23 00:52:39 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -999,6 +999,9 @@ static usbd_status
uvideo_unit_alloc_controls(struct uvideo_unit *vu, uint8_t size,
const uint8_t *controls)
{
+ if (vu->vu_controls == 0)
+ return USBD_INVAL;
+
vu->vu_controls = kmem_alloc(sizeof(*vu->vu_controls) * size, KM_SLEEP);
vu->vu_control_size = size;
memcpy(vu->vu_controls, controls, size);
CVS commit: src/sys/dev/usb
Module Name:src Committed By: maya Date: Wed Oct 23 00:52:39 UTC 2019 Modified Files: src/sys/dev/usb: uvideo.c Log Message: Avoid kmem_alloc(0,..), which hits an assertion. PR kern/53734: Prevent kernel panic during Wide Vision FHD Camera detection To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/dev/usb/uvideo.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/mii
Module Name:src Committed By: maya Date: Fri Oct 18 20:42:10 UTC 2019 Modified Files: src/sys/dev/mii: miidevs miidevs.h miidevs_data.h Log Message: Fix typo. from vezhlys To generate a diff of this commit: cvs rdiff -u -r1.158 -r1.159 src/sys/dev/mii/miidevs cvs rdiff -u -r1.156 -r1.157 src/sys/dev/mii/miidevs.h cvs rdiff -u -r1.144 -r1.145 src/sys/dev/mii/miidevs_data.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/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.158 src/sys/dev/mii/miidevs:1.159 --- src/sys/dev/mii/miidevs:1.158 Thu Oct 17 09:21:40 2019 +++ src/sys/dev/mii/miidevs Fri Oct 18 20:42:10 2019 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.158 2019/10/17 09:21:40 msaitoh Exp $ +$NetBSD: miidevs,v 1.159 2019/10/18 20:42:10 maya Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -94,7 +94,7 @@ oui TI0x080028 Texas Instruments oui BROADCOM4 0x18c086 Broadcom Corporation oui RENESAS 0x749050 Renesas -/* Unregisterd or wrong OUI */ +/* Unregistered or wrong OUI */ oui yyREALTEK 0x04 Realtek oui yyAMD 0x58 Advanced Micro Devices oui xxMYSON 0x00032d Myson Technology Index: src/sys/dev/mii/miidevs.h diff -u src/sys/dev/mii/miidevs.h:1.156 src/sys/dev/mii/miidevs.h:1.157 --- src/sys/dev/mii/miidevs.h:1.156 Thu Oct 17 09:22:00 2019 +++ src/sys/dev/mii/miidevs.h Fri Oct 18 20:42:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: miidevs.h,v 1.156 2019/10/17 09:22:00 msaitoh Exp $ */ +/* $NetBSD: miidevs.h,v 1.157 2019/10/18 20:42:10 maya Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -101,7 +101,7 @@ #define MII_OUI_BROADCOM4 0x18c086 /* Broadcom Corporation */ #define MII_OUI_RENESAS 0x749050 /* Renesas */ -/* Unregisterd or wrong OUI */ +/* Unregistered or wrong OUI */ #define MII_OUI_yyREALTEK 0x04 /* Realtek */ #define MII_OUI_yyAMD 0x58 /* Advanced Micro Devices */ #define MII_OUI_xxMYSON 0x00032d /* Myson Technology */ Index: src/sys/dev/mii/miidevs_data.h diff -u src/sys/dev/mii/miidevs_data.h:1.144 src/sys/dev/mii/miidevs_data.h:1.145 --- src/sys/dev/mii/miidevs_data.h:1.144 Thu Oct 17 09:22:00 2019 +++ src/sys/dev/mii/miidevs_data.h Fri Oct 18 20:42:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: miidevs_data.h,v 1.144 2019/10/17 09:22:00 msaitoh Exp $ */ +/* $NetBSD: miidevs_data.h,v 1.145 2019/10/18 20:42:10 maya Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
CVS commit: src/sys/dev/mii
Module Name:src Committed By: maya Date: Fri Oct 18 20:42:10 UTC 2019 Modified Files: src/sys/dev/mii: miidevs miidevs.h miidevs_data.h Log Message: Fix typo. from vezhlys To generate a diff of this commit: cvs rdiff -u -r1.158 -r1.159 src/sys/dev/mii/miidevs cvs rdiff -u -r1.156 -r1.157 src/sys/dev/mii/miidevs.h cvs rdiff -u -r1.144 -r1.145 src/sys/dev/mii/miidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: maya Date: Thu Oct 17 16:21:02 UTC 2019 Modified Files: src/doc: 3RDPARTY Log Message: correct bind location. new bind To generate a diff of this commit: cvs rdiff -u -r1.1664 -r1.1665 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1664 src/doc/3RDPARTY:1.1665 --- src/doc/3RDPARTY:1.1664 Wed Oct 16 14:56:34 2019 +++ src/doc/3RDPARTY Thu Oct 17 16:21:02 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1664 2019/10/16 14:56:34 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1665 2019/10/17 16:21:02 maya Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -121,7 +121,7 @@ bc includes dc, both of which are in the Package: bind [named and utils] Version: 9.14.5/MPL -Current Vers: 9.14.6/MPL +Current Vers: 9.14.7/MPL Maintainer: ISC Archive Site: ftp://ftp.isc.org/isc/bind9/ Home Page: http://www.isc.org/software/bind/ @@ -130,10 +130,10 @@ Mailing List: https://lists.isc.org/mail Mailing List: https://lists.isc.org/mailman/listinfo/bind-users Responsible: christos License: BSD-like (2-clause) / MPL -Location: external/bsd/bind/dist +Location: external/mpl/bind/dist Notes: First bind2netbsd script to import into src/external/bsd/bind/dist. -The Makefiles in src/external/bsd/bind are not handled by the script. +The Makefiles in src/external/mpl/bind are not handled by the script. Build bind to generate the include files. Then binclude4netbsd script to import into src/external/bsd/bind/include. The libc and include parts of the resolver are now part of libbind.
CVS commit: src/doc
Module Name:src Committed By: maya Date: Thu Oct 17 16:21:02 UTC 2019 Modified Files: src/doc: 3RDPARTY Log Message: correct bind location. new bind To generate a diff of this commit: cvs rdiff -u -r1.1664 -r1.1665 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/linux
Module Name:src Committed By: maya Date: Thu Oct 17 14:33:02 UTC 2019 Modified Files: src/sys/external/bsd/drm2/linux: linux_dma_buf.c Log Message: correct error handling. from Ilja Van Sprundel, thanks. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/linux/linux_dma_buf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/linux
Module Name:src
Committed By: maya
Date: Thu Oct 17 14:33:02 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/linux: linux_dma_buf.c
Log Message:
correct error handling.
from Ilja Van Sprundel, thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/linux/linux_dma_buf.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/external/bsd/drm2/linux/linux_dma_buf.c
diff -u src/sys/external/bsd/drm2/linux/linux_dma_buf.c:1.5 src/sys/external/bsd/drm2/linux/linux_dma_buf.c:1.6
--- src/sys/external/bsd/drm2/linux/linux_dma_buf.c:1.5 Fri Jan 4 23:03:02 2019
+++ src/sys/external/bsd/drm2/linux/linux_dma_buf.c Thu Oct 17 14:33:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_dma_buf.c,v 1.5 2019/01/04 23:03:02 tnn Exp $ */
+/* $NetBSD: linux_dma_buf.c,v 1.6 2019/10/17 14:33:02 maya Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_dma_buf.c,v 1.5 2019/01/04 23:03:02 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_dma_buf.c,v 1.6 2019/10/17 14:33:02 maya Exp $");
#include
#include
@@ -133,11 +133,11 @@ dma_buf_get(int fd)
if ((file = fd_getfile(fd)) == NULL) {
error = EBADF;
- goto fail1;
+ goto fail0;
}
if (file->f_type != DTYPE_MISC || file->f_ops != _fileops) {
error = EINVAL;
- goto fail0;
+ goto fail1;
}
dmabuf = file->f_data;
CVS commit: src
Module Name:src
Committed By: maya
Date: Wed Oct 16 21:52:22 UTC 2019
Modified Files:
src/sbin/mount_nilfs: mount_nilfs.8 mount_nilfs.c
src/sbin/mount_udf: mount_udf.8 mount_udf.c
src/sys/arch/arm/iomd: qms.c
src/sys/dev/pci: auixp.c auixpreg.h auixpvar.h
src/sys/fs/nilfs: nilfs_mount.h
src/sys/fs/udf: udf_mount.h
Log Message:
Switch files copyright Reinoud Zandijk from BSD 4 clause to BSD 2 clause.
OK'd by reinoud in email (from 4 Feb 2019).
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sbin/mount_nilfs/mount_nilfs.8
cvs rdiff -u -r1.3 -r1.4 src/sbin/mount_nilfs/mount_nilfs.c
cvs rdiff -u -r1.13 -r1.14 src/sbin/mount_udf/mount_udf.8
cvs rdiff -u -r1.14 -r1.15 src/sbin/mount_udf/mount_udf.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/iomd/qms.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/pci/auixp.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/auixpreg.h
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/auixpvar.h
cvs rdiff -u -r1.1 -r1.2 src/sys/fs/nilfs/nilfs_mount.h
cvs rdiff -u -r1.3 -r1.4 src/sys/fs/udf/udf_mount.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/mount_nilfs/mount_nilfs.8
diff -u src/sbin/mount_nilfs/mount_nilfs.8:1.4 src/sbin/mount_nilfs/mount_nilfs.8:1.5
--- src/sbin/mount_nilfs/mount_nilfs.8:1.4 Wed Jun 1 12:01:21 2016
+++ src/sbin/mount_nilfs/mount_nilfs.8 Wed Oct 16 21:52:22 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: mount_nilfs.8,v 1.4 2016/06/01 12:01:21 wiz Exp $
+.\" $NetBSD: mount_nilfs.8,v 1.5 2019/10/16 21:52:22 maya Exp $
.\"
.\" Copyright (c) 2008, 2009 Reinoud Zandijk
.\" All rights reserved.
@@ -11,13 +11,6 @@
.\" 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.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"must display the following acknowledgement:
-.\" This product includes software developed for the
-.\" NetBSD Project. See http://www.NetBSD.org/ for
-.\" information about NetBSD.
-.\" 4. The name of the author may not be used to endorse or promote products
-.\"derived from this software without specific prior written permission.
.\"
.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sbin/mount_nilfs/mount_nilfs.c
diff -u src/sbin/mount_nilfs/mount_nilfs.c:1.3 src/sbin/mount_nilfs/mount_nilfs.c:1.4
--- src/sbin/mount_nilfs/mount_nilfs.c:1.3 Sun Feb 21 22:51:29 2016
+++ src/sbin/mount_nilfs/mount_nilfs.c Wed Oct 16 21:52:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mount_nilfs.c,v 1.3 2016/02/21 22:51:29 christos Exp $ */
+/* $NetBSD: mount_nilfs.c,v 1.4 2019/10/16 21:52:22 maya Exp $ */
/*
* Copyright (c) 2008, 2009 Reinoud Zandijk
@@ -12,13 +12,6 @@
* 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.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- * This product includes software developed for the
- * NetBSD Project. See http://www.NetBSD.org/ for
- * information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -36,7 +29,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: mount_nilfs.c,v 1.3 2016/02/21 22:51:29 christos Exp $");
+__RCSID("$NetBSD: mount_nilfs.c,v 1.4 2019/10/16 21:52:22 maya Exp $");
#endif /* not lint */
Index: src/sbin/mount_udf/mount_udf.8
diff -u src/sbin/mount_udf/mount_udf.8:1.13 src/sbin/mount_udf/mount_udf.8:1.14
--- src/sbin/mount_udf/mount_udf.8:1.13 Mon Sep 12 02:45:07 2016
+++ src/sbin/mount_udf/mount_udf.8 Wed Oct 16 21:52:22 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: mount_udf.8,v 1.13 2016/09/12 02:45:07 sevan Exp $
+.\" $NetBSD: mount_udf.8,v 1.14 2019/10/16 21:52:22 maya Exp $
.\"
.\" Copyright (c) 2006, 2008 Reinoud Zandijk
.\" All rights reserved.
@@ -11,13 +11,6 @@
.\" 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.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"must display the following acknowledgement:
-.\" This product includes software
CVS commit: src
Module Name:src Committed By: maya Date: Wed Oct 16 21:52:22 UTC 2019 Modified Files: src/sbin/mount_nilfs: mount_nilfs.8 mount_nilfs.c src/sbin/mount_udf: mount_udf.8 mount_udf.c src/sys/arch/arm/iomd: qms.c src/sys/dev/pci: auixp.c auixpreg.h auixpvar.h src/sys/fs/nilfs: nilfs_mount.h src/sys/fs/udf: udf_mount.h Log Message: Switch files copyright Reinoud Zandijk from BSD 4 clause to BSD 2 clause. OK'd by reinoud in email (from 4 Feb 2019). To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sbin/mount_nilfs/mount_nilfs.8 cvs rdiff -u -r1.3 -r1.4 src/sbin/mount_nilfs/mount_nilfs.c cvs rdiff -u -r1.13 -r1.14 src/sbin/mount_udf/mount_udf.8 cvs rdiff -u -r1.14 -r1.15 src/sbin/mount_udf/mount_udf.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/iomd/qms.c cvs rdiff -u -r1.47 -r1.48 src/sys/dev/pci/auixp.c cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/auixpreg.h cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/auixpvar.h cvs rdiff -u -r1.1 -r1.2 src/sys/fs/nilfs/nilfs_mount.h cvs rdiff -u -r1.3 -r1.4 src/sys/fs/udf/udf_mount.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: maya Date: Wed Oct 16 20:43:18 UTC 2019 Modified Files: src/lib/libc/gen: sysconf.c src/sys/sys: unistd.h Log Message: Provide sysconf(_SC_RTSIG_MAX) = SIGRTMAX - SIGRTMIN Thanks nros@ for the correct definition To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/lib/libc/gen/sysconf.c cvs rdiff -u -r1.61 -r1.62 src/sys/sys/unistd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: maya
Date: Wed Oct 16 20:43:18 UTC 2019
Modified Files:
src/lib/libc/gen: sysconf.c
src/sys/sys: unistd.h
Log Message:
Provide sysconf(_SC_RTSIG_MAX) = SIGRTMAX - SIGRTMIN
Thanks nros@ for the correct definition
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/lib/libc/gen/sysconf.c
cvs rdiff -u -r1.61 -r1.62 src/sys/sys/unistd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/sysconf.c
diff -u src/lib/libc/gen/sysconf.c:1.41 src/lib/libc/gen/sysconf.c:1.42
--- src/lib/libc/gen/sysconf.c:1.41 Thu Aug 4 06:43:43 2016
+++ src/lib/libc/gen/sysconf.c Wed Oct 16 20:43:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sysconf.c,v 1.41 2016/08/04 06:43:43 christos Exp $ */
+/* $NetBSD: sysconf.c,v 1.42 2019/10/16 20:43:18 maya Exp $ */
/*-
* Copyright (c) 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)sysconf.c 8.2 (Berkeley) 3/20/94";
#else
-__RCSID("$NetBSD: sysconf.c,v 1.41 2016/08/04 06:43:43 christos Exp $");
+__RCSID("$NetBSD: sysconf.c,v 1.42 2019/10/16 20:43:18 maya Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -339,6 +339,8 @@ sysconf(int name)
return _GETPW_R_SIZE_MAX;
/* Unsorted */
+ case _SC_RTSIG_MAX:
+ return SIGRTMAX - SIGRTMIN;
case _SC_HOST_NAME_MAX:
return MAXHOSTNAMELEN;
case _SC_PASS_MAX:
Index: src/sys/sys/unistd.h
diff -u src/sys/sys/unistd.h:1.61 src/sys/sys/unistd.h:1.62
--- src/sys/sys/unistd.h:1.61 Thu Aug 4 06:43:43 2016
+++ src/sys/sys/unistd.h Wed Oct 16 20:43:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: unistd.h,v 1.61 2016/08/04 06:43:43 christos Exp $ */
+/* $NetBSD: unistd.h,v 1.62 2019/10/16 20:43:18 maya Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -320,6 +320,7 @@
#define _SC_DELAYTIMER_MAX 92
#define _SC_SIGQUEUE_MAX 93
#define _SC_REALTIME_SIGNALS 94
+#define _SC_RTSIG_MAX 95
/* Extensions found in Solaris and Linux. */
#define _SC_PHYS_PAGES 121
CVS commit: src/common/lib/libc/arch/aarch64/gen
Module Name:src Committed By: maya Date: Sat Oct 12 09:22:36 UTC 2019 Modified Files: src/common/lib/libc/arch/aarch64/gen: byte_swap_8.S Log Message: Remove htonll and ntohll as symbols from aarch64 libc. Other architectures do not define them, and so we don't provide a function declaration in any header. This means a package may detect it with a link-test and then fail due to the missing declaration, like sysutils/collectd currently does. Done this way as aarch64 has not had a release yet. Discussed with releng. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/arch/aarch64/gen/byte_swap_8.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/arch/aarch64/gen
Module Name:src Committed By: maya Date: Sat Oct 12 09:22:36 UTC 2019 Modified Files: src/common/lib/libc/arch/aarch64/gen: byte_swap_8.S Log Message: Remove htonll and ntohll as symbols from aarch64 libc. Other architectures do not define them, and so we don't provide a function declaration in any header. This means a package may detect it with a link-test and then fail due to the missing declaration, like sysutils/collectd currently does. Done this way as aarch64 has not had a release yet. Discussed with releng. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/arch/aarch64/gen/byte_swap_8.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/aarch64/gen/byte_swap_8.S diff -u src/common/lib/libc/arch/aarch64/gen/byte_swap_8.S:1.1 src/common/lib/libc/arch/aarch64/gen/byte_swap_8.S:1.2 --- src/common/lib/libc/arch/aarch64/gen/byte_swap_8.S:1.1 Sun Aug 10 05:47:35 2014 +++ src/common/lib/libc/arch/aarch64/gen/byte_swap_8.S Sat Oct 12 09:22:36 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: byte_swap_8.S,v 1.1 2014/08/10 05:47:35 matt Exp $ */ +/* $NetBSD: byte_swap_8.S,v 1.2 2019/10/12 09:22:36 maya Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -41,7 +41,3 @@ ENTRY(FUNC) rev x0, x0 ret END(FUNC) -#if BYTE_ORDER == LITTLE_ENDIAN -STRONG_ALIAS(_C_LABEL(ntohll), FUNC) -STRONG_ALIAS(_C_LABEL(htonll), FUNC) -#endif
CVS commit: src/sys/arch/sh3/include
Module Name:src
Committed By: maya
Date: Fri Oct 4 15:25:31 UTC 2019
Modified Files:
src/sys/arch/sh3/include: ptrace.h
Log Message:
Provide PTRACE_ILLEGAL_ASM, using an illegal slot instruction
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sh3/include/ptrace.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/sh3/include/ptrace.h
diff -u src/sys/arch/sh3/include/ptrace.h:1.15 src/sys/arch/sh3/include/ptrace.h:1.16
--- src/sys/arch/sh3/include/ptrace.h:1.15 Tue Jun 18 21:18:13 2019
+++ src/sys/arch/sh3/include/ptrace.h Fri Oct 4 15:25:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ptrace.h,v 1.15 2019/06/18 21:18:13 kamil Exp $ */
+/* $NetBSD: ptrace.h,v 1.16 2019/10/04 15:25:30 maya Exp $ */
/*
* Copyright (c) 1993 Christopher G. Demetriou
@@ -72,6 +72,8 @@
#define PTRACE_REG_SP(r) r->r_r15
#define PTRACE_REG_INTV(r) r->r_r0
+#define PTRACE_ILLEGAL_ASM __asm __volatile ("0: bra 0b; bra 0b" : : : "memory")
+
#define PTRACE_BREAKPOINT_TRAP 0xc3
#define PTRACE_BREAKPOINT ((const uint8_t[]) { 0xc3, 0xc3 })
#define PTRACE_BREAKPOINT_ASM __asm __volatile("trapa %0" :: "i"(PTRACE_BREAKPOINT_TRAP))
CVS commit: src/sys/arch/sh3/include
Module Name:src Committed By: maya Date: Fri Oct 4 15:25:31 UTC 2019 Modified Files: src/sys/arch/sh3/include: ptrace.h Log Message: Provide PTRACE_ILLEGAL_ASM, using an illegal slot instruction To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sh3/include/ptrace.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src Committed By: maya Date: Fri Oct 4 12:46:43 UTC 2019 Modified Files: src/external/gpl3/gcc/dist/gcc: ira-color.c Log Message: We might've switched modes, re-init the move cost table again if necessary. Fixes unlikely segfault on VAX. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/dist/gcc/ira-color.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src Committed By: maya Date: Fri Oct 4 12:46:43 UTC 2019 Modified Files: src/external/gpl3/gcc/dist/gcc: ira-color.c Log Message: We might've switched modes, re-init the move cost table again if necessary. Fixes unlikely segfault on VAX. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/dist/gcc/ira-color.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/gcc/dist/gcc/ira-color.c diff -u src/external/gpl3/gcc/dist/gcc/ira-color.c:1.6 src/external/gpl3/gcc/dist/gcc/ira-color.c:1.7 --- src/external/gpl3/gcc/dist/gcc/ira-color.c:1.6 Tue Oct 1 10:38:16 2019 +++ src/external/gpl3/gcc/dist/gcc/ira-color.c Fri Oct 4 12:46:43 2019 @@ -1377,6 +1377,7 @@ update_costs_from_allocno (ira_allocno_t e.g. DImode for AREG on x86. For such cases the register move cost will be maximal. */ mode = narrower_subreg_mode (mode, ALLOCNO_MODE (cp->second)); + ira_init_register_move_cost_if_necessary (mode); cost = (cp->second == allocno ? ira_register_move_cost[mode][rclass][aclass]
CVS commit: src/doc
Module Name:src Committed By: maya Date: Wed Oct 2 11:18:55 UTC 2019 Modified Files: src/doc: CHANGES Log Message: Note /rescue is a separate set now. To generate a diff of this commit: cvs rdiff -u -r1.2586 -r1.2587 src/doc/CHANGES 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 diff -u src/doc/CHANGES:1.2586 src/doc/CHANGES:1.2587 --- src/doc/CHANGES:1.2586 Tue Oct 1 16:08:56 2019 +++ src/doc/CHANGES Wed Oct 2 11:18:55 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2586 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2587 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -49,4 +49,5 @@ Changes from NetBSD 9.0 to NetBSD 10.0: [jmcneill 20190921] libpcap: Import 1.9.1. [christos 20191001] tcpdump(8): Import 4.9.3. [christos 20191001] + rescue(8): Moved into a separate, rescue-only set. [maya 20191001]
CVS commit: src/doc
Module Name:src Committed By: maya Date: Wed Oct 2 11:18:55 UTC 2019 Modified Files: src/doc: CHANGES Log Message: Note /rescue is a separate set now. To generate a diff of this commit: cvs rdiff -u -r1.2586 -r1.2587 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: maya Date: Wed Oct 2 11:16:04 UTC 2019 Modified Files: src/distrib/amd64/uefi-installimage: Makefile.bootimage src/distrib/common/bootimage: Makefile.bootimage src/distrib/miniroot: install.sub src/distrib/notes/atari: xfer src/distrib/notes/mvme68k: xfer src/distrib/sets: README maketars regpkgset sets.subr src/distrib/sun2: MakeInstTape src/distrib/sun3: MakeInstTape src/distrib/utils/embedded: mkimage src/etc: Makefile src/usr.sbin/sysinst: defs.h msg.mi.de msg.mi.en msg.mi.es msg.mi.fr msg.mi.pl util.c src/usr.sbin/sysinst/arch/acorn32: md.h src/usr.sbin/sysinst/arch/amd64: md.h src/usr.sbin/sysinst/arch/amiga: md.h src/usr.sbin/sysinst/arch/arc: md.h src/usr.sbin/sysinst/arch/atari: md.h src/usr.sbin/sysinst/arch/bebox: md.h src/usr.sbin/sysinst/arch/cats: md.h src/usr.sbin/sysinst/arch/cobalt: md.h src/usr.sbin/sysinst/arch/emips: md.h src/usr.sbin/sysinst/arch/evbarm: md.h src/usr.sbin/sysinst/arch/evbmips: md.h src/usr.sbin/sysinst/arch/evbppc: md.h src/usr.sbin/sysinst/arch/hp300: md.h src/usr.sbin/sysinst/arch/hpcarm: md.h src/usr.sbin/sysinst/arch/hpcmips: md.h src/usr.sbin/sysinst/arch/hpcsh: md.h src/usr.sbin/sysinst/arch/i386: md.h src/usr.sbin/sysinst/arch/landisk: md.h src/usr.sbin/sysinst/arch/mvme68k: md.h src/usr.sbin/sysinst/arch/ofppc: md.h src/usr.sbin/sysinst/arch/playstation2: md.h src/usr.sbin/sysinst/arch/pmax: md.h src/usr.sbin/sysinst/arch/prep: md.h src/usr.sbin/sysinst/arch/sandpoint: md.h src/usr.sbin/sysinst/arch/sgimips: md.h src/usr.sbin/sysinst/arch/shark: md.h src/usr.sbin/sysinst/arch/x68k: md.h src/usr.sbin/sysinst/arch/zaurus: md.h Added Files: src/distrib/sets/lists/rescue: mi Removed Files: src/distrib/sets/lists/base: rescue.mi Log Message: Split out /rescue to its own set and adapt installers/images to add it. This is meant to make updates safer: if something goes wrong with updating base, we still have the old, standalone /rescue to recover from. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 \ src/distrib/amd64/uefi-installimage/Makefile.bootimage cvs rdiff -u -r1.21 -r1.22 src/distrib/common/bootimage/Makefile.bootimage cvs rdiff -u -r1.48 -r1.49 src/distrib/miniroot/install.sub cvs rdiff -u -r1.16 -r1.17 src/distrib/notes/atari/xfer cvs rdiff -u -r1.18 -r1.19 src/distrib/notes/mvme68k/xfer cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/README cvs rdiff -u -r1.89 -r1.90 src/distrib/sets/maketars cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/regpkgset cvs rdiff -u -r1.186 -r1.187 src/distrib/sets/sets.subr cvs rdiff -u -r1.46 -r0 src/distrib/sets/lists/base/rescue.mi cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/rescue/mi cvs rdiff -u -r1.1 -r1.2 src/distrib/sun2/MakeInstTape cvs rdiff -u -r1.2 -r1.3 src/distrib/sun3/MakeInstTape cvs rdiff -u -r1.69 -r1.70 src/distrib/utils/embedded/mkimage cvs rdiff -u -r1.440 -r1.441 src/etc/Makefile cvs rdiff -u -r1.44 -r1.45 src/usr.sbin/sysinst/defs.h cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/sysinst/msg.mi.de cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/sysinst/msg.mi.en cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/sysinst/msg.mi.es cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/sysinst/msg.mi.fr cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/sysinst/msg.mi.pl cvs rdiff -u -r1.32 -r1.33 src/usr.sbin/sysinst/util.c cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/acorn32/md.h cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/amd64/md.h cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/amiga/md.h cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/arc/md.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/atari/md.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/bebox/md.h cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/cats/md.h cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/cobalt/md.h cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/emips/md.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/evbarm/md.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/evbmips/md.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/evbppc/md.h cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/hp300/md.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/hpcarm/md.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/hpcmips/md.h cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/hpcsh/md.h cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/i386/md.h cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/landisk/md.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/mvme68k/md.h cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/ofppc/md.h cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/playstation2/md.h cvs rdiff -u -r1.3 -r1.4
CVS commit: src
Module Name:src Committed By: maya Date: Wed Oct 2 11:16:04 UTC 2019 Modified Files: src/distrib/amd64/uefi-installimage: Makefile.bootimage src/distrib/common/bootimage: Makefile.bootimage src/distrib/miniroot: install.sub src/distrib/notes/atari: xfer src/distrib/notes/mvme68k: xfer src/distrib/sets: README maketars regpkgset sets.subr src/distrib/sun2: MakeInstTape src/distrib/sun3: MakeInstTape src/distrib/utils/embedded: mkimage src/etc: Makefile src/usr.sbin/sysinst: defs.h msg.mi.de msg.mi.en msg.mi.es msg.mi.fr msg.mi.pl util.c src/usr.sbin/sysinst/arch/acorn32: md.h src/usr.sbin/sysinst/arch/amd64: md.h src/usr.sbin/sysinst/arch/amiga: md.h src/usr.sbin/sysinst/arch/arc: md.h src/usr.sbin/sysinst/arch/atari: md.h src/usr.sbin/sysinst/arch/bebox: md.h src/usr.sbin/sysinst/arch/cats: md.h src/usr.sbin/sysinst/arch/cobalt: md.h src/usr.sbin/sysinst/arch/emips: md.h src/usr.sbin/sysinst/arch/evbarm: md.h src/usr.sbin/sysinst/arch/evbmips: md.h src/usr.sbin/sysinst/arch/evbppc: md.h src/usr.sbin/sysinst/arch/hp300: md.h src/usr.sbin/sysinst/arch/hpcarm: md.h src/usr.sbin/sysinst/arch/hpcmips: md.h src/usr.sbin/sysinst/arch/hpcsh: md.h src/usr.sbin/sysinst/arch/i386: md.h src/usr.sbin/sysinst/arch/landisk: md.h src/usr.sbin/sysinst/arch/mvme68k: md.h src/usr.sbin/sysinst/arch/ofppc: md.h src/usr.sbin/sysinst/arch/playstation2: md.h src/usr.sbin/sysinst/arch/pmax: md.h src/usr.sbin/sysinst/arch/prep: md.h src/usr.sbin/sysinst/arch/sandpoint: md.h src/usr.sbin/sysinst/arch/sgimips: md.h src/usr.sbin/sysinst/arch/shark: md.h src/usr.sbin/sysinst/arch/x68k: md.h src/usr.sbin/sysinst/arch/zaurus: md.h Added Files: src/distrib/sets/lists/rescue: mi Removed Files: src/distrib/sets/lists/base: rescue.mi Log Message: Split out /rescue to its own set and adapt installers/images to add it. This is meant to make updates safer: if something goes wrong with updating base, we still have the old, standalone /rescue to recover from. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 \ src/distrib/amd64/uefi-installimage/Makefile.bootimage cvs rdiff -u -r1.21 -r1.22 src/distrib/common/bootimage/Makefile.bootimage cvs rdiff -u -r1.48 -r1.49 src/distrib/miniroot/install.sub cvs rdiff -u -r1.16 -r1.17 src/distrib/notes/atari/xfer cvs rdiff -u -r1.18 -r1.19 src/distrib/notes/mvme68k/xfer cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/README cvs rdiff -u -r1.89 -r1.90 src/distrib/sets/maketars cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/regpkgset cvs rdiff -u -r1.186 -r1.187 src/distrib/sets/sets.subr cvs rdiff -u -r1.46 -r0 src/distrib/sets/lists/base/rescue.mi cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/rescue/mi cvs rdiff -u -r1.1 -r1.2 src/distrib/sun2/MakeInstTape cvs rdiff -u -r1.2 -r1.3 src/distrib/sun3/MakeInstTape cvs rdiff -u -r1.69 -r1.70 src/distrib/utils/embedded/mkimage cvs rdiff -u -r1.440 -r1.441 src/etc/Makefile cvs rdiff -u -r1.44 -r1.45 src/usr.sbin/sysinst/defs.h cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/sysinst/msg.mi.de cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/sysinst/msg.mi.en cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/sysinst/msg.mi.es cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/sysinst/msg.mi.fr cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/sysinst/msg.mi.pl cvs rdiff -u -r1.32 -r1.33 src/usr.sbin/sysinst/util.c cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/acorn32/md.h cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/amd64/md.h cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/amiga/md.h cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/arc/md.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/atari/md.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/bebox/md.h cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/cats/md.h cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/cobalt/md.h cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/emips/md.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/evbarm/md.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/evbmips/md.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/evbppc/md.h cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/hp300/md.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/hpcarm/md.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/hpcmips/md.h cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/hpcsh/md.h cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/i386/md.h cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/landisk/md.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/mvme68k/md.h cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/ofppc/md.h cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/playstation2/md.h cvs rdiff -u -r1.3 -r1.4
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: maya Date: Wed Oct 2 09:47:25 UTC 2019 Modified Files: src/distrib/sets/lists/base: rescue.mi Removed Files: src/distrib/sets/lists/base: rescue.ad.m68k rescue.mac68k rescue.macppc rescue.sparc64 rescue.sun2 Log Message: Mark /rescue/edlabel as MI-obsolete, so we can remove all remaining MD rescue set list files. To generate a diff of this commit: cvs rdiff -u -r1.4 -r0 src/distrib/sets/lists/base/rescue.ad.m68k \ src/distrib/sets/lists/base/rescue.macppc \ src/distrib/sets/lists/base/rescue.sparc64 \ src/distrib/sets/lists/base/rescue.sun2 cvs rdiff -u -r1.3 -r0 src/distrib/sets/lists/base/rescue.mac68k cvs rdiff -u -r1.45 -r1.46 src/distrib/sets/lists/base/rescue.mi 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/base/rescue.mi diff -u src/distrib/sets/lists/base/rescue.mi:1.45 src/distrib/sets/lists/base/rescue.mi:1.46 --- src/distrib/sets/lists/base/rescue.mi:1.45 Wed Oct 2 09:45:10 2019 +++ src/distrib/sets/lists/base/rescue.mi Wed Oct 2 09:47:24 2019 @@ -1,4 +1,4 @@ -# $NetBSD: rescue.mi,v 1.45 2019/10/02 09:45:10 maya Exp $ +# $NetBSD: rescue.mi,v 1.46 2019/10/02 09:47:24 maya Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -33,6 +33,7 @@ ./rescue/dumplfsbase-rescue-root ./rescue/echo base-rescue-root ./rescue/ed base-rescue-root +./rescue/edlabelbase-obsolete obsolete ./rescue/egrep base-rescue-root ./rescue/ekermitbase-rescue-root ./rescue/ex base-rescue-root
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: maya Date: Wed Oct 2 09:47:25 UTC 2019 Modified Files: src/distrib/sets/lists/base: rescue.mi Removed Files: src/distrib/sets/lists/base: rescue.ad.m68k rescue.mac68k rescue.macppc rescue.sparc64 rescue.sun2 Log Message: Mark /rescue/edlabel as MI-obsolete, so we can remove all remaining MD rescue set list files. To generate a diff of this commit: cvs rdiff -u -r1.4 -r0 src/distrib/sets/lists/base/rescue.ad.m68k \ src/distrib/sets/lists/base/rescue.macppc \ src/distrib/sets/lists/base/rescue.sparc64 \ src/distrib/sets/lists/base/rescue.sun2 cvs rdiff -u -r1.3 -r0 src/distrib/sets/lists/base/rescue.mac68k cvs rdiff -u -r1.45 -r1.46 src/distrib/sets/lists/base/rescue.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: maya Date: Wed Oct 2 09:45:10 UTC 2019 Modified Files: src/distrib/sets/lists/base: rescue.mi src/rescue: Makefile Removed Files: src/distrib/sets/lists/base: rescue.ad.arm rescue.ad.m68k.shl rescue.i386 rescue.shark rescue.sparc rescue.vax src/rescue: list.ldconfig Log Message: Remove ldconfig from /rescue, and mark it MI obsolete. - ldconfig in netbsd refers to a.out binaries only. We've been ELF-only since NetBSD 2.0 or so, and having it in /rescue served little purpose even before that, as /rescue is standalone. - Using MI obsolete to avoid the need for MD set lists where ldconfig is the sole entry To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 src/distrib/sets/lists/base/rescue.ad.arm \ src/distrib/sets/lists/base/rescue.ad.m68k.shl \ src/distrib/sets/lists/base/rescue.shark \ src/distrib/sets/lists/base/rescue.vax cvs rdiff -u -r1.4 -r0 src/distrib/sets/lists/base/rescue.i386 cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/base/rescue.mi cvs rdiff -u -r1.5 -r0 src/distrib/sets/lists/base/rescue.sparc cvs rdiff -u -r1.37 -r1.38 src/rescue/Makefile cvs rdiff -u -r1.1 -r0 src/rescue/list.ldconfig Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: maya
Date: Wed Oct 2 09:45:10 UTC 2019
Modified Files:
src/distrib/sets/lists/base: rescue.mi
src/rescue: Makefile
Removed Files:
src/distrib/sets/lists/base: rescue.ad.arm rescue.ad.m68k.shl
rescue.i386 rescue.shark rescue.sparc rescue.vax
src/rescue: list.ldconfig
Log Message:
Remove ldconfig from /rescue, and mark it MI obsolete.
- ldconfig in netbsd refers to a.out binaries only. We've been ELF-only
since NetBSD 2.0 or so, and having it in /rescue served little purpose
even before that, as /rescue is standalone.
- Using MI obsolete to avoid the need for MD set lists where ldconfig
is the sole entry
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r0 src/distrib/sets/lists/base/rescue.ad.arm \
src/distrib/sets/lists/base/rescue.ad.m68k.shl \
src/distrib/sets/lists/base/rescue.shark \
src/distrib/sets/lists/base/rescue.vax
cvs rdiff -u -r1.4 -r0 src/distrib/sets/lists/base/rescue.i386
cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/base/rescue.mi
cvs rdiff -u -r1.5 -r0 src/distrib/sets/lists/base/rescue.sparc
cvs rdiff -u -r1.37 -r1.38 src/rescue/Makefile
cvs rdiff -u -r1.1 -r0 src/rescue/list.ldconfig
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/base/rescue.mi
diff -u src/distrib/sets/lists/base/rescue.mi:1.44 src/distrib/sets/lists/base/rescue.mi:1.45
--- src/distrib/sets/lists/base/rescue.mi:1.44 Wed Dec 12 07:04:05 2018
+++ src/distrib/sets/lists/base/rescue.mi Wed Oct 2 09:45:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: rescue.mi,v 1.44 2018/12/12 07:04:05 maxv Exp $
+# $NetBSD: rescue.mi,v 1.45 2019/10/02 09:45:10 maya Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -64,6 +64,7 @@
./rescue/ksh base-rescue-root
./rescue/ktrace base-rescue-root
./rescue/ktruss base-rescue-root
+./rescue/ldconfigbase-obsolete obsolete
./rescue/ldd base-rescue-root
./rescue/less base-rescue-root
./rescue/lfs_cleanerdbase-rescue-root
Index: src/rescue/Makefile
diff -u src/rescue/Makefile:1.37 src/rescue/Makefile:1.38
--- src/rescue/Makefile:1.37 Sun Jan 27 04:42:46 2019
+++ src/rescue/Makefile Wed Oct 2 09:45:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2019/01/27 04:42:46 dholland Exp $
+# $NetBSD: Makefile,v 1.38 2019/10/02 09:45:10 maya Exp $
NOLIBCSANITIZER= # defined
NOSANITIZER= # defined
@@ -27,13 +27,6 @@ LISTS= ${.CURDIR}/list
TARGETDIR= ${DESTDIR}/rescue
PARSELISTENV+= TARGETDIR=${TARGETDIR:Q}
-.for f in ldconfig
-PROG_${f}!= cd ${NETBSDSRCDIR}/sbin/${f} && ${MAKE} -V PROG
-.if (${PROG_${f}} != "")
-LISTS+= ${.CURDIR}/list.${f}
-.endif
-.endfor
-
.for f in pdisk
PROG_${f}!= cd ${NETBSDSRCDIR}/external/bsd/${f}/bin && ${MAKE} -V PROG
.if (${PROG_${f}} != "")
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: maya
Date: Wed Sep 25 15:51:37 UTC 2019
Modified Files:
src/sys/dev/ic: isp_netbsd.c
Log Message:
Make clang -Wformat-security happier by not passing a (constant) variable
as the format string,
const string msg; printf(msg)
-> printf("%s", msg);
the strings are all known and don't currently contain format variables.
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/sys/dev/ic/isp_netbsd.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/ic/isp_netbsd.c
diff -u src/sys/dev/ic/isp_netbsd.c:1.94 src/sys/dev/ic/isp_netbsd.c:1.95
--- src/sys/dev/ic/isp_netbsd.c:1.94 Sat Sep 21 07:31:56 2019
+++ src/sys/dev/ic/isp_netbsd.c Wed Sep 25 15:51:37 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_netbsd.c,v 1.94 2019/09/21 07:31:56 maxv Exp $ */
+/* $NetBSD: isp_netbsd.c,v 1.95 2019/09/25 15:51:37 maya Exp $ */
/*
* Platform (NetBSD) dependent common attachment code for Qlogic adapters.
*/
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: isp_netbsd.c,v 1.94 2019/09/21 07:31:56 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_netbsd.c,v 1.95 2019/09/25 15:51:37 maya Exp $");
#include
#include
@@ -1261,7 +1261,7 @@ isp_async(struct ispsoftc *isp, ispasync
"Starting Loop Down Timer");
}
}
- isp_prt(isp, ISP_LOGINFO, msg);
+ isp_prt(isp, ISP_LOGINFO, "%s", msg);
break;
case ISPASYNC_LOOP_UP:
/*
@@ -1457,7 +1457,7 @@ isp_async(struct ispsoftc *isp, ispasync
isp_prt(isp, ISP_LOGSANCFG|ISP_LOGDEBUG0,
"Stopping Loop Down Timer");
}
- isp_prt(isp, ISP_LOGINFO, msg);
+ isp_prt(isp, ISP_LOGINFO, "%s", msg);
/*
* We can set blocked here because we know it's now okay
* to try and run isp_fc_runstate (in order to build loop
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: maya
Date: Wed Sep 25 15:51:37 UTC 2019
Modified Files:
src/sys/dev/ic: isp_netbsd.c
Log Message:
Make clang -Wformat-security happier by not passing a (constant) variable
as the format string,
const string msg; printf(msg)
-> printf("%s", msg);
the strings are all known and don't currently contain format variables.
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/sys/dev/ic/isp_netbsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
