CVS commit: src/sys/arch/arm/rockchip
Module Name:src
Committed By: jmcneill
Date: Fri May 21 09:33:27 UTC 2021
Modified Files:
src/sys/arch/arm/rockchip: rk_fb.c
Log Message:
whitespace cleanup
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/rockchip/rk_fb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/rockchip/rk_fb.c
diff -u src/sys/arch/arm/rockchip/rk_fb.c:1.1 src/sys/arch/arm/rockchip/rk_fb.c:1.2
--- src/sys/arch/arm/rockchip/rk_fb.c:1.1 Sat Nov 9 23:30:14 2019
+++ src/sys/arch/arm/rockchip/rk_fb.c Fri May 21 09:33:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_fb.c,v 1.1 2019/11/09 23:30:14 jmcneill Exp $ */
+/* $NetBSD: rk_fb.c,v 1.2 2021/05/21 09:33:27 jmcneill Exp $ */
/*-
* Copyright (c) 2015-2019 Jared McNeill
@@ -29,7 +29,7 @@
#include "opt_wsdisplay_compat.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: rk_fb.c,v 1.1 2019/11/09 23:30:14 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_fb.c,v 1.2 2021/05/21 09:33:27 jmcneill Exp $");
#include
#include
@@ -61,7 +61,6 @@ static int rk_fb_ioctl(struct drmfb_soft
static const struct drmfb_params rkfb_drmfb_params = {
.dp_mmapfb = rk_fb_mmapfb,
.dp_ioctl = rk_fb_ioctl,
-
};
CFATTACH_DECL_NEW(rk_fb, sizeof(struct rk_fb_softc),
CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: jmcneill Date: Fri May 21 09:33:27 UTC 2021 Modified Files: src/sys/arch/arm/rockchip: rk_fb.c Log Message: whitespace cleanup To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/rockchip/rk_fb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/conf
Module Name:src Committed By: nakayama Date: Fri May 21 11:28:11 UTC 2021 Modified Files: src/sys/conf: newvers_stand.mk Log Message: Fix previous to use the proper version file path. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/conf/newvers_stand.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/conf
Module Name:src
Committed By: nakayama
Date: Fri May 21 11:28:11 UTC 2021
Modified Files:
src/sys/conf: newvers_stand.mk
Log Message:
Fix previous to use the proper version file path.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/conf/newvers_stand.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/newvers_stand.mk
diff -u src/sys/conf/newvers_stand.mk:1.3 src/sys/conf/newvers_stand.mk:1.4
--- src/sys/conf/newvers_stand.mk:1.3 Mon May 17 20:10:27 2021
+++ src/sys/conf/newvers_stand.mk Fri May 21 11:28:11 2021
@@ -1,4 +1,4 @@
-# $NetBSD: newvers_stand.mk,v 1.3 2021/05/17 20:10:27 nakayama Exp $
+# $NetBSD: newvers_stand.mk,v 1.4 2021/05/21 11:28:11 nakayama Exp $
VERSIONFILE?=version
VERSIONMACHINE?=${MACHINE}
@@ -20,6 +20,6 @@ VERSIONFLAGS+=-d
vers.c: ${VERSIONFILE} ${_NETBSD_VERSION_DEPENDS}
${_MKTARGET_CREATE}
${HOST_SH} ${S}/conf/newvers_stand.sh \
- -m ${VERSIONMACHINE} ${VERSIONFLAGS} ${VERSIONFILE} ${NEWVERSWHAT}
+ -m ${VERSIONMACHINE} ${VERSIONFLAGS} ${.ALLSRC:[1]} ${NEWVERSWHAT}
.endif
CVS commit: xsrc/external/mit/xf86-video-nv/dist/src
Module Name:xsrc
Committed By: rillig
Date: Fri May 21 19:09:50 UTC 2021
Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_setup.c
Log Message:
xf86-video-nv: fix Clang build on amd64, i386, macppc
xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c:258:49: error:
passing 'char *' to parameter of type 'Uchar *' (aka 'unsigned char *')
converts between pointers to integer types with different sign
[-Werror,-Wpointer-sign]
tmp = xf86InterpretEEDID(pScrn->scrnIndex, buffer);
^~
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.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/xf86-video-nv/dist/src/nv_setup.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c:1.2 xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c:1.3
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c:1.2 Thu Mar 25 17:22:02 2021
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c Fri May 21 19:09:50 2021
@@ -246,10 +246,10 @@ NVProbeDDC (ScrnInfoPtr pScrn, int bus)
if (!MonInfo) {
/* ask wsdisplay */
struct wsdisplayio_edid_info ei;
- char *buffer;
+ Uchar *buffer;
xf86MonPtr tmp;
- buffer = malloc(1024);
+ buffer = malloc(1024); /* XXX: missing null check */
ei.edid_data = buffer;
ei.buffer_size = 1024;
if (ioctl(xf86Info.consoleFd, WSDISPLAYIO_GET_EDID, ) != -1) {
CVS commit: xsrc/external/mit/xf86-video-nv/dist/src
Module Name:xsrc Committed By: rillig Date: Fri May 21 19:09:50 UTC 2021 Modified Files: xsrc/external/mit/xf86-video-nv/dist/src: nv_setup.c Log Message: xf86-video-nv: fix Clang build on amd64, i386, macppc xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c:258:49: error: passing 'char *' to parameter of type 'Uchar *' (aka 'unsigned char *') converts between pointers to integer types with different sign [-Werror,-Wpointer-sign] tmp = xf86InterpretEEDID(pScrn->scrnIndex, buffer); ^~ To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dist/common/nvpair
Module Name:src Committed By: hannken Date: Fri May 21 17:32:49 UTC 2021 Modified Files: src/external/cddl/osnet/dist/common/nvpair: nvpair.c Log Message: Replace the Solaris style endian check (exactly one of _LITTLE_ENDIAN or _BIG_ENDIAN is defined) with standard check "#if BYTE_ORDER == BIG_ENDIAN" like we do it elseware. Should fix PR 56191 (ZFS tests fail on sparc64) To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/dist/common/nvpair/nvpair.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/cddl/osnet/dist/common/nvpair/nvpair.c diff -u src/external/cddl/osnet/dist/common/nvpair/nvpair.c:1.5 src/external/cddl/osnet/dist/common/nvpair/nvpair.c:1.6 --- src/external/cddl/osnet/dist/common/nvpair/nvpair.c:1.5 Mon Mar 2 15:45:33 2020 +++ src/external/cddl/osnet/dist/common/nvpair/nvpair.c Fri May 21 17:32:49 2021 @@ -2255,11 +2255,11 @@ nvlist_common(nvlist_t *nvl, char *buf, int err = 0; nvstream_t nvs; int nvl_endian; -#ifdef _LITTLE_ENDIAN - int host_endian = 1; -#else +#if BYTE_ORDER == BIG_ENDIAN int host_endian = 0; -#endif /* _LITTLE_ENDIAN */ +#else + int host_endian = 1; +#endif /* BYTE_ORDER */ nvs_header_t *nvh = (void *)buf; if (buflen == NULL || nvl == NULL ||
CVS commit: src/external/cddl/osnet/dist/common/nvpair
Module Name:src Committed By: hannken Date: Fri May 21 17:32:49 UTC 2021 Modified Files: src/external/cddl/osnet/dist/common/nvpair: nvpair.c Log Message: Replace the Solaris style endian check (exactly one of _LITTLE_ENDIAN or _BIG_ENDIAN is defined) with standard check "#if BYTE_ORDER == BIG_ENDIAN" like we do it elseware. Should fix PR 56191 (ZFS tests fail on sparc64) To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/dist/common/nvpair/nvpair.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/pci/voyager
Module Name:src Committed By: macallan Date: Fri May 21 20:22:15 UTC 2021 Modified Files: src/sys/dev/pci/voyager: voyagerfb.c Log Message: use probed VRAM size to determine where to put the cursor instead of blindly assuming 16MB also make sure the glyph cache can't overlap with the cursor To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/dev/pci/voyager/voyagerfb.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/pci/voyager
Module Name:src
Committed By: macallan
Date: Fri May 21 20:22:15 UTC 2021
Modified Files:
src/sys/dev/pci/voyager: voyagerfb.c
Log Message:
use probed VRAM size to determine where to put the cursor instead of blindly
assuming 16MB
also make sure the glyph cache can't overlap with the cursor
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/pci/voyager/voyagerfb.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/voyager/voyagerfb.c
diff -u src/sys/dev/pci/voyager/voyagerfb.c:1.30 src/sys/dev/pci/voyager/voyagerfb.c:1.31
--- src/sys/dev/pci/voyager/voyagerfb.c:1.30 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/pci/voyager/voyagerfb.c Fri May 21 20:22:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: voyagerfb.c,v 1.30 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: voyagerfb.c,v 1.31 2021/05/21 20:22:15 macallan Exp $ */
/*
* Copyright (c) 2009, 2011 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: voyagerfb.c,v 1.30 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: voyagerfb.c,v 1.31 2021/05/21 20:22:15 macallan Exp $");
#include
#include
@@ -328,7 +328,8 @@ voyagerfb_attach(device_t parent, device
(*ri->ri_ops.allocattr)(ri, 0, 0, 0, );
}
glyphcache_init(>sc_gc, sc->sc_height,
- (sc->sc_fbsize / sc->sc_stride) - sc->sc_height,
+ ((sc->sc_fbsize - 16 * 64) / sc->sc_stride) -
+ sc->sc_height,
sc->sc_width,
ri->ri_font->fontwidth,
ri->ri_font->fontheight,
@@ -780,7 +781,7 @@ voyagerfb_init(struct voyagerfb_softc *s
reg);
/* put the cursor at the end of video memory */
- sc->sc_cursor_addr = 16 * 1024 * 1024 - 16 * 64; /* XXX */
+ sc->sc_cursor_addr = sc->sc_fbsize - 16 * 64; /* XXX */
DPRINTF("%s: %08x\n", __func__, sc->sc_cursor_addr);
sc->sc_cursor = (uint32_t *)((uint8_t *)bus_space_vaddr(sc->sc_memt,
sc->sc_fbh) + sc->sc_cursor_addr);
CVS commit: src/external/mpl/dhcp/dist/relay
Module Name:src
Committed By: christos
Date: Fri May 21 21:07:37 UTC 2021
Modified Files:
src/external/mpl/dhcp/dist/relay: dhcrelay.c
Log Message:
Add missing call to libdhcp_callbacks_register(). Should stop
dhcrelay() crashing when accessing *libdhcp_callbacks.local_port.
(from mrg@)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/relay/dhcrelay.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/mpl/dhcp/dist/relay/dhcrelay.c
diff -u src/external/mpl/dhcp/dist/relay/dhcrelay.c:1.3 src/external/mpl/dhcp/dist/relay/dhcrelay.c:1.4
--- src/external/mpl/dhcp/dist/relay/dhcrelay.c:1.3 Mon Aug 3 17:10:57 2020
+++ src/external/mpl/dhcp/dist/relay/dhcrelay.c Fri May 21 17:07:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dhcrelay.c,v 1.3 2020/08/03 21:10:57 christos Exp $ */
+/* $NetBSD: dhcrelay.c,v 1.4 2021/05/21 21:07:37 christos Exp $ */
/* dhcrelay.c
@@ -29,7 +29,7 @@
*/
#include
-__RCSID("$NetBSD: dhcrelay.c,v 1.3 2020/08/03 21:10:57 christos Exp $");
+__RCSID("$NetBSD: dhcrelay.c,v 1.4 2021/05/21 21:07:37 christos Exp $");
#include "dhcpd.h"
#include
@@ -264,7 +264,7 @@ char *progname;
*/
#include
-__RCSID("$NetBSD: dhcrelay.c,v 1.3 2020/08/03 21:10:57 christos Exp $");
+__RCSID("$NetBSD: dhcrelay.c,v 1.4 2021/05/21 21:07:37 christos Exp $");
static const char use_noarg[] = "No argument for command: %s";
#ifdef RELAY_PORT
static const char use_port_defined[] = "Port already set, %s inappropriate";
@@ -317,6 +317,8 @@ main(int argc, char **argv) {
int local_family_set = 0;
#endif
+ libdhcp_callbacks_register(_callbacks);
+
#ifdef OLD_LOG_NAME
progname = "dhcrelay";
#else
re: CVS commit: xsrc/external/mit/xf86-video-nv/dist/src
"Roland Illig" writes: > Module Name: xsrc > Committed By: rillig > Date: Fri May 21 19:09:50 UTC 2021 > > Modified Files: > xsrc/external/mit/xf86-video-nv/dist/src: nv_setup.c > > Log Message: > xf86-video-nv: fix Clang build on amd64, i386, macppc > > xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c:258:49: error: > passing 'char *' to parameter of type 'Uchar *' (aka 'unsigned char *') > converts between pointers to integer types with different sign > [-Werror,-Wpointer-sign] > > tmp = xf86InterpretEEDID(pScrn->scrnIndex, buffer); i would rather fix these sorts of issues with -Wno-* in the relevant makefiles than patching 3rd party code where the change doesn't really matter (like this one.) thanks. .mrg.
CVS commit: src/sys/dev/i2c
Module Name:src
Committed By: macallan
Date: Fri May 21 20:42:05 UTC 2021
Modified Files:
src/sys/dev/i2c: lm75.c
Log Message:
don't prop_object_retain(NULL)
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/i2c/lm75.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/i2c/lm75.c
diff -u src/sys/dev/i2c/lm75.c:1.42 src/sys/dev/i2c/lm75.c:1.43
--- src/sys/dev/i2c/lm75.c:1.42 Mon Mar 1 04:40:39 2021
+++ src/sys/dev/i2c/lm75.c Fri May 21 20:42:05 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lm75.c,v 1.42 2021/03/01 04:40:39 rin Exp $ */
+/* $NetBSD: lm75.c,v 1.43 2021/05/21 20:42:05 macallan Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: lm75.c,v 1.42 2021/03/01 04:40:39 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lm75.c,v 1.43 2021/05/21 20:42:05 macallan Exp $");
#include
#include
@@ -215,7 +215,8 @@ lmtemp_attach(device_t parent, device_t
sc->sc_tag = ia->ia_tag;
sc->sc_address = ia->ia_addr;
sc->sc_prop = ia->ia_prop;
- prop_object_retain(sc->sc_prop);
+
+ if (ia->ia_prop != NULL) prop_object_retain(sc->sc_prop);
aprint_naive(": Temperature Sensor\n");
if (ia->ia_name) {
CVS commit: src/sys/stand/efiboot
Module Name:src
Committed By: jmcneill
Date: Fri May 21 21:53:15 UTC 2021
Modified Files:
src/sys/stand/efiboot: efiacpi.c efiacpi.h efifdt.c exec.c version
Log Message:
Disable ACPI support when booting big endian kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/stand/efiboot/efiacpi.c
cvs rdiff -u -r1.1 -r1.2 src/sys/stand/efiboot/efiacpi.h
cvs rdiff -u -r1.28 -r1.29 src/sys/stand/efiboot/efifdt.c
cvs rdiff -u -r1.20 -r1.21 src/sys/stand/efiboot/exec.c
cvs rdiff -u -r1.22 -r1.23 src/sys/stand/efiboot/version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/stand/efiboot/efiacpi.c
diff -u src/sys/stand/efiboot/efiacpi.c:1.8 src/sys/stand/efiboot/efiacpi.c:1.9
--- src/sys/stand/efiboot/efiacpi.c:1.8 Sat Oct 10 19:17:39 2020
+++ src/sys/stand/efiboot/efiacpi.c Fri May 21 21:53:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: efiacpi.c,v 1.8 2020/10/10 19:17:39 jmcneill Exp $ */
+/* $NetBSD: efiacpi.c,v 1.9 2021/05/21 21:53:15 jmcneill Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -53,6 +53,7 @@ struct acpi_rdsp {
static EFI_GUID Acpi20TableGuid = ACPI_20_TABLE_GUID;
static EFI_GUID Smbios3TableGuid = SMBIOS3_TABLE_GUID;
+static int acpi_enable = 1;
static void *acpi_root = NULL;
static void *smbios3_table = NULL;
@@ -78,6 +79,18 @@ efi_acpi_available(void)
return acpi_root != NULL;
}
+int
+efi_acpi_enabled(void)
+{
+ return acpi_enable;
+}
+
+void
+efi_acpi_enable(int enable)
+{
+ acpi_enable = enable;
+}
+
static char model_buf[128];
static const char *
Index: src/sys/stand/efiboot/efiacpi.h
diff -u src/sys/stand/efiboot/efiacpi.h:1.1 src/sys/stand/efiboot/efiacpi.h:1.2
--- src/sys/stand/efiboot/efiacpi.h:1.1 Fri Oct 12 22:08:04 2018
+++ src/sys/stand/efiboot/efiacpi.h Fri May 21 21:53:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: efiacpi.h,v 1.1 2018/10/12 22:08:04 jmcneill Exp $ */
+/* $NetBSD: efiacpi.h,v 1.2 2021/05/21 21:53:15 jmcneill Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,4 +32,6 @@
int efi_acpi_probe(void);
void efi_acpi_show(void);
int efi_acpi_available(void);
+int efi_acpi_enabled(void);
+void efi_acpi_enable(int);
int efi_acpi_create_fdt(void);
Index: src/sys/stand/efiboot/efifdt.c
diff -u src/sys/stand/efiboot/efifdt.c:1.28 src/sys/stand/efiboot/efifdt.c:1.29
--- src/sys/stand/efiboot/efifdt.c:1.28 Sat Dec 19 08:09:31 2020
+++ src/sys/stand/efiboot/efifdt.c Fri May 21 21:53:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: efifdt.c,v 1.28 2020/12/19 08:09:31 skrll Exp $ */
+/* $NetBSD: efifdt.c,v 1.29 2021/05/21 21:53:15 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Jason R. Thorpe
@@ -370,7 +370,7 @@ efi_fdt_gop(void)
/*
* In ACPI mode, use GOP as console.
*/
- if (efi_acpi_available()) {
+ if (efi_acpi_available() && efi_acpi_enabled()) {
snprintf(buf, sizeof(buf), "/chosen/framebuffer@%" PRIx64, mode->FrameBufferBase);
fdt_setprop_string(fdt_data, chosen, "stdout-path", buf);
}
Index: src/sys/stand/efiboot/exec.c
diff -u src/sys/stand/efiboot/exec.c:1.20 src/sys/stand/efiboot/exec.c:1.21
--- src/sys/stand/efiboot/exec.c:1.20 Tue May 11 07:15:10 2021
+++ src/sys/stand/efiboot/exec.c Fri May 21 21:53:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.20 2021/05/11 07:15:10 skrll Exp $ */
+/* $NetBSD: exec.c,v 1.21 2021/05/21 21:53:15 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Jason R. Thorpe
@@ -289,7 +289,10 @@ exec_netbsd(const char *fname, const cha
load_offset = 0;
#ifdef EFIBOOT_ACPI
- if (efi_acpi_available()) {
+ /* ACPI support only works for little endian kernels */
+ efi_acpi_enable(netbsd_elf_data == ELFDATA2LSB);
+
+ if (efi_acpi_available() && efi_acpi_enabled()) {
efi_acpi_create_fdt();
} else
#endif
Index: src/sys/stand/efiboot/version
diff -u src/sys/stand/efiboot/version:1.22 src/sys/stand/efiboot/version:1.23
--- src/sys/stand/efiboot/version:1.22 Sun Oct 18 18:09:32 2020
+++ src/sys/stand/efiboot/version Fri May 21 21:53:15 2021
@@ -1,4 +1,4 @@
-$NetBSD: version,v 1.22 2020/10/18 18:09:32 tnn Exp $
+$NetBSD: version,v 1.23 2021/05/21 21:53:15 jmcneill Exp $
NOTE ANY CHANGES YOU MAKE TO THE EFI BOOTLOADER HERE. The format of this
file is important - make sure the entries are appended on end, last item
@@ -26,3 +26,4 @@ is taken as the current.
2.3: EFI RT and GOP support for devicetree mode.
2.4: Add ISO9660 support.
2.5: Recognize the EFI system partion as fstype MSDOS.
+2.6: Disable ACPI support when booting big endian kernels.
CVS commit: src/sys/stand/efiboot
Module Name:src Committed By: jmcneill Date: Fri May 21 21:53:15 UTC 2021 Modified Files: src/sys/stand/efiboot: efiacpi.c efiacpi.h efifdt.c exec.c version Log Message: Disable ACPI support when booting big endian kernels. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/stand/efiboot/efiacpi.c cvs rdiff -u -r1.1 -r1.2 src/sys/stand/efiboot/efiacpi.h cvs rdiff -u -r1.28 -r1.29 src/sys/stand/efiboot/efifdt.c cvs rdiff -u -r1.20 -r1.21 src/sys/stand/efiboot/exec.c cvs rdiff -u -r1.22 -r1.23 src/sys/stand/efiboot/version 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/voyager
Module Name:src Committed By: macallan Date: Fri May 21 20:23:35 UTC 2021 Modified Files: src/sys/dev/pci/voyager: voyagerfb.c Log Message: fix wsdisplay attachment in the New Order Of Things To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/voyager/voyagerfb.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/pci/voyager
Module Name:src Committed By: macallan Date: Fri May 21 20:23:35 UTC 2021 Modified Files: src/sys/dev/pci/voyager: voyagerfb.c Log Message: fix wsdisplay attachment in the New Order Of Things To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/voyager/voyagerfb.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/voyager/voyagerfb.c diff -u src/sys/dev/pci/voyager/voyagerfb.c:1.31 src/sys/dev/pci/voyager/voyagerfb.c:1.32 --- src/sys/dev/pci/voyager/voyagerfb.c:1.31 Fri May 21 20:22:15 2021 +++ src/sys/dev/pci/voyager/voyagerfb.c Fri May 21 20:23:35 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: voyagerfb.c,v 1.31 2021/05/21 20:22:15 macallan Exp $ */ +/* $NetBSD: voyagerfb.c,v 1.32 2021/05/21 20:23:35 macallan Exp $ */ /* * Copyright (c) 2009, 2011 Michael Lorenz @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: voyagerfb.c,v 1.31 2021/05/21 20:22:15 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: voyagerfb.c,v 1.32 2021/05/21 20:23:35 macallan Exp $"); #include #include @@ -363,7 +363,9 @@ voyagerfb_attach(device_t parent, device aa.accessops = _accessops; aa.accesscookie = >vd; - config_found(sc->sc_dev, , wsemuldisplaydevprint, CFARG_EOL); + config_found(sc->sc_dev, , wsemuldisplaydevprint, + CFARG_IATTR, "wsemuldisplaydev", + CFARG_EOL); } static int
CVS commit: src/sys/lib/libsa
Module Name:src Committed By: jmcneill Date: Fri May 21 21:52:16 UTC 2021 Modified Files: src/sys/lib/libsa: loadfile.c loadfile.h Log Message: Capture the endianness of the ELF file loaded in 'netbsd_elf_data', the same way we do already for the class in 'netbsd_elf_class'. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/lib/libsa/loadfile.c cvs rdiff -u -r1.14 -r1.15 src/sys/lib/libsa/loadfile.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/lib/libsa
Module Name:src
Committed By: jmcneill
Date: Fri May 21 21:52:16 UTC 2021
Modified Files:
src/sys/lib/libsa: loadfile.c loadfile.h
Log Message:
Capture the endianness of the ELF file loaded in 'netbsd_elf_data', the
same way we do already for the class in 'netbsd_elf_class'.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/lib/libsa/loadfile.c
cvs rdiff -u -r1.14 -r1.15 src/sys/lib/libsa/loadfile.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/lib/libsa/loadfile.c
diff -u src/sys/lib/libsa/loadfile.c:1.32 src/sys/lib/libsa/loadfile.c:1.33
--- src/sys/lib/libsa/loadfile.c:1.32 Fri Apr 5 20:09:29 2019
+++ src/sys/lib/libsa/loadfile.c Fri May 21 21:52:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile.c,v 1.32 2019/04/05 20:09:29 christos Exp $ */
+/* $NetBSD: loadfile.c,v 1.33 2021/05/21 21:52:15 jmcneill Exp $ */
/*-
* Copyright (c) 1997, 2008 The NetBSD Foundation, Inc.
@@ -84,6 +84,7 @@
uint32_t netbsd_version;
u_int netbsd_elf_class;
+u_int netbsd_elf_data;
/*
* Open 'filename', read in program and return the opened file
@@ -159,6 +160,7 @@ fdloadfile(int fd, u_long *marks, int fl
if (memcmp(hdr.elf32.e_ident, ELFMAG, SELFMAG) == 0 &&
hdr.elf32.e_ident[EI_CLASS] == ELFCLASS32) {
netbsd_elf_class = ELFCLASS32;
+ netbsd_elf_data = hdr.elf32.e_ident[EI_DATA];
rval = loadfile_elf32(fd, , marks, flags);
} else
#endif
@@ -166,6 +168,7 @@ fdloadfile(int fd, u_long *marks, int fl
if (memcmp(hdr.elf64.e_ident, ELFMAG, SELFMAG) == 0 &&
hdr.elf64.e_ident[EI_CLASS] == ELFCLASS64) {
netbsd_elf_class = ELFCLASS64;
+ netbsd_elf_data = hdr.elf64.e_ident[EI_DATA];
rval = loadfile_elf64(fd, , marks, flags);
} else
#endif
Index: src/sys/lib/libsa/loadfile.h
diff -u src/sys/lib/libsa/loadfile.h:1.14 src/sys/lib/libsa/loadfile.h:1.15
--- src/sys/lib/libsa/loadfile.h:1.14 Sat Oct 7 10:26:39 2017
+++ src/sys/lib/libsa/loadfile.h Fri May 21 21:52:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile.h,v 1.14 2017/10/07 10:26:39 maxv Exp $ */
+/* $NetBSD: loadfile.h,v 1.15 2021/05/21 21:52:15 jmcneill Exp $ */
/*-
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -93,3 +93,4 @@ int loadfile_aout(int, struct exec *, u_
extern uint32_t netbsd_version;
extern u_int netbsd_elf_class;
+extern u_int netbsd_elf_data;
CVS commit: src/external/mpl/dhcp/dist/relay
Module Name:src Committed By: christos Date: Fri May 21 21:07:37 UTC 2021 Modified Files: src/external/mpl/dhcp/dist/relay: dhcrelay.c Log Message: Add missing call to libdhcp_callbacks_register(). Should stop dhcrelay() crashing when accessing *libdhcp_callbacks.local_port. (from mrg@) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/relay/dhcrelay.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/i2c
Module Name:src Committed By: macallan Date: Fri May 21 21:21:01 UTC 2021 Modified Files: src/sys/dev/i2c: m41st84.c Log Message: add \n to attach output To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/dev/i2c/m41st84.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/i2c
Module Name:src
Committed By: macallan
Date: Fri May 21 21:21:01 UTC 2021
Modified Files:
src/sys/dev/i2c: m41st84.c
Log Message:
add \n to attach output
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/i2c/m41st84.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/i2c/m41st84.c
diff -u src/sys/dev/i2c/m41st84.c:1.31 src/sys/dev/i2c/m41st84.c:1.32
--- src/sys/dev/i2c/m41st84.c:1.31 Wed Jan 27 02:29:48 2021
+++ src/sys/dev/i2c/m41st84.c Fri May 21 21:21:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: m41st84.c,v 1.31 2021/01/27 02:29:48 thorpej Exp $ */
+/* $NetBSD: m41st84.c,v 1.32 2021/05/21 21:21:01 macallan Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: m41st84.c,v 1.31 2021/01/27 02:29:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: m41st84.c,v 1.32 2021/05/21 21:21:01 macallan Exp $");
#include
#include
@@ -194,7 +194,7 @@ strtc_attach(device_t parent, device_t s
aprint_naive(": Real-time Clock%s\n",
sm->sm_nvram_size ? "/NVRAM" : "");
- aprint_normal(": M41T%d Real-time Clock%s", sm->sm_model,
+ aprint_normal(": M41T%d Real-time Clock%s\n", sm->sm_model,
sm->sm_nvram_size ? "/NVRAM" : "");
sc->sc_tag = ia->ia_tag;
CVS commit: src/sys/dev/i2c
Module Name:src Committed By: macallan Date: Fri May 21 20:42:05 UTC 2021 Modified Files: src/sys/dev/i2c: lm75.c Log Message: don't prop_object_retain(NULL) To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/dev/i2c/lm75.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/ic
Module Name:src Committed By: thorpej Date: Sat May 22 01:24:27 UTC 2021 Modified Files: src/sys/dev/ic: tpm.c Log Message: Remove extra newline from boot messages (isa and acpi front-ends already provide the newline). To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/dev/ic/tpm.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/ic
Module Name:src
Committed By: thorpej
Date: Sat May 22 01:24:27 UTC 2021
Modified Files:
src/sys/dev/ic: tpm.c
Log Message:
Remove extra newline from boot messages (isa and acpi front-ends
already provide the newline).
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/ic/tpm.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/tpm.c
diff -u src/sys/dev/ic/tpm.c:1.19 src/sys/dev/ic/tpm.c:1.20
--- src/sys/dev/ic/tpm.c:1.19 Mon Jan 4 18:26:59 2021
+++ src/sys/dev/ic/tpm.c Sat May 22 01:24:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tpm.c,v 1.19 2021/01/04 18:26:59 riastradh Exp $ */
+/* $NetBSD: tpm.c,v 1.20 2021/05/22 01:24:27 thorpej Exp $ */
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tpm.c,v 1.19 2021/01/04 18:26:59 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tpm.c,v 1.20 2021/05/22 01:24:27 thorpej Exp $");
#include
#include
@@ -505,9 +505,6 @@ tpm_tis12_init(struct tpm_softc *sc)
{
int rv;
- aprint_naive("\n");
- aprint_normal("\n");
-
sc->sc_caps = bus_space_read_4(sc->sc_bt, sc->sc_bh,
TPM_INTF_CAPABILITY);
sc->sc_devid = bus_space_read_4(sc->sc_bt, sc->sc_bh, TPM_ID);
