CVS commit: [netbsd-10] src/sys/arch/evbarm/conf
Module Name:src Committed By: martin Date: Sun Feb 25 15:53:06 UTC 2024 Modified Files: src/sys/arch/evbarm/conf [netbsd-10]: std.bcm53xx Log Message: Pull up following revision(s) (requested by skrll in ticket #611): sys/arch/evbarm/conf/std.bcm53xx: revision 1.22 Add ARM_HAS_VBAR To generate a diff of this commit: cvs rdiff -u -r1.20.28.1 -r1.20.28.2 src/sys/arch/evbarm/conf/std.bcm53xx Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/evbarm/conf
Module Name:src Committed By: martin Date: Sun Feb 25 15:53:06 UTC 2024 Modified Files: src/sys/arch/evbarm/conf [netbsd-10]: std.bcm53xx Log Message: Pull up following revision(s) (requested by skrll in ticket #611): sys/arch/evbarm/conf/std.bcm53xx: revision 1.22 Add ARM_HAS_VBAR To generate a diff of this commit: cvs rdiff -u -r1.20.28.1 -r1.20.28.2 src/sys/arch/evbarm/conf/std.bcm53xx Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/std.bcm53xx diff -u src/sys/arch/evbarm/conf/std.bcm53xx:1.20.28.1 src/sys/arch/evbarm/conf/std.bcm53xx:1.20.28.2 --- src/sys/arch/evbarm/conf/std.bcm53xx:1.20.28.1 Sun Feb 18 16:19:56 2024 +++ src/sys/arch/evbarm/conf/std.bcm53xx Sun Feb 25 15:53:06 2024 @@ -1,4 +1,4 @@ -# $NetBSD: std.bcm53xx,v 1.20.28.1 2024/02/18 16:19:56 martin Exp $ +# $NetBSD: std.bcm53xx,v 1.20.28.2 2024/02/25 15:53:06 martin Exp $ # # standard NetBSD/evbarm for BCM5301X options @@ -9,6 +9,7 @@ include "arch/evbarm/conf/std.evbarm" include "arch/evbarm/conf/files.bcm53xx" options ARM_GENERIC_TODR +options ARM_HAS_VBAR options ARM_INTR_IMPL="" options COM_TOLERANCE=40 options CORTEX_PMC
CVS commit: [netbsd-10] src/sys/arch/evbarm
Module Name:src Committed By: martin Date: Sat Feb 24 13:10:18 UTC 2024 Modified Files: src/sys/arch/evbarm/kobo [netbsd-10]: kobo_usb.c src/sys/arch/evbarm/netwalker [netbsd-10]: netwalker_usb.c Log Message: Pull up following revision(s) (requested by andvar in ticket #609): sys/arch/evbarm/netwalker/netwalker_usb.c: revision 1.9 sys/arch/evbarm/kobo/kobo_usb.c: revision 1.4 sc_init_md_hook expects two params since interface change in imxusbvar.h rev 1.7 thus adjust kobo_usb_init() and netwalker_usb_init() functions accordingly. Fixes build for KOBO and NETWALKER(_MD) kernel configs. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.28.1 src/sys/arch/evbarm/kobo/kobo_usb.c cvs rdiff -u -r1.8 -r1.8.24.1 src/sys/arch/evbarm/netwalker/netwalker_usb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/evbarm
Module Name:src
Committed By: martin
Date: Sat Feb 24 13:10:18 UTC 2024
Modified Files:
src/sys/arch/evbarm/kobo [netbsd-10]: kobo_usb.c
src/sys/arch/evbarm/netwalker [netbsd-10]: netwalker_usb.c
Log Message:
Pull up following revision(s) (requested by andvar in ticket #609):
sys/arch/evbarm/netwalker/netwalker_usb.c: revision 1.9
sys/arch/evbarm/kobo/kobo_usb.c: revision 1.4
sc_init_md_hook expects two params since interface change in imxusbvar.h rev 1.7
thus adjust kobo_usb_init() and netwalker_usb_init() functions accordingly.
Fixes build for KOBO and NETWALKER(_MD) kernel configs.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.28.1 src/sys/arch/evbarm/kobo/kobo_usb.c
cvs rdiff -u -r1.8 -r1.8.24.1 src/sys/arch/evbarm/netwalker/netwalker_usb.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/evbarm/kobo/kobo_usb.c
diff -u src/sys/arch/evbarm/kobo/kobo_usb.c:1.3 src/sys/arch/evbarm/kobo/kobo_usb.c:1.3.28.1
--- src/sys/arch/evbarm/kobo/kobo_usb.c:1.3 Wed Jul 24 11:20:55 2019
+++ src/sys/arch/evbarm/kobo/kobo_usb.c Sat Feb 24 13:10:18 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: kobo_usb.c,v 1.3 2019/07/24 11:20:55 hkenken Exp $ */
+/* $NetBSD: kobo_usb.c,v 1.3.28.1 2024/02/24 13:10:18 martin Exp $ */
/*
* Copyright (c) 2012 Genetec Corporation. All rights reserved.
@@ -27,7 +27,7 @@
*
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kobo_usb.c,v 1.3 2019/07/24 11:20:55 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kobo_usb.c,v 1.3.28.1 2024/02/24 13:10:18 martin Exp $");
#include "opt_imx.h"
@@ -64,7 +64,7 @@ struct kobo_usbc_softc {
static int imxusbc_match(device_t, cfdata_t, void *);
static void imxusbc_attach(device_t, device_t, void *);
-static void kobo_usb_init(struct imxehci_softc *);
+static void kobo_usb_init(struct imxehci_softc *, uintptr_t);
static void init_otg(struct imxehci_softc *);
static void init_h1(struct imxehci_softc *);
@@ -105,7 +105,7 @@ imxusbc_attach(device_t parent, device_t
}
static void
-kobo_usb_init(struct imxehci_softc *sc)
+kobo_usb_init(struct imxehci_softc *sc, uintptr_t data)
{
switch (sc->sc_unit) {
case 0: /* OTG controller */
Index: src/sys/arch/evbarm/netwalker/netwalker_usb.c
diff -u src/sys/arch/evbarm/netwalker/netwalker_usb.c:1.8 src/sys/arch/evbarm/netwalker/netwalker_usb.c:1.8.24.1
--- src/sys/arch/evbarm/netwalker/netwalker_usb.c:1.8 Wed Jan 15 10:25:47 2020
+++ src/sys/arch/evbarm/netwalker/netwalker_usb.c Sat Feb 24 13:10:18 2024
@@ -25,7 +25,7 @@
*
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netwalker_usb.c,v 1.8 2020/01/15 10:25:47 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netwalker_usb.c,v 1.8.24.1 2024/02/24 13:10:18 martin Exp $");
#include "locators.h"
@@ -61,7 +61,7 @@ struct netwalker_usbc_softc {
static int imxusbc_match(device_t, cfdata_t, void *);
static void imxusbc_attach(device_t, device_t, void *);
-static void netwalker_usb_init(struct imxehci_softc *);
+static void netwalker_usb_init(struct imxehci_softc *, uintptr_t);
static void init_otg(struct imxehci_softc *);
static void init_h1(struct imxehci_softc *);
@@ -103,7 +103,7 @@ imxusbc_attach(device_t parent, device_t
}
static void
-netwalker_usb_init(struct imxehci_softc *sc)
+netwalker_usb_init(struct imxehci_softc *sc, uintptr_t data)
{
switch (sc->sc_unit) {
case 0: /* OTG controller */
CVS commit: [netbsd-10] src/sys/arch/evbarm/evbarm
Module Name:src Committed By: martin Date: Sun Oct 29 16:51:28 UTC 2023 Modified Files: src/sys/arch/evbarm/evbarm [netbsd-10]: autoconf.c Log Message: Pull up following revision(s) (requested by mrg in ticket #437): sys/arch/evbarm/evbarm/autoconf.c: revision 1.25 allow "root=xxx" command line to override platform defaults. PR#57324 shows that on broadcom evbarm systems the default root is no longer chosen, even when specified on the command line. sc.dying and mlelstv pointed out that revision 1.24 made this function skip parsing "root=" if already set, which was not what i expected to happen anywhere here (and it works fine on FDT and UEFI boots.) revert that part of 1.24. (while this is it's own bug, it points out that bcm283x_platform_device_register() currently will set booted_device to the first ld@sdmmc found, even if that device was not involved with booting. while fixing this would be nice, it wouldn't have helped with this setup -- choosing ld@sdmmc is the right answer in eg PR#57324 at this point, so having it set in this case should be fine, and then overrideable via root=.) To generate a diff of this commit: cvs rdiff -u -r1.23.18.1 -r1.23.18.2 src/sys/arch/evbarm/evbarm/autoconf.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/evbarm/evbarm/autoconf.c diff -u src/sys/arch/evbarm/evbarm/autoconf.c:1.23.18.1 src/sys/arch/evbarm/evbarm/autoconf.c:1.23.18.2 --- src/sys/arch/evbarm/evbarm/autoconf.c:1.23.18.1 Fri Oct 20 16:13:03 2023 +++ src/sys/arch/evbarm/evbarm/autoconf.c Sun Oct 29 16:51:28 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.23.18.1 2023/10/20 16:13:03 martin Exp $ */ +/* $NetBSD: autoconf.c,v 1.23.18.2 2023/10/29 16:51:28 martin Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.23.18.1 2023/10/20 16:13:03 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.23.18.2 2023/10/29 16:51:28 martin Exp $"); #include "opt_md.h" #include "opt_ddb.h" @@ -108,9 +108,6 @@ set_root_device(void) char *ptr, *end, *buf; size_t len; - if (booted_device) - return; - if (boot_args == NULL) return;
CVS commit: [netbsd-10] src/sys/arch/evbarm/evbarm
Module Name:src Committed By: martin Date: Sun Oct 29 16:51:28 UTC 2023 Modified Files: src/sys/arch/evbarm/evbarm [netbsd-10]: autoconf.c Log Message: Pull up following revision(s) (requested by mrg in ticket #437): sys/arch/evbarm/evbarm/autoconf.c: revision 1.25 allow "root=xxx" command line to override platform defaults. PR#57324 shows that on broadcom evbarm systems the default root is no longer chosen, even when specified on the command line. sc.dying and mlelstv pointed out that revision 1.24 made this function skip parsing "root=" if already set, which was not what i expected to happen anywhere here (and it works fine on FDT and UEFI boots.) revert that part of 1.24. (while this is it's own bug, it points out that bcm283x_platform_device_register() currently will set booted_device to the first ld@sdmmc found, even if that device was not involved with booting. while fixing this would be nice, it wouldn't have helped with this setup -- choosing ld@sdmmc is the right answer in eg PR#57324 at this point, so having it set in this case should be fine, and then overrideable via root=.) To generate a diff of this commit: cvs rdiff -u -r1.23.18.1 -r1.23.18.2 src/sys/arch/evbarm/evbarm/autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/evbarm
Module Name:src
Committed By: martin
Date: Fri Oct 20 16:13:04 UTC 2023
Modified Files:
src/sys/arch/evbarm/evbarm [netbsd-10]: autoconf.c
src/sys/arch/evbarm/fdt [netbsd-10]: fdt_machdep.c
src/sys/arch/evbarm/include [netbsd-10]: types.h
Log Message:
Pull up following revision(s) (requested by mrg in ticket #431):
sys/arch/evbarm/evbarm/autoconf.c: revision 1.24
sys/arch/evbarm/include/types.h: revision 1.16
sys/arch/evbarm/fdt/fdt_machdep.c: revision 1.100
sys/arch/evbarm/fdt/fdt_machdep.c: revision 1.101
fix root detection on evbarm when raid is involved
there are several problems solved in this change:
- - lots of work was re-done when we already have determined the
device booted from, so several new early returns introduced
if booted_device has been set
- - due to the lack of cpu_bootconf(), raidframe softroot would
override "root=xxx" on the boot command line (note that
platforms that use eg, device_register() to detect the boot
device are not affected by this issue as they find the
boot device much earlier.)
- - in the new cpu_bootconf(), switch the order of the platform
boot-config with the set_root_device() call. this avoids a
problem where "root=xxx" is checked after automated methods,
and is thus ignored.
- - in fdt_detect_root_device(), remove the code to add "root=xxx""
string to the boot_args[] that would be later parsed by the
set_root_device() call, and simply set booted_device and, for
mbr installs, booted_partition directly. also, for any
successful call, perform an early return.
- - define __HAVE_CPU_BOOTCONF so early boot calls cpu_bootconf().
tested on:
- - rockpro64 booting from emmc, sata (big, and little endian)
- - rockpro64 loading kernel from msdos partition
- - rockpro64 booting from network (fails to auto-detect, with or
without this change)
- - quartz64 booting from nvme
- - lx2k booting from nvme
Locate wedges as boot device and also match a partition GUID.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.18.1 src/sys/arch/evbarm/evbarm/autoconf.c
cvs rdiff -u -r1.99 -r1.99.2.1 src/sys/arch/evbarm/fdt/fdt_machdep.c
cvs rdiff -u -r1.15 -r1.15.16.1 src/sys/arch/evbarm/include/types.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/evbarm/evbarm/autoconf.c
diff -u src/sys/arch/evbarm/evbarm/autoconf.c:1.23 src/sys/arch/evbarm/evbarm/autoconf.c:1.23.18.1
--- src/sys/arch/evbarm/evbarm/autoconf.c:1.23 Sat Dec 19 21:54:00 2020
+++ src/sys/arch/evbarm/evbarm/autoconf.c Fri Oct 20 16:13:03 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.23 2020/12/19 21:54:00 mrg Exp $ */
+/* $NetBSD: autoconf.c,v 1.23.18.1 2023/10/20 16:13:03 martin Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.23 2020/12/19 21:54:00 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.23.18.1 2023/10/20 16:13:03 martin Exp $");
#include "opt_md.h"
#include "opt_ddb.h"
@@ -108,6 +108,9 @@ set_root_device(void)
char *ptr, *end, *buf;
size_t len;
+ if (booted_device)
+ return;
+
if (boot_args == NULL)
return;
@@ -118,7 +121,7 @@ set_root_device(void)
return;
/* NUL-terminate string, get_bootconf_option doesn't */
- for (end=ptr; *end != '\0'; ++end) {
+ for (end = ptr; *end != '\0'; ++end) {
if (*end == ' ' || *end == '\t') {
break;
}
@@ -144,16 +147,25 @@ set_root_device(void)
#endif
/*
- * Set up the root device from the boot args
+ * Set up the root device from the boot args.
+ *
+ * cpu_bootconf() is called before RAIDframe root detection,
+ * and cpu_rootconf() is called after.
*/
void
-cpu_rootconf(void)
+cpu_bootconf(void)
{
#ifndef MEMORY_DISK_IS_ROOT
+ set_root_device();
if (evbarm_cpu_rootconf)
(*evbarm_cpu_rootconf)();
- set_root_device();
#endif
+}
+
+void
+cpu_rootconf(void)
+{
+ cpu_bootconf();
aprint_normal("boot device: %s\n",
booted_device != NULL ? device_xname(booted_device) : "");
rootconf();
Index: src/sys/arch/evbarm/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.99 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.99.2.1
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.99 Fri Nov 4 10:51:17 2022
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c Fri Oct 20 16:13:04 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.99 2022/11/04 10:51:17 jmcneill Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.99.2.1 2023/10/20 16:13:04 martin Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.99 2022/11/04 10:51:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.99.2.1 2023/10/20 16:13:04 martin Exp $");
#include "opt_arm_debug.h"
#include "opt_bootconfig.h"
@@ -741,16 +741,7 @@ delay(u_int us)
static void
CVS commit: [netbsd-10] src/sys/arch/evbarm
Module Name:src Committed By: martin Date: Fri Oct 20 16:13:04 UTC 2023 Modified Files: src/sys/arch/evbarm/evbarm [netbsd-10]: autoconf.c src/sys/arch/evbarm/fdt [netbsd-10]: fdt_machdep.c src/sys/arch/evbarm/include [netbsd-10]: types.h Log Message: Pull up following revision(s) (requested by mrg in ticket #431): sys/arch/evbarm/evbarm/autoconf.c: revision 1.24 sys/arch/evbarm/include/types.h: revision 1.16 sys/arch/evbarm/fdt/fdt_machdep.c: revision 1.100 sys/arch/evbarm/fdt/fdt_machdep.c: revision 1.101 fix root detection on evbarm when raid is involved there are several problems solved in this change: - - lots of work was re-done when we already have determined the device booted from, so several new early returns introduced if booted_device has been set - - due to the lack of cpu_bootconf(), raidframe softroot would override "root=xxx" on the boot command line (note that platforms that use eg, device_register() to detect the boot device are not affected by this issue as they find the boot device much earlier.) - - in the new cpu_bootconf(), switch the order of the platform boot-config with the set_root_device() call. this avoids a problem where "root=xxx" is checked after automated methods, and is thus ignored. - - in fdt_detect_root_device(), remove the code to add "root=xxx"" string to the boot_args[] that would be later parsed by the set_root_device() call, and simply set booted_device and, for mbr installs, booted_partition directly. also, for any successful call, perform an early return. - - define __HAVE_CPU_BOOTCONF so early boot calls cpu_bootconf(). tested on: - - rockpro64 booting from emmc, sata (big, and little endian) - - rockpro64 loading kernel from msdos partition - - rockpro64 booting from network (fails to auto-detect, with or without this change) - - quartz64 booting from nvme - - lx2k booting from nvme Locate wedges as boot device and also match a partition GUID. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.23.18.1 src/sys/arch/evbarm/evbarm/autoconf.c cvs rdiff -u -r1.99 -r1.99.2.1 src/sys/arch/evbarm/fdt/fdt_machdep.c cvs rdiff -u -r1.15 -r1.15.16.1 src/sys/arch/evbarm/include/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/evbarm/conf
Module Name:src
Committed By: martin
Date: Fri Jul 7 19:00:24 UTC 2023
Modified Files:
src/sys/arch/evbarm/conf [netbsd-10]: std.generic
Log Message:
Pull up following revision(s) (requested by jakllsch in ticket #227):
sys/arch/evbarm/conf/std.generic: revision 1.11
Enable MEMORY_DISK_DYNAMIC & co. to match std.generic64
Allows loading of ramdisk.fs via u-boot initrd (to run sysinst)
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.4.1 src/sys/arch/evbarm/conf/std.generic
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/std.generic
diff -u src/sys/arch/evbarm/conf/std.generic:1.10 src/sys/arch/evbarm/conf/std.generic:1.10.4.1
--- src/sys/arch/evbarm/conf/std.generic:1.10 Fri Sep 3 21:58:36 2021
+++ src/sys/arch/evbarm/conf/std.generic Fri Jul 7 19:00:24 2023
@@ -1,4 +1,4 @@
-# $NetBSD: std.generic,v 1.10 2021/09/03 21:58:36 andvar Exp $
+# $NetBSD: std.generic,v 1.10.4.1 2023/07/07 19:00:24 martin Exp $
#
# generic NetBSD/evbarm with FDT support
@@ -34,6 +34,11 @@ options __HAVE_PCI_MSI_MSIX
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.generic"
+# initrd support
+options MEMORY_DISK_HOOKS
+options MEMORY_DISK_DYNAMIC
+pseudo-device md
+
# Prevent the addition of a command line -DKERNEL_BASE_VOFFSET= as it
# is done at runtime.
makeoptions KERNEL_VOFFSET_RUNTIME=1
CVS commit: [netbsd-10] src/sys/arch/evbarm/conf
Module Name:src Committed By: martin Date: Fri Jul 7 19:00:24 UTC 2023 Modified Files: src/sys/arch/evbarm/conf [netbsd-10]: std.generic Log Message: Pull up following revision(s) (requested by jakllsch in ticket #227): sys/arch/evbarm/conf/std.generic: revision 1.11 Enable MEMORY_DISK_DYNAMIC & co. to match std.generic64 Allows loading of ramdisk.fs via u-boot initrd (to run sysinst) To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.10.4.1 src/sys/arch/evbarm/conf/std.generic Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/evbarm/conf
Module Name:src Committed By: martin Date: Wed Feb 8 16:38:01 UTC 2023 Modified Files: src/sys/arch/evbarm/conf [netbsd-10]: GENERIC.common Log Message: Pull up following revision(s) (requested by simonb in ticket #70): sys/arch/evbarm/conf/GENERIC.common: revision 1.51 Enable UFS_DIRHASH (missed with previous change) and UFS_EXTATTR (mistakenly commented out with previous change). To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.50.4.1 src/sys/arch/evbarm/conf/GENERIC.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/evbarm/conf
Module Name:src Committed By: martin Date: Wed Feb 8 16:38:01 UTC 2023 Modified Files: src/sys/arch/evbarm/conf [netbsd-10]: GENERIC.common Log Message: Pull up following revision(s) (requested by simonb in ticket #70): sys/arch/evbarm/conf/GENERIC.common: revision 1.51 Enable UFS_DIRHASH (missed with previous change) and UFS_EXTATTR (mistakenly commented out with previous change). To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.50.4.1 src/sys/arch/evbarm/conf/GENERIC.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/GENERIC.common diff -u src/sys/arch/evbarm/conf/GENERIC.common:1.50 src/sys/arch/evbarm/conf/GENERIC.common:1.50.4.1 --- src/sys/arch/evbarm/conf/GENERIC.common:1.50 Thu Sep 29 10:10:06 2022 +++ src/sys/arch/evbarm/conf/GENERIC.common Wed Feb 8 16:38:01 2023 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC.common,v 1.50 2022/09/29 10:10:06 riastradh Exp $ +# $NetBSD: GENERIC.common,v 1.50.4.1 2023/02/08 16:38:01 martin Exp $ # # GENERIC evbarm kernel config (template) # @@ -26,14 +26,21 @@ no file-system CODA no pseudo-device vcoda # File system options +# ffs options FFS_EI # FFS Endian Independent support #options FFS_NO_SNAPSHOT # No FFS snapshot support options QUOTA # legacy UFS quotas options QUOTA2 # new, in-filesystem UFS quotas options UFS_ACL # UFS Access Control Lists -#options UFS_DIRHASH # UFS Large Directory Hashing -#options UFS_EXTATTR # Extended attribute support for UFS1 +options UFS_DIRHASH # UFS Large Directory Hashing +options UFS_EXTATTR # Extended attribute support for UFS1 options WAPBL # File system journaling support +# lfs +#options LFS_DIRHASH # LFS version of UFS_DIRHASH +# ext2fs +#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and +# immutable) behave as system flags. +# other options DISKLABEL_EI # disklabel Endian Independent support options NFSSERVER # Network File System server
CVS commit: [netbsd-10] src/sys/arch/evbarm/conf
Module Name:src Committed By: martin Date: Mon Dec 26 11:20:59 UTC 2022 Modified Files: src/sys/arch/evbarm/conf [netbsd-10]: GENERIC64 Log Message: Pull up following revision(s) (requested by nia in ticket #23): sys/arch/evbarm/conf/GENERIC64: revision 1.207 PR port-arm/57044 allow vcaudio on RPI 4 to attach when booting with EFI To generate a diff of this commit: cvs rdiff -u -r1.206 -r1.206.2.1 src/sys/arch/evbarm/conf/GENERIC64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/evbarm/conf
Module Name:src Committed By: martin Date: Mon Dec 26 11:20:59 UTC 2022 Modified Files: src/sys/arch/evbarm/conf [netbsd-10]: GENERIC64 Log Message: Pull up following revision(s) (requested by nia in ticket #23): sys/arch/evbarm/conf/GENERIC64: revision 1.207 PR port-arm/57044 allow vcaudio on RPI 4 to attach when booting with EFI To generate a diff of this commit: cvs rdiff -u -r1.206 -r1.206.2.1 src/sys/arch/evbarm/conf/GENERIC64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/GENERIC64 diff -u src/sys/arch/evbarm/conf/GENERIC64:1.206 src/sys/arch/evbarm/conf/GENERIC64:1.206.2.1 --- src/sys/arch/evbarm/conf/GENERIC64:1.206 Sat Oct 29 13:59:57 2022 +++ src/sys/arch/evbarm/conf/GENERIC64 Mon Dec 26 11:20:59 2022 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC64,v 1.206 2022/10/29 13:59:57 jmcneill Exp $ +# $NetBSD: GENERIC64,v 1.206.2.1 2022/12/26 11:20:59 martin Exp $ # # GENERIC ARM (aarch64) kernel # @@ -431,8 +431,9 @@ m25p* at spi? spiflash* at spiflashbus? # Broadcom VCHIQ, etc -vchiq0 at fdt? -vcaudio0 at vchiq0 +vchiq* at fdt? +vchiq* at acpi? +vcaudio0 at vchiq? # Audio support hdaudio* at fdt? # Intel HDA
