CVS commit: src/sys/arch/evbarm
Module Name:src Committed By: andvar Date: Wed Mar 6 20:18:42 UTC 2024 Modified Files: src/sys/arch/evbarm/mini2440: mini2440_lcd.c src/sys/arch/evbarm/smdk2xx0: smdk2410_lcd.c Log Message: s/horizontaol/horizontal/ in comments. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/mini2440/mini2440_lcd.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm
Module Name:src Committed By: andvar Date: Wed Mar 6 20:18:42 UTC 2024 Modified Files: src/sys/arch/evbarm/mini2440: mini2440_lcd.c src/sys/arch/evbarm/smdk2xx0: smdk2410_lcd.c Log Message: s/horizontaol/horizontal/ in comments. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/mini2440/mini2440_lcd.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.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/mini2440/mini2440_lcd.c diff -u src/sys/arch/evbarm/mini2440/mini2440_lcd.c:1.7 src/sys/arch/evbarm/mini2440/mini2440_lcd.c:1.8 --- src/sys/arch/evbarm/mini2440/mini2440_lcd.c:1.7 Wed Dec 20 13:55:18 2023 +++ src/sys/arch/evbarm/mini2440/mini2440_lcd.c Wed Mar 6 20:18:42 2024 @@ -59,7 +59,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mini2440_lcd.c,v 1.7 2023/12/20 13:55:18 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mini2440_lcd.c,v 1.8 2024/03/06 20:18:42 andvar Exp $"); /* * LCD driver for FriendlyARM MINI2440. @@ -237,7 +237,7 @@ static const struct s3c24x0_lcd_panel_in _(LCDCON3_HFPD, 2) | /*21*/ _(LCDCON3_HOZVAL, 240), -/* LCDCON4: horizontaol pulse width */ +/* LCDCON4: horizontal pulse width */ _(LCDCON4_HPSW, 6), /* 6 */ /* LCDCON5: signal polarities */ Index: src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c diff -u src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c:1.13 src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c:1.14 --- src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c:1.13 Wed Dec 20 13:55:18 2023 +++ src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c Wed Mar 6 20:18:42 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: smdk2410_lcd.c,v 1.13 2023/12/20 13:55:18 thorpej Exp $ */ +/* $NetBSD: smdk2410_lcd.c,v 1.14 2024/03/06 20:18:42 andvar Exp $ */ /* * Copyright (c) 2004 Genetec Corporation. All rights reserved. @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: smdk2410_lcd.c,v 1.13 2023/12/20 13:55:18 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: smdk2410_lcd.c,v 1.14 2024/03/06 20:18:42 andvar Exp $"); /* * LCD driver for Samsung SMDK2410. @@ -209,7 +209,7 @@ static const struct s3c24x0_lcd_panel_in _(LCDCON3_HBPD, 7) | _(LCDCON3_HFPD, 3), -/* LCDCON4: horizontaol pulse width */ +/* LCDCON4: horizontal pulse width */ _(LCDCON4_HPSW, 4), /* LCDCON5: signal polarities */
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: skrll Date: Sun Feb 25 14:19:08 UTC 2024 Modified Files: src/sys/arch/evbarm/conf: std.bcm53xx Log Message: Add ARM_HAS_VBAR To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 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.21 src/sys/arch/evbarm/conf/std.bcm53xx:1.22 --- src/sys/arch/evbarm/conf/std.bcm53xx:1.21 Tue Feb 13 19:07:42 2024 +++ src/sys/arch/evbarm/conf/std.bcm53xx Sun Feb 25 14:19:08 2024 @@ -1,4 +1,4 @@ -# $NetBSD: std.bcm53xx,v 1.21 2024/02/13 19:07:42 skrll Exp $ +# $NetBSD: std.bcm53xx,v 1.22 2024/02/25 14:19:08 skrll 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: src/sys/arch/evbarm/conf
Module Name:src Committed By: skrll Date: Sun Feb 25 14:19:08 UTC 2024 Modified Files: src/sys/arch/evbarm/conf: std.bcm53xx Log Message: Add ARM_HAS_VBAR To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 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: src/sys/arch/evbarm/conf
Module Name:src Committed By: andvar Date: Sat Feb 24 08:56:07 UTC 2024 Modified Files: src/sys/arch/evbarm/conf: README.evbarm Log Message: Remove OMAP5EVM kernel config from README.evbarm, it was retired a while ago. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbarm/conf/README.evbarm 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/README.evbarm diff -u src/sys/arch/evbarm/conf/README.evbarm:1.39 src/sys/arch/evbarm/conf/README.evbarm:1.40 --- src/sys/arch/evbarm/conf/README.evbarm:1.39 Sat Oct 29 13:24:35 2022 +++ src/sys/arch/evbarm/conf/README.evbarm Sat Feb 24 08:56:07 2024 @@ -1,4 +1,4 @@ -$NetBSD: README.evbarm,v 1.39 2022/10/29 13:24:35 jmcneill Exp $ +$NetBSD: README.evbarm,v 1.40 2024/02/24 08:56:07 andvar Exp $ config date boards --- @@ -39,7 +39,6 @@ MV2120 2011/07/20 HP Media Vault MV2011 NAPPI 2002/07/15 Netwise APlication Platform Board NETWALKER 2010/11/13 Sharp NetWalker NSLU2 2006/02/28 Linksys NSLU2 (a.k.a. "Slug") -OMAP5EVM 2013/07/16 TI OMAP 5 based boards OPENBLOCKS_A6 2012/08/01 Plat'Home. OpenBlockS A6 OPENBLOCKS_AX3 2013/09/30 Plat'Home. OpenBlockS AX3 OPENRD 2012/08/10 open-rd.org Marvell Orion board
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: andvar Date: Sat Feb 24 08:56:07 UTC 2024 Modified Files: src/sys/arch/evbarm/conf: README.evbarm Log Message: Remove OMAP5EVM kernel config from README.evbarm, it was retired a while ago. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbarm/conf/README.evbarm Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm
Module Name:src Committed By: andvar Date: Thu Feb 22 23:16:10 UTC 2024 Modified Files: src/sys/arch/evbarm/kobo: kobo_usb.c src/sys/arch/evbarm/netwalker: netwalker_usb.c Log Message: 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. Needs pullup to netbsd-10. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/kobo/kobo_usb.c cvs rdiff -u -r1.8 -r1.9 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: src/sys/arch/evbarm
Module Name:src
Committed By: andvar
Date: Thu Feb 22 23:16:10 UTC 2024
Modified Files:
src/sys/arch/evbarm/kobo: kobo_usb.c
src/sys/arch/evbarm/netwalker: netwalker_usb.c
Log Message:
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.
Needs pullup to netbsd-10.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/kobo/kobo_usb.c
cvs rdiff -u -r1.8 -r1.9 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.4
--- 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 Thu Feb 22 23:16:10 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.4 2024/02/22 23:16:10 andvar 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.4 2024/02/22 23:16:10 andvar 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.9
--- 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 Thu Feb 22 23:16:10 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.9 2024/02/22 23:16:10 andvar 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: src/sys/arch/evbarm/conf
Module Name:src
Committed By: christos
Date: Sat Feb 17 15:08:32 UTC 2024
Modified Files:
src/sys/arch/evbarm/conf: mk.altera mk.bcm53xx mk.generic mk.generic64
mk.gumstix mk.integrator_cp mk.kobo mk.marvell mk.mv2120 mk.ti
Log Message:
Fix MKREPRO build (Jan-Benedict Glaw)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/mk.altera
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/mk.bcm53xx \
src/sys/arch/evbarm/conf/mk.generic64
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/mk.generic
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/mk.gumstix
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/mk.integrator_cp
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/mk.kobo \
src/sys/arch/evbarm/conf/mk.mv2120
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/mk.marvell
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/mk.ti
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/mk.altera
diff -u src/sys/arch/evbarm/conf/mk.altera:1.3 src/sys/arch/evbarm/conf/mk.altera:1.4
--- src/sys/arch/evbarm/conf/mk.altera:1.3 Thu Oct 18 05:01:54 2018
+++ src/sys/arch/evbarm/conf/mk.altera Sat Feb 17 10:08:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mk.altera,v 1.3 2018/10/18 09:01:54 skrll Exp $
+# $NetBSD: mk.altera,v 1.4 2024/02/17 15:08:32 christos Exp $
.if !empty(MACHINE_ARCH:M*eb)
EXTRA_LINKFLAGS+= --be8
@@ -14,6 +14,9 @@ _OSRELEASE!= ${HOST_SH} $S/conf/osrelea
MKUBOOTIMAGEARGS= -A arm -T kernel -O linux
MKUBOOTIMAGEARGS+= -a $(KERNEL_BASE_PHYS) -e $(KERNEL_BASE_PHYS)
MKUBOOTIMAGEARGS+= -n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MKUBOOTIMAGEARGS+= -t "${MKREPRO_TIMESTAMP}"
+.endif
MKUBOOTIMAGEARGS_NONE= ${MKUBOOTIMAGEARGS} -C none
MKUBOOTIMAGEARGS_GZ= ${MKUBOOTIMAGEARGS} -C gz
Index: src/sys/arch/evbarm/conf/mk.bcm53xx
diff -u src/sys/arch/evbarm/conf/mk.bcm53xx:1.6 src/sys/arch/evbarm/conf/mk.bcm53xx:1.7
--- src/sys/arch/evbarm/conf/mk.bcm53xx:1.6 Mon Jan 21 02:26:14 2019
+++ src/sys/arch/evbarm/conf/mk.bcm53xx Sat Feb 17 10:08:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mk.bcm53xx,v 1.6 2019/01/21 07:26:14 skrll Exp $
+# $NetBSD: mk.bcm53xx,v 1.7 2024/02/17 15:08:32 christos Exp $
CPPFLAGS+= -mcpu=cortex-a9 -mfpu=neon
.if !empty(MACHINE_ARCH:M*eb)
@@ -13,6 +13,9 @@ _OSRELEASE!= ${HOST_SH} $S/conf/osrelea
MKUBOOTIMAGEARGS= -A arm -T kernel -O linux
MKUBOOTIMAGEARGS+= -a $(LOADADDRESS) -e $(LOADADDRESS)
MKUBOOTIMAGEARGS+= -n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MKUBOOTIMAGEARGS+= -t "${MKREPRO_TIMESTAMP}"
+.endif
MKUBOOTIMAGEARGS_NONE= ${MKUBOOTIMAGEARGS} -C none
MKUBOOTIMAGEARGS_GZ= ${MKUBOOTIMAGEARGS} -C gz
Index: src/sys/arch/evbarm/conf/mk.generic64
diff -u src/sys/arch/evbarm/conf/mk.generic64:1.6 src/sys/arch/evbarm/conf/mk.generic64:1.7
--- src/sys/arch/evbarm/conf/mk.generic64:1.6 Thu Sep 3 22:21:49 2020
+++ src/sys/arch/evbarm/conf/mk.generic64 Sat Feb 17 10:08:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mk.generic64,v 1.6 2020/09/04 02:21:49 jakllsch Exp $
+# $NetBSD: mk.generic64,v 1.7 2024/02/17 15:08:32 christos Exp $
.if !empty(MACHINE_ARCH:M*eb)
EXTRA_LINKFLAGS+= -EB
@@ -12,6 +12,9 @@ _OSRELEASE!= ${HOST_SH} $S/conf/osrelea
BOARDTYPE= evbarm64
MKUBOOTIMAGEARGS= -f arm64 -u -a 0x20
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MKUBOOTIMAGEARGS+= -t "${MKREPRO_TIMESTAMP}"
+.endif
SYSTEM_LD_TAIL_EXTRA+= && \
echo ${OBJCOPY} -S -O binary $@ $@.bin && \
Index: src/sys/arch/evbarm/conf/mk.generic
diff -u src/sys/arch/evbarm/conf/mk.generic:1.10 src/sys/arch/evbarm/conf/mk.generic:1.11
--- src/sys/arch/evbarm/conf/mk.generic:1.10 Sat Aug 29 15:06:18 2020
+++ src/sys/arch/evbarm/conf/mk.generic Sat Feb 17 10:08:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mk.generic,v 1.10 2020/08/29 19:06:18 jakllsch Exp $
+# $NetBSD: mk.generic,v 1.11 2024/02/17 15:08:32 christos Exp $
.if !empty(MACHINE_ARCH:M*eb)
EXTRA_LINKFLAGS+= --be8
@@ -14,6 +14,9 @@ _OSRELEASE!= ${HOST_SH} $S/conf/osrelea
MKUBOOTIMAGEARGS= -A arm -T kernel_noload -O linux -C none
MKUBOOTIMAGEARGS+= -e 0
MKUBOOTIMAGEARGS+= -n "NetBSD/${BOARDTYPE:U${MACHINE_ARCH}} ${_OSRELEASE}"
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MKUBOOTIMAGEARGS+= -t "${MKREPRO_TIMESTAMP}"
+.endif
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${OBJCOPY} -S -O binary $@ $@.img; \
Index: src/sys/arch/evbarm/conf/mk.gumstix
diff -u src/sys/arch/evbarm/conf/mk.gumstix:1.7 src/sys/arch/evbarm/conf/mk.gumstix:1.8
--- src/sys/arch/evbarm/conf/mk.gumstix:1.7 Sat May 18 04:49:23 2019
+++ src/sys/arch/evbarm/conf/mk.gumstix Sat Feb 17 10:08:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mk.gumstix,v 1.7 2019/05/18 08:49:23 skrll Exp $
+# $NetBSD: mk.gumstix,v 1.8 2024/02/17 15:08:32 christos Exp $
.if ${BOARDTYPE} == "gumstix"
SYSTEM_FIRST_OBJ= gumstix_start.o
@@ -21,6 +21,9 @@ KERNEL_BASE_VIRT=$(LOADADDRESS)
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: christos Date: Sat Feb 17 15:08:32 UTC 2024 Modified Files: src/sys/arch/evbarm/conf: mk.altera mk.bcm53xx mk.generic mk.generic64 mk.gumstix mk.integrator_cp mk.kobo mk.marvell mk.mv2120 mk.ti Log Message: Fix MKREPRO build (Jan-Benedict Glaw) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/mk.altera cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/mk.bcm53xx \ src/sys/arch/evbarm/conf/mk.generic64 cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/mk.generic cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/mk.gumstix cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/mk.integrator_cp cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/mk.kobo \ src/sys/arch/evbarm/conf/mk.mv2120 cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/mk.marvell cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/mk.ti Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src
Committed By: skrll
Date: Tue Feb 13 19:07:42 UTC 2024
Modified Files:
src/sys/arch/evbarm/conf: std.bcm53xx
Log Message:
Define KERNEL_VOFFSET_RUNTIME=1 to fix build of BCM5301X and BCM56340
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 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 src/sys/arch/evbarm/conf/std.bcm53xx:1.21
--- src/sys/arch/evbarm/conf/std.bcm53xx:1.20 Sat May 18 08:49:23 2019
+++ src/sys/arch/evbarm/conf/std.bcm53xx Tue Feb 13 19:07:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: std.bcm53xx,v 1.20 2019/05/18 08:49:23 skrll Exp $
+# $NetBSD: std.bcm53xx,v 1.21 2024/02/13 19:07:42 skrll Exp $
#
# standard NetBSD/evbarm for BCM5301X options
@@ -28,5 +28,10 @@ options __HAVE_PCI_CONF_HOOK
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.bcm53xx"
makeoptions BOARDTYPE="bcm53xx"
+
+# Prevent the addition of a command line -DKERNEL_BASE_VOFFSET= as it
+# is done at runtime.
+makeoptions KERNEL_VOFFSET_RUNTIME=1
+
makeoptions KERNEL_BASE_VIRT="0x8010"
makeoptions LOADADDRESS="0x0010"
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: skrll Date: Tue Feb 13 19:07:42 UTC 2024 Modified Files: src/sys/arch/evbarm/conf: std.bcm53xx Log Message: Define KERNEL_VOFFSET_RUNTIME=1 to fix build of BCM5301X and BCM56340 To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 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: src/sys/arch/evbarm/conf
Module Name:src Committed By: andvar Date: Sun Jan 14 10:35:26 UTC 2024 Modified Files: src/sys/arch/evbarm/conf: CUBOX Log Message: Comment out sequencer pseudo-device, it requires midi* or audio* device defined. Fixes build for CUBOX kernel config. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/conf/CUBOX Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: andvar Date: Sun Jan 14 10:35:26 UTC 2024 Modified Files: src/sys/arch/evbarm/conf: CUBOX Log Message: Comment out sequencer pseudo-device, it requires midi* or audio* device defined. Fixes build for CUBOX kernel config. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/conf/CUBOX 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/CUBOX diff -u src/sys/arch/evbarm/conf/CUBOX:1.21 src/sys/arch/evbarm/conf/CUBOX:1.22 --- src/sys/arch/evbarm/conf/CUBOX:1.21 Sun Aug 7 02:52:25 2022 +++ src/sys/arch/evbarm/conf/CUBOX Sun Jan 14 10:35:26 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CUBOX,v 1.21 2022/08/07 02:52:25 simonb Exp $ +# $NetBSD: CUBOX,v 1.22 2024/01/14 10:35:26 andvar Exp $ # # CUBOX -- SolidRun Ltd. Cubox kernel # @@ -344,7 +344,7 @@ pseudo-device accf_http # "httpready" a # miscellaneous pseudo-devices pseudo-device pty # pseudo-terminals -pseudo-device sequencer # MIDI sequencer +#pseudo-device sequencer # MIDI sequencer #options RND_COM # use "com" randomness as well (BROKEN) pseudo-device clockctl # user control of clock subsystem pseudo-device ksyms # /dev/ksyms
CVS commit: src/sys/arch/evbarm
Module Name:src
Committed By: andvar
Date: Tue Dec 26 09:56:45 UTC 2023
Modified Files:
src/sys/arch/evbarm/adi_brh: brh_machdep.c
src/sys/arch/evbarm/armadillo: armadillo9_machdep.c
Log Message:
Replace %ld/%lx format specifiers with PRIx{SIZE,ADDR} for better portability.
>From Nick Hudson.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/evbarm/adi_brh/brh_machdep.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/adi_brh/brh_machdep.c
diff -u src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.54 src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.55
--- src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.54 Sat Dec 23 23:00:09 2023
+++ src/sys/arch/evbarm/adi_brh/brh_machdep.c Tue Dec 26 09:56:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: brh_machdep.c,v 1.54 2023/12/23 23:00:09 andvar Exp $ */
+/* $NetBSD: brh_machdep.c,v 1.55 2023/12/26 09:56:45 andvar Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.54 2023/12/23 23:00:09 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.55 2023/12/26 09:56:45 andvar Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -407,8 +407,9 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
/* Tell the user about the memory */
- printf("physmemory: %ld pages at 0x%08lx -> 0x%08lx\n", physmem,
- physical_start, physical_end - 1);
+ printf("physmemory: %"PRIxPSIZE" pages at "
+ "0x%08"PRIxPADDR" -> 0x%08"PRIxPADDR"\n",
+ physmem, physical_start, physical_end - 1);
#endif
/*
Index: src/sys/arch/evbarm/armadillo/armadillo9_machdep.c
diff -u src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.39 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.40
--- src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.39 Sun Dec 24 11:42:35 2023
+++ src/sys/arch/evbarm/armadillo/armadillo9_machdep.c Tue Dec 26 09:56:44 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: armadillo9_machdep.c,v 1.39 2023/12/24 11:42:35 andvar Exp $ */
+/* $NetBSD: armadillo9_machdep.c,v 1.40 2023/12/26 09:56:44 andvar Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -110,7 +110,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.39 2023/12/24 11:42:35 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.40 2023/12/26 09:56:44 andvar Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -544,8 +544,9 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
/* Tell the user about the memory */
- printf("physmemory: %ld pages at 0x%08lx -> 0x%08lx\n", physmem,
- physical_start, physical_end - 1);
+ printf("physmemory: %"PRIxPSIZE" pages at "
+ "0x%08"PRIxPADDR" -> 0x%08"PRIxPADDR"\n",
+ physmem, physical_start, physical_end - 1);
#endif
/*
CVS commit: src/sys/arch/evbarm
Module Name:src
Committed By: andvar
Date: Tue Dec 26 09:56:45 UTC 2023
Modified Files:
src/sys/arch/evbarm/adi_brh: brh_machdep.c
src/sys/arch/evbarm/armadillo: armadillo9_machdep.c
Log Message:
Replace %ld/%lx format specifiers with PRIx{SIZE,ADDR} for better portability.
>From Nick Hudson.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/evbarm/adi_brh/brh_machdep.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/armadillo
Module Name:src Committed By: andvar Date: Sun Dec 24 11:42:35 UTC 2023 Modified Files: src/sys/arch/evbarm/armadillo: armadillo9_machdep.c Log Message: Use %ld format specifier for physmem to fix VERBOSE_INIT_ARM build option. Use epcom_kgdb_attach() instead of com_kgdb_attach() to fix KGDB build option. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/armadillo
Module Name:src
Committed By: andvar
Date: Sun Dec 24 11:42:35 UTC 2023
Modified Files:
src/sys/arch/evbarm/armadillo: armadillo9_machdep.c
Log Message:
Use %ld format specifier for physmem to fix VERBOSE_INIT_ARM build option.
Use epcom_kgdb_attach() instead of com_kgdb_attach() to fix KGDB build option.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/armadillo/armadillo9_machdep.c
diff -u src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.38 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.39
--- src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.38 Sun Jul 3 19:58:42 2022
+++ src/sys/arch/evbarm/armadillo/armadillo9_machdep.c Sun Dec 24 11:42:35 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: armadillo9_machdep.c,v 1.38 2022/07/03 19:58:42 andvar Exp $ */
+/* $NetBSD: armadillo9_machdep.c,v 1.39 2023/12/24 11:42:35 andvar Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -110,7 +110,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.38 2022/07/03 19:58:42 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.39 2023/12/24 11:42:35 andvar Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -544,7 +544,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
/* Tell the user about the memory */
- printf("physmemory: %d pages at 0x%08lx -> 0x%08lx\n", physmem,
+ printf("physmemory: %ld pages at 0x%08lx -> 0x%08lx\n", physmem,
physical_start, physical_end - 1);
#endif
@@ -903,7 +903,7 @@ consinit(void)
#if KGDB
#if NEPCOM > 0
if (strcmp(kgdb_devname, "epcom") == 0) {
- com_kgdb_attach(_bs_tag, kgdb_devaddr, kgdb_devrate,
+ epcom_kgdb_attach(_bs_tag, kgdb_devaddr, kgdb_devrate,
kgdb_devmode);
}
#endif /* NEPCOM > 0 */
CVS commit: src/sys/arch/evbarm/adi_brh
Module Name:src Committed By: andvar Date: Sat Dec 23 23:00:09 UTC 2023 Modified Files: src/sys/arch/evbarm/adi_brh: brh_machdep.c Log Message: Fix physmem printf format specifier %d->%ld. Fixes VERBOSE_INIT_ARM enabled build for ADI_BRH kernel config. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/arch/evbarm/adi_brh/brh_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/adi_brh
Module Name:src
Committed By: andvar
Date: Sat Dec 23 23:00:09 UTC 2023
Modified Files:
src/sys/arch/evbarm/adi_brh: brh_machdep.c
Log Message:
Fix physmem printf format specifier %d->%ld.
Fixes VERBOSE_INIT_ARM enabled build for ADI_BRH kernel config.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/evbarm/adi_brh/brh_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/adi_brh/brh_machdep.c
diff -u src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.53 src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.54
--- src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.53 Thu Oct 12 11:33:37 2023
+++ src/sys/arch/evbarm/adi_brh/brh_machdep.c Sat Dec 23 23:00:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: brh_machdep.c,v 1.53 2023/10/12 11:33:37 skrll Exp $ */
+/* $NetBSD: brh_machdep.c,v 1.54 2023/12/23 23:00:09 andvar Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.53 2023/10/12 11:33:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.54 2023/12/23 23:00:09 andvar Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -407,7 +407,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
/* Tell the user about the memory */
- printf("physmemory: %d pages at 0x%08lx -> 0x%08lx\n", physmem,
+ printf("physmemory: %ld pages at 0x%08lx -> 0x%08lx\n", physmem,
physical_start, physical_end - 1);
#endif
CVS commit: src/sys/arch/evbarm
Module Name:src Committed By: thorpej Date: Wed Dec 20 13:55:19 UTC 2023 Modified Files: src/sys/arch/evbarm/armadillo: armadillo9_com.c src/sys/arch/evbarm/g42xxeb: g42xxeb_kmkbd.c g42xxeb_lcd.c gb225_pcic.c src/sys/arch/evbarm/gumstix: gxlcd.c gxpcic.c src/sys/arch/evbarm/hdl_g: btn_obio.c src/sys/arch/evbarm/ifpga: ifpga_pci.c src/sys/arch/evbarm/integrator: int_bus_dma.c src/sys/arch/evbarm/iq31244: wdc_obio.c src/sys/arch/evbarm/ixm1200: ixpcom_ixm.c src/sys/arch/evbarm/iyonix: autoconf.c src/sys/arch/evbarm/lubbock: lubbock_lcd.c lubbock_pcic.c src/sys/arch/evbarm/mini2440: audio_mini2440.c mini2440_lcd.c src/sys/arch/evbarm/mpcsa: mpcsa_leds.c src/sys/arch/evbarm/smdk2xx0: smdk2410_lcd.c src/sys/arch/evbarm/tsarm: epcom_ts.c tspld.c wdc_ts.c src/sys/arch/evbarm/tsarm/isa: isa_io.c isa_machdep.c Log Message: Remove unnecessary . To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/armadillo/armadillo9_com.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/g42xxeb/gb225_pcic.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/gumstix/gxlcd.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/gumstix/gxpcic.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/hdl_g/btn_obio.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/ifpga/ifpga_pci.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/integrator/int_bus_dma.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/iq31244/wdc_obio.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/ixm1200/ixpcom_ixm.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/iyonix/autoconf.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/lubbock/lubbock_lcd.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/lubbock/lubbock_pcic.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/mini2440/audio_mini2440.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/mini2440/mini2440_lcd.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/mpcsa/mpcsa_leds.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/tsarm/epcom_ts.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/tsarm/tspld.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/tsarm/wdc_ts.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/tsarm/isa/isa_io.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/tsarm/isa/isa_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/armadillo/armadillo9_com.c diff -u src/sys/arch/evbarm/armadillo/armadillo9_com.c:1.6 src/sys/arch/evbarm/armadillo/armadillo9_com.c:1.7 --- src/sys/arch/evbarm/armadillo/armadillo9_com.c:1.6 Mon Nov 12 18:00:38 2012 +++ src/sys/arch/evbarm/armadillo/armadillo9_com.c Wed Dec 20 13:55:17 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: armadillo9_com.c,v 1.6 2012/11/12 18:00:38 skrll Exp $ */ +/* $NetBSD: armadillo9_com.c,v 1.7 2023/12/20 13:55:17 thorpej Exp $ */ /* * Copyright (c) 2002 * Ichiro FUKUHARA . @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: armadillo9_com.c,v 1.6 2012/11/12 18:00:38 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: armadillo9_com.c,v 1.7 2023/12/20 13:55:17 thorpej Exp $"); /* Front-end of epcom */ @@ -35,7 +35,6 @@ __KERNEL_RCSID(0, "$NetBSD: armadillo9_c #include #include #include -#include #include Index: src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c:1.16 src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c:1.17 --- src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c:1.16 Sat Aug 7 16:18:49 2021 +++ src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c Wed Dec 20 13:55:17 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: g42xxeb_kmkbd.c,v 1.16 2021/08/07 16:18:49 thorpej Exp $ */ +/* $NetBSD: g42xxeb_kmkbd.c,v 1.17 2023/12/20 13:55:17 thorpej Exp $ */ /*- * Copyright (c) 2002, 2003, 2005 Genetec corp. @@ -37,12 +37,11 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: g42xxeb_kmkbd.c,v 1.16 2021/08/07 16:18:49 thorpej Exp $" ); +__KERNEL_RCSID(0, "$NetBSD: g42xxeb_kmkbd.c,v 1.17 2023/12/20 13:55:17 thorpej Exp $" ); #include #include #include -#include #include #include #include /* for hz */ Index: src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c:1.18 src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c:1.19 --- src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c:1.18 Sat Aug 7 16:18:49 2021 +++ src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c Wed Dec 20 13:55:17 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: g42xxeb_lcd.c,v 1.18 2021/08/07 16:18:49 thorpej Exp $ */ +/* $NetBSD: g42xxeb_lcd.c,v 1.19 2023/12/20 13:55:17 thorpej Exp $ */ /*- * Copyright (c) 2001, 2002, 2005 Genetec corp. @@ -37,7 +37,6 @@ #include #include #include -#include
CVS commit: src/sys/arch/evbarm
Module Name:src Committed By: thorpej Date: Wed Dec 20 13:55:19 UTC 2023 Modified Files: src/sys/arch/evbarm/armadillo: armadillo9_com.c src/sys/arch/evbarm/g42xxeb: g42xxeb_kmkbd.c g42xxeb_lcd.c gb225_pcic.c src/sys/arch/evbarm/gumstix: gxlcd.c gxpcic.c src/sys/arch/evbarm/hdl_g: btn_obio.c src/sys/arch/evbarm/ifpga: ifpga_pci.c src/sys/arch/evbarm/integrator: int_bus_dma.c src/sys/arch/evbarm/iq31244: wdc_obio.c src/sys/arch/evbarm/ixm1200: ixpcom_ixm.c src/sys/arch/evbarm/iyonix: autoconf.c src/sys/arch/evbarm/lubbock: lubbock_lcd.c lubbock_pcic.c src/sys/arch/evbarm/mini2440: audio_mini2440.c mini2440_lcd.c src/sys/arch/evbarm/mpcsa: mpcsa_leds.c src/sys/arch/evbarm/smdk2xx0: smdk2410_lcd.c src/sys/arch/evbarm/tsarm: epcom_ts.c tspld.c wdc_ts.c src/sys/arch/evbarm/tsarm/isa: isa_io.c isa_machdep.c Log Message: Remove unnecessary . To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/armadillo/armadillo9_com.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/g42xxeb/gb225_pcic.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/gumstix/gxlcd.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/gumstix/gxpcic.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/hdl_g/btn_obio.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/ifpga/ifpga_pci.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/integrator/int_bus_dma.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/iq31244/wdc_obio.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/ixm1200/ixpcom_ixm.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/iyonix/autoconf.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/lubbock/lubbock_lcd.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/lubbock/lubbock_pcic.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/mini2440/audio_mini2440.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/mini2440/mini2440_lcd.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/mpcsa/mpcsa_leds.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/tsarm/epcom_ts.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/tsarm/tspld.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/tsarm/wdc_ts.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/tsarm/isa/isa_io.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/tsarm/isa/isa_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/evbarm
Module Name:src Committed By: mrg Date: Sat Oct 28 17:53:06 UTC 2023 Modified Files: src/sys/arch/evbarm/evbarm: autoconf.c Log Message: 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. XXX: pullup-10. (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.24 -r1.25 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.24 src/sys/arch/evbarm/evbarm/autoconf.c:1.25 --- src/sys/arch/evbarm/evbarm/autoconf.c:1.24 Sun Feb 5 22:42:39 2023 +++ src/sys/arch/evbarm/evbarm/autoconf.c Sat Oct 28 17:53:06 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.24 2023/02/05 22:42:39 mrg Exp $ */ +/* $NetBSD: autoconf.c,v 1.25 2023/10/28 17:53:06 mrg Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.24 2023/02/05 22:42:39 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.25 2023/10/28 17:53:06 mrg 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: src/sys/arch/evbarm/evbarm
Module Name:src Committed By: mrg Date: Sat Oct 28 17:53:06 UTC 2023 Modified Files: src/sys/arch/evbarm/evbarm: autoconf.c Log Message: 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. XXX: pullup-10. (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.24 -r1.25 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: src/sys/arch/evbarm/conf
Module Name:src Committed By: rin Date: Wed Oct 11 07:49:29 UTC 2023 Modified Files: src/sys/arch/evbarm/conf: GENERIC64 Log Message: aarch64/GENERIC64: Add ixl(4) Works just fine for little-endian on LX2K with UEFI firmware. Not tested for big-endian yet; attach fails on ROCKPro64 due to host controller problem. OK yamaguchi@ To generate a diff of this commit: cvs rdiff -u -r1.213 -r1.214 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.213 src/sys/arch/evbarm/conf/GENERIC64:1.214 --- src/sys/arch/evbarm/conf/GENERIC64:1.213 Wed Oct 4 07:48:55 2023 +++ src/sys/arch/evbarm/conf/GENERIC64 Wed Oct 11 07:49:29 2023 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC64,v 1.213 2023/10/04 07:48:55 rin Exp $ +# $NetBSD: GENERIC64,v 1.214 2023/10/11 07:49:29 rin Exp $ # # GENERIC ARM (aarch64) kernel # @@ -286,6 +286,7 @@ bge* at pci? dev ? function ? # Broadco ena* at pci? dev ? function ? # Amazon.com Elastic Network Adapter igc* at pci? dev ? function ? # Intel 22x 2.5 gigabit ixg* at pci? dev ? function ? # Intel 8259x 10 gigabit +ixl* at pci? dev ? function ? # Intel Ethernet 700 series ixv* at pci? dev ? function ? # Intel 8259x 10G virtual function mcx* at pci? dev ? function ? # Mellanox 5th generation Ethernet mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: rin Date: Wed Oct 11 07:49:29 UTC 2023 Modified Files: src/sys/arch/evbarm/conf: GENERIC64 Log Message: aarch64/GENERIC64: Add ixl(4) Works just fine for little-endian on LX2K with UEFI firmware. Not tested for big-endian yet; attach fails on ROCKPro64 due to host controller problem. OK yamaguchi@ To generate a diff of this commit: cvs rdiff -u -r1.213 -r1.214 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: src/sys/arch/evbarm/conf
Module Name:src Committed By: rin Date: Tue Aug 1 10:25:48 UTC 2023 Modified Files: src/sys/arch/evbarm/conf: NSLU2 Log Message: NSLU2: Remove workaround for now-fixed PR toolchain/57146 To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/arch/evbarm/conf/NSLU2 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/NSLU2 diff -u src/sys/arch/evbarm/conf/NSLU2:1.53 src/sys/arch/evbarm/conf/NSLU2:1.54 --- src/sys/arch/evbarm/conf/NSLU2:1.53 Sat Jun 17 11:41:11 2023 +++ src/sys/arch/evbarm/conf/NSLU2 Tue Aug 1 10:25:48 2023 @@ -1,4 +1,4 @@ -# $NetBSD: NSLU2,v 1.53 2023/06/17 11:41:11 rin Exp $ +# $NetBSD: NSLU2,v 1.54 2023/08/01 10:25:48 rin Exp $ # # Linksys NSLU2 "Slug" NAS Device # @@ -12,7 +12,6 @@ maxusers 8 #options VNODE_OP_NOINLINE #options EVBARM_SPL_NOINLINE #makeoptions COPTS="-Os -fno-unwind-tables" -makeoptions NOCTF="yes" # XXX toolchain/57146 makeoptions COPTS="-O2 -fno-unwind-tables" # Standard system options
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: rin Date: Tue Aug 1 10:25:48 UTC 2023 Modified Files: src/sys/arch/evbarm/conf: NSLU2 Log Message: NSLU2: Remove workaround for now-fixed PR toolchain/57146 To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/arch/evbarm/conf/NSLU2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: riastradh Date: Sat Jul 15 22:30:19 UTC 2023 Modified Files: src/sys/arch/evbarm/conf: GENERIC GENERIC64 Log Message: evbarm: Enable HEARTBEAT option in GENERIC and GENERIC64 kernels. To generate a diff of this commit: cvs rdiff -u -r1.119 -r1.120 src/sys/arch/evbarm/conf/GENERIC cvs rdiff -u -r1.211 -r1.212 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/GENERIC diff -u src/sys/arch/evbarm/conf/GENERIC:1.119 src/sys/arch/evbarm/conf/GENERIC:1.120 --- src/sys/arch/evbarm/conf/GENERIC:1.119 Thu May 4 13:39:51 2023 +++ src/sys/arch/evbarm/conf/GENERIC Sat Jul 15 22:30:19 2023 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC,v 1.119 2023/05/04 13:39:51 bouyer Exp $ +# $NetBSD: GENERIC,v 1.120 2023/07/15 22:30:19 riastradh Exp $ # # GENERIC ARM (aarch32) kernel # @@ -42,6 +42,10 @@ pseudo-device openfirm # /dev/openfirm #options UVMHIST # kernhist for uvm/pmap subsystems #options PCI_CONFIG_DUMP # verbosely dump PCI config space +# Heartbeat checks +options HEARTBEAT +options HEARTBEAT_MAX_PERIOD_DEFAULT=15 + options MSGBUFSIZE=32768 #options VERBOSE_INIT_ARM # verbose bootstrapping messages Index: src/sys/arch/evbarm/conf/GENERIC64 diff -u src/sys/arch/evbarm/conf/GENERIC64:1.211 src/sys/arch/evbarm/conf/GENERIC64:1.212 --- src/sys/arch/evbarm/conf/GENERIC64:1.211 Sun Apr 16 16:55:01 2023 +++ src/sys/arch/evbarm/conf/GENERIC64 Sat Jul 15 22:30:19 2023 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC64,v 1.211 2023/04/16 16:55:01 jmcneill Exp $ +# $NetBSD: GENERIC64,v 1.212 2023/07/15 22:30:19 riastradh Exp $ # # GENERIC ARM (aarch64) kernel # @@ -37,6 +37,10 @@ options INCLUDE_CONFIG_FILE #options UVMHIST_PRINT,KERNHIST_DELAY=0 #options PCI_CONFIG_DUMP # verbosely dump PCI config space +# Heartbeat checks +options HEARTBEAT +options HEARTBEAT_MAX_PERIOD_DEFAULT=15 + # EARLYCONS is required for early init messages from VERBOSE_INIT_ARM. #options EARLYCONS=bcm2837, CONSADDR=0x3f215040 #options EARLYCONS=bcm2711, CONSADDR=0xfe215040
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: riastradh Date: Sat Jul 15 22:30:19 UTC 2023 Modified Files: src/sys/arch/evbarm/conf: GENERIC GENERIC64 Log Message: evbarm: Enable HEARTBEAT option in GENERIC and GENERIC64 kernels. To generate a diff of this commit: cvs rdiff -u -r1.119 -r1.120 src/sys/arch/evbarm/conf/GENERIC cvs rdiff -u -r1.211 -r1.212 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: src/sys/arch/evbarm/g42xxeb
Module Name:src Committed By: riastradh Date: Fri Jul 14 12:57:10 UTC 2023 Modified Files: src/sys/arch/evbarm/g42xxeb: obio.c Log Message: evbarm/g42xxeb: Fix off-by-one in previous. The original find_first_bit(x) was 31 - __builtin_clz((uint32_t)x), which is equivalent to fls32(x) - 1, not to fls32(x). Note that fls32 is 1-based and returns 0 for x=0. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/g42xxeb/obio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/g42xxeb
Module Name:src
Committed By: riastradh
Date: Fri Jul 14 12:57:10 UTC 2023
Modified Files:
src/sys/arch/evbarm/g42xxeb: obio.c
Log Message:
evbarm/g42xxeb: Fix off-by-one in previous.
The original find_first_bit(x) was 31 - __builtin_clz((uint32_t)x),
which is equivalent to fls32(x) - 1, not to fls32(x).
Note that fls32 is 1-based and returns 0 for x=0.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/g42xxeb/obio.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/g42xxeb/obio.c
diff -u src/sys/arch/evbarm/g42xxeb/obio.c:1.15 src/sys/arch/evbarm/g42xxeb/obio.c:1.16
--- src/sys/arch/evbarm/g42xxeb/obio.c:1.15 Thu Jul 13 20:22:29 2023
+++ src/sys/arch/evbarm/g42xxeb/obio.c Fri Jul 14 12:57:10 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.15 2023/07/13 20:22:29 mrg Exp $ */
+/* $NetBSD: obio.c,v 1.16 2023/07/14 12:57:10 riastradh Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec corp. All rights reserved.
@@ -156,7 +156,7 @@ obio_softint(void *arg)
int psw;
psw = disable_interrupts(I32_bit);
- while ((irqno = fls32(sc->sc_intr_pending)) >= 0) {
+ while ((irqno = fls32(sc->sc_intr_pending) - 1) >= 0) {
sc->sc_intr_pending &= ~(1U<
CVS commit: src/sys/arch/evbarm/lubbock
Module Name:src
Committed By: riastradh
Date: Thu Jul 13 21:29:49 UTC 2023
Modified Files:
src/sys/arch/evbarm/lubbock: sacc_obio.c
Log Message:
arm/xscale: Missed a spot with previous find_first_bit commit.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/lubbock/sacc_obio.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/lubbock/sacc_obio.c
diff -u src/sys/arch/evbarm/lubbock/sacc_obio.c:1.16 src/sys/arch/evbarm/lubbock/sacc_obio.c:1.17
--- src/sys/arch/evbarm/lubbock/sacc_obio.c:1.16 Thu Jul 13 19:42:24 2023
+++ src/sys/arch/evbarm/lubbock/sacc_obio.c Thu Jul 13 21:29:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sacc_obio.c,v 1.16 2023/07/13 19:42:24 riastradh Exp $ */
+/* $NetBSD: sacc_obio.c,v 1.17 2023/07/13 21:29:49 riastradh Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sacc_obio.c,v 1.16 2023/07/13 19:42:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sacc_obio.c,v 1.17 2023/07/13 21:29:49 riastradh Exp $");
#include
#include
@@ -214,7 +214,7 @@ sacc_obio_intr(void *arg)
intstat.lo &= ~(1U<= 0) {
+ while ((i = fls32(intstat.hi) - 1) >= 0) {
bus_space_write_4(sc->sc_iot, sc->sc_ioh,
SACCIC_INTSTATCLR1, 1U<
CVS commit: src/sys/arch/evbarm/lubbock
Module Name:src Committed By: riastradh Date: Thu Jul 13 21:29:49 UTC 2023 Modified Files: src/sys/arch/evbarm/lubbock: sacc_obio.c Log Message: arm/xscale: Missed a spot with previous find_first_bit commit. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/lubbock/sacc_obio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/g42xxeb
Module Name:src
Committed By: mrg
Date: Thu Jul 13 20:22:29 UTC 2023
Modified Files:
src/sys/arch/evbarm/g42xxeb: obio.c
Log Message:
complete the previous - there were two calls to find_first_bit() to fix.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/g42xxeb/obio.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/g42xxeb/obio.c
diff -u src/sys/arch/evbarm/g42xxeb/obio.c:1.14 src/sys/arch/evbarm/g42xxeb/obio.c:1.15
--- src/sys/arch/evbarm/g42xxeb/obio.c:1.14 Thu Jul 13 19:42:24 2023
+++ src/sys/arch/evbarm/g42xxeb/obio.c Thu Jul 13 20:22:29 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.14 2023/07/13 19:42:24 riastradh Exp $ */
+/* $NetBSD: obio.c,v 1.15 2023/07/13 20:22:29 mrg Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec corp. All rights reserved.
@@ -156,7 +156,7 @@ obio_softint(void *arg)
int psw;
psw = disable_interrupts(I32_bit);
- while ((irqno = find_first_bit(sc->sc_intr_pending)) >= 0) {
+ while ((irqno = fls32(sc->sc_intr_pending)) >= 0) {
sc->sc_intr_pending &= ~(1U<
CVS commit: src/sys/arch/evbarm/g42xxeb
Module Name:src Committed By: mrg Date: Thu Jul 13 20:22:29 UTC 2023 Modified Files: src/sys/arch/evbarm/g42xxeb: obio.c Log Message: complete the previous - there were two calls to find_first_bit() to fix. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/g42xxeb/obio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/include
Module Name:src Committed By: riastradh Date: Tue Jul 11 10:42:07 UTC 2023 Modified Files: src/sys/arch/evbarm/include: intr.h Log Message: evbarm/intr.h: Define ipl_cookie_t before including ARM_INTR_IMPL. Otherwise arm/mutex.h doesn't work, due to a cyclic dependency which should really be fixed. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbarm/include/intr.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/evbarm/include
Module Name:src
Committed By: riastradh
Date: Tue Jul 11 10:42:07 UTC 2023
Modified Files:
src/sys/arch/evbarm/include: intr.h
Log Message:
evbarm/intr.h: Define ipl_cookie_t before including ARM_INTR_IMPL.
Otherwise arm/mutex.h doesn't work, due to a cyclic dependency which
should really be fixed.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbarm/include/intr.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/include/intr.h
diff -u src/sys/arch/evbarm/include/intr.h:1.28 src/sys/arch/evbarm/include/intr.h:1.29
--- src/sys/arch/evbarm/include/intr.h:1.28 Mon Jul 27 10:37:58 2020
+++ src/sys/arch/evbarm/include/intr.h Tue Jul 11 10:42:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.28 2020/07/27 10:37:58 skrll Exp $ */
+/* $NetBSD: intr.h,v 1.29 2023/07/11 10:42:07 riastradh Exp $ */
/*
* Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -71,6 +71,11 @@
#include
+typedef uint8_t ipl_t;
+typedef struct {
+ ipl_t _ipl;
+} ipl_cookie_t;
+
#if defined(_MODULE)
int _splraise(int);
@@ -124,11 +129,6 @@ void splx(int);
#endif /* _MODULE */
-typedef uint8_t ipl_t;
-typedef struct {
- ipl_t _ipl;
-} ipl_cookie_t;
-
static inline ipl_cookie_t
makeiplcookie(ipl_t ipl)
{
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jakllsch Date: Mon Jul 3 17:05:11 UTC 2023 Modified Files: src/sys/arch/evbarm/conf: std.generic Log Message: 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.11 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: src/sys/arch/evbarm/conf
Module Name:src
Committed By: jakllsch
Date: Mon Jul 3 17:05:11 UTC 2023
Modified Files:
src/sys/arch/evbarm/conf: std.generic
Log Message:
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.11 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.11
--- src/sys/arch/evbarm/conf/std.generic:1.10 Fri Sep 3 21:58:36 2021
+++ src/sys/arch/evbarm/conf/std.generic Mon Jul 3 17:05:10 2023
@@ -1,4 +1,4 @@
-# $NetBSD: std.generic,v 1.10 2021/09/03 21:58:36 andvar Exp $
+# $NetBSD: std.generic,v 1.11 2023/07/03 17:05:10 jakllsch 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: src/sys/arch/evbarm/lubbock
Module Name:src
Committed By: nisimura
Date: Mon Jun 19 03:59:24 UTC 2023
Modified Files:
src/sys/arch/evbarm/lubbock: lubbock_machdep.c
Log Message:
unbreak the previous change.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/evbarm/lubbock/lubbock_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/lubbock/lubbock_machdep.c
diff -u src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.43 src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.44
--- src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.43 Thu Apr 20 08:28:05 2023
+++ src/sys/arch/evbarm/lubbock/lubbock_machdep.c Mon Jun 19 03:59:24 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: lubbock_machdep.c,v 1.43 2023/04/20 08:28:05 skrll Exp $ */
+/* $NetBSD: lubbock_machdep.c,v 1.44 2023/06/19 03:59:24 nisimura Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -112,7 +112,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.43 2023/04/20 08:28:05 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.44 2023/06/19 03:59:24 nisimura Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -348,36 +348,36 @@ read_ttb(void)
*/
static const struct pmap_devmap lubbock_devmap[] = {
-DEVMAP_ENTRY{
+DEVMAP_ENTRY(
LUBBOCK_OBIO_VBASE,
LUBBOCK_OBIO_PBASE,
LUBBOCK_OBIO_SIZE
-},
-DEVMAP_ENTRY{
+),
+DEVMAP_ENTRY(
LUBBOCK_GPIO_VBASE,
PXA2X0_GPIO_BASE,
PXA250_GPIO_SIZE
-},
-DEVMAP_ENTRY{
+),
+DEVMAP_ENTRY(
LUBBOCK_CLKMAN_VBASE,
PXA2X0_CLKMAN_BASE,
PXA2X0_CLKMAN_SIZE
-},
-DEVMAP_ENTRY{
+),
+DEVMAP_ENTRY(
LUBBOCK_INTCTL_VBASE,
PXA2X0_INTCTL_BASE,
PXA2X0_INTCTL_SIZE
-},
-DEVMAP_ENTRY{
+),
+DEVMAP_ENTRY(
LUBBOCK_FFUART_VBASE,
PXA2X0_FFUART_BASE,
4 * COM_NPORTS
-},
-DEVMAP_ENTRY{
+),
+DEVMAP_ENTRY(
LUBBOCK_BTUART_VBASE,
PXA2X0_BTUART_BASE,
4 * COM_NPORTS
-},
+),
DEVMAP_ENTRY_END
};
CVS commit: src/sys/arch/evbarm/lubbock
Module Name:src Committed By: nisimura Date: Mon Jun 19 03:59:24 UTC 2023 Modified Files: src/sys/arch/evbarm/lubbock: lubbock_machdep.c Log Message: unbreak the previous change. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/arch/evbarm/lubbock/lubbock_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/mini2440
Module Name:src Committed By: nisimura Date: Mon Jun 19 03:52:50 UTC 2023 Modified Files: src/sys/arch/evbarm/mini2440: mini2440_machdep.c Log Message: unbreak the previous change. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/mini2440/mini2440_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/mini2440
Module Name:src
Committed By: nisimura
Date: Mon Jun 19 03:52:50 UTC 2023
Modified Files:
src/sys/arch/evbarm/mini2440: mini2440_machdep.c
Log Message:
unbreak the previous change.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/mini2440/mini2440_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/mini2440/mini2440_machdep.c
diff -u src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.20 src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.21
--- src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.20 Thu Apr 20 08:28:05 2023
+++ src/sys/arch/evbarm/mini2440/mini2440_machdep.c Mon Jun 19 03:52:50 2023
@@ -131,7 +131,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mini2440_machdep.c,v 1.20 2023/04/20 08:28:05 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mini2440_machdep.c,v 1.21 2023/06/19 03:52:50 nisimura Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -371,25 +371,25 @@ cpu_reboot(int howto, char *bootstr)
static const struct pmap_devmap mini2440_devmap[] = {
/* GPIO registers */
- DEVMAP_ENTRY{
+ DEVMAP_ENTRY(
GPIO_VBASE,
S3C2440_GPIO_BASE,
S3C2440_GPIO_SIZE
),
- DEVMAP_ENTRY({
+ DEVMAP_ENTRY(
INTCTL_VBASE,
S3C2440_INTCTL_BASE,
S3C2440_INTCTL_SIZE
),
- DEVMAP_ENTRY({
+ DEVMAP_ENTRY(
CLKMAN_VBASE,
- S3C2440_CLKMAN_BASE),
+ S3C2440_CLKMAN_BASE,
S3C24X0_CLKMAN_SIZE
),
/* UART registers for UART0, 1, 2. */
- DEVMAP_ENTRY({
+ DEVMAP_ENTRY(
UART_VBASE,
- S3C2440_UART0_BASE),
+ S3C2440_UART0_BASE,
S3C2440_UART_BASE(3) - S3C2440_UART0_BASE
),
DEVMAP_ENTRY_END
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: rin Date: Sat Jun 17 11:41:11 UTC 2023 Modified Files: src/sys/arch/evbarm/conf: NSLU2 Log Message: Relocate FFS_NO_SNAPSHOT to where it should be... To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sys/arch/evbarm/conf/NSLU2 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/NSLU2 diff -u src/sys/arch/evbarm/conf/NSLU2:1.52 src/sys/arch/evbarm/conf/NSLU2:1.53 --- src/sys/arch/evbarm/conf/NSLU2:1.52 Sat Jun 17 11:39:41 2023 +++ src/sys/arch/evbarm/conf/NSLU2 Sat Jun 17 11:41:11 2023 @@ -1,4 +1,4 @@ -# $NetBSD: NSLU2,v 1.52 2023/06/17 11:39:41 rin Exp $ +# $NetBSD: NSLU2,v 1.53 2023/06/17 11:41:11 rin Exp $ # # Linksys NSLU2 "Slug" NAS Device # @@ -37,7 +37,6 @@ options IXP425_CLOCK_FREQ=6600 # File systems file-system FFS # UFS -options FFS_NO_SNAPSHOT # No FFS snapshot support #file-system LFS # log-structured file system file-system MFS # memory file system file-system NFS # Network file system @@ -56,6 +55,7 @@ file-system PTYFS # /dev/ptm support # File system options #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_DIRHASH # UFS Large Directory Hashing
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: rin Date: Sat Jun 17 11:41:11 UTC 2023 Modified Files: src/sys/arch/evbarm/conf: NSLU2 Log Message: Relocate FFS_NO_SNAPSHOT to where it should be... To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sys/arch/evbarm/conf/NSLU2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: rin Date: Sat Jun 17 11:39:41 UTC 2023 Modified Files: src/sys/arch/evbarm/conf: NSLU2 Log Message: Sprinkle FFS_NO_SNAPSHOT and -fno-unwind-tables to reduce memory footprint. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/arch/evbarm/conf/NSLU2 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/NSLU2 diff -u src/sys/arch/evbarm/conf/NSLU2:1.51 src/sys/arch/evbarm/conf/NSLU2:1.52 --- src/sys/arch/evbarm/conf/NSLU2:1.51 Sat Jun 17 11:35:24 2023 +++ src/sys/arch/evbarm/conf/NSLU2 Sat Jun 17 11:39:41 2023 @@ -1,4 +1,4 @@ -# $NetBSD: NSLU2,v 1.51 2023/06/17 11:35:24 rin Exp $ +# $NetBSD: NSLU2,v 1.52 2023/06/17 11:39:41 rin Exp $ # # Linksys NSLU2 "Slug" NAS Device # @@ -11,8 +11,9 @@ maxusers 8 # Feeling bloated? These might help... #options VNODE_OP_NOINLINE #options EVBARM_SPL_NOINLINE -#makeoptions COPTS="-Os" +#makeoptions COPTS="-Os -fno-unwind-tables" makeoptions NOCTF="yes" # XXX toolchain/57146 +makeoptions COPTS="-O2 -fno-unwind-tables" # Standard system options @@ -36,6 +37,7 @@ options IXP425_CLOCK_FREQ=6600 # File systems file-system FFS # UFS +options FFS_NO_SNAPSHOT # No FFS snapshot support #file-system LFS # log-structured file system file-system MFS # memory file system file-system NFS # Network file system
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: rin Date: Sat Jun 17 11:39:41 UTC 2023 Modified Files: src/sys/arch/evbarm/conf: NSLU2 Log Message: Sprinkle FFS_NO_SNAPSHOT and -fno-unwind-tables to reduce memory footprint. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/arch/evbarm/conf/NSLU2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: rin Date: Sat Jun 17 11:35:25 UTC 2023 Modified Files: src/sys/arch/evbarm/conf: NSLU2 Log Message: Build NSLU2 kernel with NOCTF="yes" as workaround for PR toolchain/57146, which I'm working on :). Now kernel image fits within its reserved VA range again. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/arch/evbarm/conf/NSLU2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: rin Date: Sat Jun 17 11:35:25 UTC 2023 Modified Files: src/sys/arch/evbarm/conf: NSLU2 Log Message: Build NSLU2 kernel with NOCTF="yes" as workaround for PR toolchain/57146, which I'm working on :). Now kernel image fits within its reserved VA range again. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/arch/evbarm/conf/NSLU2 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/NSLU2 diff -u src/sys/arch/evbarm/conf/NSLU2:1.50 src/sys/arch/evbarm/conf/NSLU2:1.51 --- src/sys/arch/evbarm/conf/NSLU2:1.50 Sun Aug 7 02:52:25 2022 +++ src/sys/arch/evbarm/conf/NSLU2 Sat Jun 17 11:35:24 2023 @@ -1,4 +1,4 @@ -# $NetBSD: NSLU2,v 1.50 2022/08/07 02:52:25 simonb Exp $ +# $NetBSD: NSLU2,v 1.51 2023/06/17 11:35:24 rin Exp $ # # Linksys NSLU2 "Slug" NAS Device # @@ -12,6 +12,7 @@ maxusers 8 #options VNODE_OP_NOINLINE #options EVBARM_SPL_NOINLINE #makeoptions COPTS="-Os" +makeoptions NOCTF="yes" # XXX toolchain/57146 # Standard system options
CVS commit: src/sys/arch/evbarm/nslu2
Module Name:src
Committed By: rin
Date: Sat Jun 17 11:28:13 UTC 2023
Modified Files:
src/sys/arch/evbarm/nslu2: nslu2_machdep.c
Log Message:
Panic if kernel image is not fit within its VA range,
rather than silently freeze later.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbarm/nslu2/nslu2_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/nslu2/nslu2_machdep.c
diff -u src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.39 src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.40
--- src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.39 Sat Jun 17 11:24:20 2023
+++ src/sys/arch/evbarm/nslu2/nslu2_machdep.c Sat Jun 17 11:28:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: nslu2_machdep.c,v 1.39 2023/06/17 11:24:20 rin Exp $ */
+/* $NetBSD: nslu2_machdep.c,v 1.40 2023/06/17 11:28:13 rin Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -94,7 +94,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.39 2023/06/17 11:24:20 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.40 2023/06/17 11:28:13 rin Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -630,6 +630,9 @@ initarm(void *arg)
logical += pmap_map_chunk(l1pagetable, KERNEL_BASE + logical,
physical_start + logical, totalsize - textsize,
VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
+
+ if (KERNEL_BASE + logical >= KERNEL_VM_BASE)
+ panic("VA for kernel image exhausted.");
}
#ifdef VERBOSE_INIT_ARM
CVS commit: src/sys/arch/evbarm/nslu2
Module Name:src Committed By: rin Date: Sat Jun 17 11:28:13 UTC 2023 Modified Files: src/sys/arch/evbarm/nslu2: nslu2_machdep.c Log Message: Panic if kernel image is not fit within its VA range, rather than silently freeze later. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbarm/nslu2/nslu2_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/nslu2
Module Name:src Committed By: rin Date: Sat Jun 17 11:24:20 UTC 2023 Modified Files: src/sys/arch/evbarm/nslu2: nslu2_machdep.c Log Message: Missing #endif for the previous... To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/nslu2/nslu2_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/nslu2/nslu2_machdep.c diff -u src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.38 src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.39 --- src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.38 Sat Jun 17 11:22:20 2023 +++ src/sys/arch/evbarm/nslu2/nslu2_machdep.c Sat Jun 17 11:24:20 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: nslu2_machdep.c,v 1.38 2023/06/17 11:22:20 rin Exp $ */ +/* $NetBSD: nslu2_machdep.c,v 1.39 2023/06/17 11:24:20 rin Exp $ */ /*- * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -94,7 +94,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.38 2023/06/17 11:22:20 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.39 2023/06/17 11:24:20 rin Exp $"); #include "opt_arm_debug.h" #include "opt_console.h" @@ -391,6 +391,7 @@ static const struct pmap_devmap nslu2_de NSLU2_FLASH_HWBASE, NSLU2_FLASH_SIZE ), +#endif DEVMAP_ENTRY_END };
CVS commit: src/sys/arch/evbarm/nslu2
Module Name:src Committed By: rin Date: Sat Jun 17 11:24:20 UTC 2023 Modified Files: src/sys/arch/evbarm/nslu2: nslu2_machdep.c Log Message: Missing #endif for the previous... To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/nslu2/nslu2_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/nslu2
Module Name:src Committed By: rin Date: Sat Jun 17 11:22:20 UTC 2023 Modified Files: src/sys/arch/evbarm/nslu2: nslu2_machdep.c Log Message: Catch up with new pmap_devmap implementation. Now, hardcoded VA's should be aligned to L1 section (1M) boundaries. Rather, just disable ones if there's no need for statically mapping. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbarm/nslu2/nslu2_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/nslu2/nslu2_machdep.c diff -u src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.37 src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.38 --- src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.37 Wed Jun 14 10:30:34 2023 +++ src/sys/arch/evbarm/nslu2/nslu2_machdep.c Sat Jun 17 11:22:20 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: nslu2_machdep.c,v 1.37 2023/06/14 10:30:34 rin Exp $ */ +/* $NetBSD: nslu2_machdep.c,v 1.38 2023/06/17 11:22:20 rin Exp $ */ /*- * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -94,7 +94,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.37 2023/06/14 10:30:34 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.38 2023/06/17 11:22:20 rin Exp $"); #include "opt_arm_debug.h" #include "opt_console.h" @@ -351,6 +351,19 @@ static const struct pmap_devmap nslu2_de IXP425_IO_SIZE ), + /* SDRAM Controller */ + DEVMAP_ENTRY( + IXP425_MCU_VBASE, + IXP425_MCU_HWBASE, + IXP425_MCU_SIZE + ), + + /* + * No need to map the following entries statically. + * If you revive these, align VBASE's to L1 section + * boundaries (see pmap_devmap.c). + */ +#if 0 /* Expansion Bus */ DEVMAP_ENTRY( IXP425_EXP_VBASE, @@ -365,13 +378,6 @@ static const struct pmap_devmap nslu2_de IXP425_PCI_SIZE ), - /* SDRAM Controller */ - DEVMAP_ENTRY( - IXP425_MCU_VBASE, - IXP425_MCU_HWBASE, - IXP425_MCU_SIZE - ), - /* PCI Memory Space */ DEVMAP_ENTRY( IXP425_PCI_MEM_VBASE,
CVS commit: src/sys/arch/evbarm/nslu2
Module Name:src Committed By: rin Date: Sat Jun 17 11:22:20 UTC 2023 Modified Files: src/sys/arch/evbarm/nslu2: nslu2_machdep.c Log Message: Catch up with new pmap_devmap implementation. Now, hardcoded VA's should be aligned to L1 section (1M) boundaries. Rather, just disable ones if there's no need for statically mapping. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbarm/nslu2/nslu2_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/nslu2
Module Name:src
Committed By: rin
Date: Wed Jun 14 10:30:35 UTC 2023
Modified Files:
src/sys/arch/evbarm/nslu2: nslu2_machdep.c
Log Message:
Make this compile again with VERBOSE_INIT_ARM.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbarm/nslu2/nslu2_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/nslu2/nslu2_machdep.c
diff -u src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.36 src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.37
--- src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.36 Thu Apr 20 08:28:05 2023
+++ src/sys/arch/evbarm/nslu2/nslu2_machdep.c Wed Jun 14 10:30:34 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: nslu2_machdep.c,v 1.36 2023/04/20 08:28:05 skrll Exp $ */
+/* $NetBSD: nslu2_machdep.c,v 1.37 2023/06/14 10:30:34 rin Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -94,7 +94,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.36 2023/04/20 08:28:05 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.37 2023/06/14 10:30:34 rin Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -482,8 +482,9 @@ initarm(void *arg)
/* Tell the user about the memory */
#ifdef VERBOSE_INIT_ARM
- printf("physmemory: %d pages at 0x%08lx -> 0x%08lx\n", physmem,
- physical_start, physical_end - 1);
+ printf("physmemory: %" PRIuPSIZE " pages at "
+ "0x%08" PRIxPADDR " -> 0x%08" PRIxPADDR "\n",
+ physmem, physical_start, physical_end - 1);
printf("Allocating page tables\n");
#endif
CVS commit: src/sys/arch/evbarm/nslu2
Module Name:src Committed By: rin Date: Wed Jun 14 10:30:35 UTC 2023 Modified Files: src/sys/arch/evbarm/nslu2: nslu2_machdep.c Log Message: Make this compile again with VERBOSE_INIT_ARM. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbarm/nslu2/nslu2_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: bouyer Date: Thu May 4 13:39:51 UTC 2023 Modified Files: src/sys/arch/evbarm/conf: GENERIC Log Message: experimental IMX6SX support: - add options SOC_IMX6SX - add imx6sxccm device tested on a UDOO Neo Full board. known to work: - uart (console) - sdmmc0 - ethernet (enet0) known to not work: - USB (device not detected). needs a modified device tree at this time (add arm,cortex-a9-twd-timer entry copied from the imx6qdl dtsi); for unkown reason the imx6sx.dtsi file lacks an entry for the a9ptmr although it is present in the soc (and, from what I understood, in all cortex A9 SoCs). To generate a diff of this commit: cvs rdiff -u -r1.118 -r1.119 src/sys/arch/evbarm/conf/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/GENERIC diff -u src/sys/arch/evbarm/conf/GENERIC:1.118 src/sys/arch/evbarm/conf/GENERIC:1.119 --- src/sys/arch/evbarm/conf/GENERIC:1.118 Sat Feb 25 08:19:35 2023 +++ src/sys/arch/evbarm/conf/GENERIC Thu May 4 13:39:51 2023 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC,v 1.118 2023/02/25 08:19:35 skrll Exp $ +# $NetBSD: GENERIC,v 1.119 2023/05/04 13:39:51 bouyer Exp $ # # GENERIC ARM (aarch32) kernel # @@ -16,6 +16,7 @@ options SOC_EXYNOS5422 options SOC_IMX6DL options SOC_IMX6Q options SOC_IMX6QDL +options SOC_IMX6SX options SOC_IMX7D options SOC_MESON8B options SOC_OMAP3 @@ -136,7 +137,8 @@ cycvclkmgr* at fdt? pass 1 # Cyclone V cycvrstmgr* at fdt? pass 0 # Cyclone V reset manager exy5410clk* at fdt? pass 3 # Exynos5410 clock controller exy5422clk* at fdt? pass 3 # Exynos5422 clock controller -imx6ccm* at fdt? pass 1 # i.MX6 CCM +imx6ccm* at fdt? pass 1 # i.MX6Q* CCM +imx6sxccm* at fdt? pass 1 # i.MX6SX CCM imx7dccm* at fdt? pass 2 # i.MX7D CCM meson8bclkc* at fdt? pass 2 # Amlogic Meson8b clock controller mesonresets* at fdt? pass 2 # Amlogic Meson misc. clock resets
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: bouyer Date: Thu May 4 13:39:51 UTC 2023 Modified Files: src/sys/arch/evbarm/conf: GENERIC Log Message: experimental IMX6SX support: - add options SOC_IMX6SX - add imx6sxccm device tested on a UDOO Neo Full board. known to work: - uart (console) - sdmmc0 - ethernet (enet0) known to not work: - USB (device not detected). needs a modified device tree at this time (add arm,cortex-a9-twd-timer entry copied from the imx6qdl dtsi); for unkown reason the imx6sx.dtsi file lacks an entry for the a9ptmr although it is present in the soc (and, from what I understood, in all cortex A9 SoCs). To generate a diff of this commit: cvs rdiff -u -r1.118 -r1.119 src/sys/arch/evbarm/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm
Module Name:src Committed By: skrll Date: Fri Apr 21 14:58:35 UTC 2023 Modified Files: src/sys/arch/evbarm/adi_brh: obio_space.c src/sys/arch/evbarm/hdl_g: obio_space.c src/sys/arch/evbarm/ifpga: ifpga_io.c src/sys/arch/evbarm/imx23_olinuxino: imx23_olinuxino_machdep.c src/sys/arch/evbarm/iq80310: obio_space.c src/sys/arch/evbarm/iq80321: obio_space.c src/sys/arch/evbarm/iyonix: obio_space.c Log Message: Trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/adi_brh/obio_space.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/hdl_g/obio_space.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/ifpga/ifpga_io.c cvs rdiff -u -r1.14 -r1.15 \ src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/iq80310/obio_space.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/iq80321/obio_space.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/iyonix/obio_space.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm
Module Name:src
Committed By: skrll
Date: Fri Apr 21 14:58:35 UTC 2023
Modified Files:
src/sys/arch/evbarm/adi_brh: obio_space.c
src/sys/arch/evbarm/hdl_g: obio_space.c
src/sys/arch/evbarm/ifpga: ifpga_io.c
src/sys/arch/evbarm/imx23_olinuxino: imx23_olinuxino_machdep.c
src/sys/arch/evbarm/iq80310: obio_space.c
src/sys/arch/evbarm/iq80321: obio_space.c
src/sys/arch/evbarm/iyonix: obio_space.c
Log Message:
Trailing whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/adi_brh/obio_space.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/hdl_g/obio_space.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/ifpga/ifpga_io.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/iq80310/obio_space.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/iq80321/obio_space.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/iyonix/obio_space.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/adi_brh/obio_space.c
diff -u src/sys/arch/evbarm/adi_brh/obio_space.c:1.9 src/sys/arch/evbarm/adi_brh/obio_space.c:1.10
--- src/sys/arch/evbarm/adi_brh/obio_space.c:1.9 Fri Mar 16 17:56:32 2018
+++ src/sys/arch/evbarm/adi_brh/obio_space.c Fri Apr 21 14:58:34 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: obio_space.c,v 1.9 2018/03/16 17:56:32 ryo Exp $ */
+/* $NetBSD: obio_space.c,v 1.10 2023/04/21 14:58:34 skrll Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.9 2018/03/16 17:56:32 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.10 2023/04/21 14:58:34 skrll Exp $");
#include
#include
@@ -153,7 +153,7 @@ obio_bs_map(void *t, bus_addr_t bpa, bus
endpa = round_page(bpa + size);
offset = bpa & PAGE_MASK;
startpa = trunc_page(bpa);
-
+
va = uvm_km_alloc(kernel_map, endpa - startpa, 0,
UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
if (va == 0)
@@ -201,7 +201,7 @@ obio_bs_unmap(void *t, bus_space_handle_
uvm_km_free(kernel_map, va, endva - va, UVM_KMF_VAONLY);
}
-void
+void
obio_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
{
Index: src/sys/arch/evbarm/hdl_g/obio_space.c
diff -u src/sys/arch/evbarm/hdl_g/obio_space.c:1.5 src/sys/arch/evbarm/hdl_g/obio_space.c:1.6
--- src/sys/arch/evbarm/hdl_g/obio_space.c:1.5 Fri Mar 16 17:56:33 2018
+++ src/sys/arch/evbarm/hdl_g/obio_space.c Fri Apr 21 14:58:34 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: obio_space.c,v 1.5 2018/03/16 17:56:33 ryo Exp $ */
+/* $NetBSD: obio_space.c,v 1.6 2023/04/21 14:58:34 skrll Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.5 2018/03/16 17:56:33 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.6 2023/04/21 14:58:34 skrll Exp $");
#include
#include
@@ -153,7 +153,7 @@ obio_bs_map(void *t, bus_addr_t bpa, bus
endpa = round_page(bpa + size);
offset = bpa & PAGE_MASK;
startpa = trunc_page(bpa);
-
+
va = uvm_km_alloc(kernel_map, endpa - startpa, 0,
UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
if (va == 0)
@@ -201,7 +201,7 @@ obio_bs_unmap(void *t, bus_space_handle_
uvm_km_free(kernel_map, va, endva - va, UVM_KMF_VAONLY);
}
-void
+void
obio_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
{
Index: src/sys/arch/evbarm/ifpga/ifpga_io.c
diff -u src/sys/arch/evbarm/ifpga/ifpga_io.c:1.14 src/sys/arch/evbarm/ifpga/ifpga_io.c:1.15
--- src/sys/arch/evbarm/ifpga/ifpga_io.c:1.14 Mon May 23 19:52:34 2022
+++ src/sys/arch/evbarm/ifpga/ifpga_io.c Fri Apr 21 14:58:34 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ifpga_io.c,v 1.14 2022/05/23 19:52:34 andvar Exp $ */
+/* $NetBSD: ifpga_io.c,v 1.15 2023/04/21 14:58:34 skrll Exp $ */
/*
* Copyright (c) 1997 Causality Limited
@@ -32,7 +32,7 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
+ *
* From arm/footbridge/footbridge_io.c
*/
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ifpga_io.c,v 1.14 2022/05/23 19:52:34 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ifpga_io.c,v 1.15 2023/04/21 14:58:34 skrll Exp $");
#include
#include
@@ -274,7 +274,7 @@ ifpga_mem_bs_map(void *t, bus_addr_t bpa
/* Now map the pages */
/* The cookie is the physical base address for the I/O area */
while (startpa < endpa) {
- /* XXX pmap_kenter_pa maps pages cacheable -- not what
+ /* XXX pmap_kenter_pa maps pages cacheable -- not what
we want. */
pmap_enter(pmap_kernel(), va, (bus_addr_t)t + startpa,
VM_PROT_READ | VM_PROT_WRITE, 0);
@@ -319,7 +319,7 @@ ifpga_mem_bs_unmap(void *t, bus_space_ha
uvm_km_free(kernel_map,
CVS commit: src/sys/arch/evbarm/dev
Module Name:src Committed By: riastradh Date: Tue Apr 11 12:58:03 UTC 2023 Modified Files: src/sys/arch/evbarm/dev: plcom.c Log Message: evbarm/plcom(4): Note ttylock in comment, not tty_lock. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/arch/evbarm/dev/plcom.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/dev/plcom.c diff -u src/sys/arch/evbarm/dev/plcom.c:1.68 src/sys/arch/evbarm/dev/plcom.c:1.69 --- src/sys/arch/evbarm/dev/plcom.c:1.68 Tue Apr 11 12:56:07 2023 +++ src/sys/arch/evbarm/dev/plcom.c Tue Apr 11 12:58:03 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: plcom.c,v 1.68 2023/04/11 12:56:07 riastradh Exp $ */ +/* $NetBSD: plcom.c,v 1.69 2023/04/11 12:58:03 riastradh Exp $ */ /*- * Copyright (c) 2001 ARM Ltd @@ -93,13 +93,13 @@ * Derived from the NS16550AF com driver. * * Lock order: - * tty_lock (IPL_VM) + * ttylock (IPL_VM) * -> sc->sc_lock (IPL_HIGH) * -> timecounter_lock (IPL_HIGH) */ #include -__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.68 2023/04/11 12:56:07 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.69 2023/04/11 12:58:03 riastradh Exp $"); #include "opt_plcom.h" #include "opt_kgdb.h"
CVS commit: src/sys/arch/evbarm/dev
Module Name:src Committed By: riastradh Date: Tue Apr 11 12:58:03 UTC 2023 Modified Files: src/sys/arch/evbarm/dev: plcom.c Log Message: evbarm/plcom(4): Note ttylock in comment, not tty_lock. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/arch/evbarm/dev/plcom.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/dev
Module Name:src
Committed By: riastradh
Date: Tue Apr 11 12:56:08 UTC 2023
Modified Files:
src/sys/arch/evbarm/dev: plcom.c plcomreg.h plcomvar.h
Log Message:
evbarm/plcom(4): Sync some recent changes from com(4).
- Nix quirky `integrate' macro.
- Omit needless spltty in plcomstart.
- Comment on lock order.
- Update confusing comment about hangup delay.
- Add include guards.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/evbarm/dev/plcom.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/dev/plcomreg.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/dev/plcomvar.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/dev/plcom.c
diff -u src/sys/arch/evbarm/dev/plcom.c:1.67 src/sys/arch/evbarm/dev/plcom.c:1.68
--- src/sys/arch/evbarm/dev/plcom.c:1.67 Tue Jan 24 06:56:40 2023
+++ src/sys/arch/evbarm/dev/plcom.c Tue Apr 11 12:56:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: plcom.c,v 1.67 2023/01/24 06:56:40 mlelstv Exp $ */
+/* $NetBSD: plcom.c,v 1.68 2023/04/11 12:56:07 riastradh Exp $ */
/*-
* Copyright (c) 2001 ARM Ltd
@@ -91,10 +91,15 @@
* COM driver for the Prime Cell PL010 and PL011 UARTs. Both are is similar to
* the 16C550, but have a completely different programmer's model.
* Derived from the NS16550AF com driver.
+ *
+ * Lock order:
+ * tty_lock (IPL_VM)
+ * -> sc->sc_lock (IPL_HIGH)
+ * -> timecounter_lock (IPL_HIGH)
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.67 2023/01/24 06:56:40 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.68 2023/04/11 12:56:07 riastradh Exp $");
#include "opt_plcom.h"
#include "opt_kgdb.h"
@@ -181,12 +186,11 @@ void plcomcnputc (dev_t, int);
void plcomcnpollc (dev_t, int);
void plcomcnhalt (dev_t);
-#define integrate static inline
void plcomsoft (void *);
-integrate void plcom_rxsoft (struct plcom_softc *, struct tty *);
-integrate void plcom_txsoft (struct plcom_softc *, struct tty *);
-integrate void plcom_stsoft (struct plcom_softc *, struct tty *);
-integrate void plcom_schedrx (struct plcom_softc *);
+static inline void plcom_rxsoft (struct plcom_softc *, struct tty *);
+static inline void plcom_txsoft (struct plcom_softc *, struct tty *);
+static inline void plcom_stsoft (struct plcom_softc *, struct tty *);
+static inline void plcom_schedrx (struct plcom_softc *);
void plcomdiag (void *);
bool plcom_intstatus(struct plcom_instance *, u_int *);
@@ -745,9 +749,9 @@ plcom_shutdown(struct plcom_softc *sc)
mutex_spin_exit(_lock);
/*
- * Hang up if necessary. Wait a bit, so the other side has time to
- * notice even if we immediately open the port again.
- * Avoid tsleeping above splhigh().
+ * Hang up if necessary. Record when we hung up, so if we
+ * immediately open the port again, we will wait a bit until
+ * the other side has had time to notice that we hung up.
*/
if (ISSET(tp->t_cflag, HUPCL)) {
plcom_modem(sc, 0);
@@ -1249,7 +1253,7 @@ plcomioctl(dev_t dev, u_long cmd, void *
return error;
}
-integrate void
+static inline void
plcom_schedrx(struct plcom_softc *sc)
{
@@ -1765,19 +1769,17 @@ plcomstart(struct tty *tp)
struct plcom_softc *sc =
device_lookup_private(_cd, PLCOMUNIT(tp->t_dev));
struct plcom_instance *pi = >sc_pi;
- int s;
if (PLCOM_ISALIVE(sc) == 0)
return;
- s = spltty();
if (ISSET(tp->t_state, TS_BUSY | TS_TIMEOUT | TS_TTSTOP))
- goto out;
+ return;
if (sc->sc_tx_stopped)
- goto out;
+ return;
if (!ttypull(tp))
- goto out;
+ return;
/* Grab the first contiguous region of buffer space. */
{
@@ -1825,9 +1827,6 @@ plcomstart(struct tty *tp)
sc->sc_tba += n;
}
mutex_spin_exit(>sc_lock);
-out:
- splx(s);
- return;
}
/*
@@ -1870,7 +1869,7 @@ plcomdiag(void *arg)
floods, floods == 1 ? "" : "s");
}
-integrate void
+static inline void
plcom_rxsoft(struct plcom_softc *sc, struct tty *tp)
{
int (*rint) (int, struct tty *) = tp->t_linesw->l_rint;
@@ -1971,7 +1970,7 @@ plcom_rxsoft(struct plcom_softc *sc, str
}
}
-integrate void
+static inline void
plcom_txsoft(struct plcom_softc *sc, struct tty *tp)
{
@@ -1983,7 +1982,7 @@ plcom_txsoft(struct plcom_softc *sc, str
(*tp->t_linesw->l_start)(tp);
}
-integrate void
+static inline void
plcom_stsoft(struct plcom_softc *sc, struct tty *tp)
{
u_char msr, delta;
Index: src/sys/arch/evbarm/dev/plcomreg.h
diff -u src/sys/arch/evbarm/dev/plcomreg.h:1.7 src/sys/arch/evbarm/dev/plcomreg.h:1.8
--- src/sys/arch/evbarm/dev/plcomreg.h:1.7 Tue Jan 24 06:56:40 2023
+++ src/sys/arch/evbarm/dev/plcomreg.h Tue Apr 11 12:56:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: plcomreg.h,v 1.7 2023/01/24 06:56:40 mlelstv Exp $ */
+/* $NetBSD: plcomreg.h,v 1.8 2023/04/11 12:56:07 riastradh Exp $ */
/*-
* Copyright (c) 2001 ARM Ltd
@@ -29,6 +29,8 @@
* SUCH DAMAGE.
*/
+#ifndef _SYS_ARCH_EVBARM_DEV_PLCOMREG_H_
+#define
CVS commit: src/sys/arch/evbarm/dev
Module Name:src Committed By: riastradh Date: Tue Apr 11 12:56:08 UTC 2023 Modified Files: src/sys/arch/evbarm/dev: plcom.c plcomreg.h plcomvar.h Log Message: evbarm/plcom(4): Sync some recent changes from com(4). - Nix quirky `integrate' macro. - Omit needless spltty in plcomstart. - Comment on lock order. - Update confusing comment about hangup delay. - Add include guards. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/sys/arch/evbarm/dev/plcom.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/dev/plcomreg.h cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/dev/plcomvar.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/evbarm/fdt
Module Name:src
Committed By: mlelstv
Date: Sun Mar 5 22:04:54 UTC 2023
Modified Files:
src/sys/arch/evbarm/fdt: fdt_machdep.c
Log Message:
Locate wedges as boot device and also match a partition GUID.
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/evbarm/fdt/fdt_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.100 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.101
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.100 Sun Feb 5 22:42:39 2023
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c Sun Mar 5 22:04:54 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.100 2023/02/05 22:42:39 mrg Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.101 2023/03/05 22:04:54 mlelstv Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.100 2023/02/05 22:42:39 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.101 2023/03/05 22:04:54 mlelstv Exp $");
#include "opt_arm_debug.h"
#include "opt_bootconfig.h"
@@ -743,9 +743,6 @@ fdt_detect_root_device(device_t dev)
{
int error, len;
- if (booted_device)
- return;
-
const int chosen = OF_finddevice("/chosen");
if (chosen < 0)
return;
@@ -801,8 +798,15 @@ fdt_detect_root_device(device_t dev)
const struct uuid *guid =
fdtbus_get_prop(chosen, "netbsd,gpt-guid", );
- if (guid != NULL && len == 16)
- booted_device = dev;
+ if (guid == NULL || len != 16)
+ return;
+
+ char guidstr[UUID_STR_LEN];
+ uuid_snprintf(guidstr, sizeof(guidstr), guid);
+
+ device_t dv = dkwedge_find_by_wname(guidstr);
+ if (dv != NULL)
+ booted_device = dv;
return;
}
@@ -895,8 +899,7 @@ fdt_cpu_rootconf(void)
if (device_class(dev) != DV_DISK)
continue;
- if (device_is_a(dev, "ld") || device_is_a(dev, "sd") || device_is_a(dev, "wd"))
- fdt_detect_root_device(dev);
+ fdt_detect_root_device(dev);
if (booted_device != NULL)
break;
CVS commit: src/sys/arch/evbarm/fdt
Module Name:src Committed By: mlelstv Date: Sun Mar 5 22:04:54 UTC 2023 Modified Files: src/sys/arch/evbarm/fdt: fdt_machdep.c Log Message: Locate wedges as boot device and also match a partition GUID. To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/sys/arch/evbarm/fdt/fdt_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: mlelstv Date: Sat Feb 11 19:09:57 UTC 2023 Modified Files: src/sys/arch/evbarm/conf: ldscript.evbarm Log Message: Merge both SECTIONS declarations into one. Fixes PR 57223. cats, epoc32 and zaurus need a similar fix. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/ldscript.evbarm Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src
Committed By: mlelstv
Date: Sat Feb 11 19:09:57 UTC 2023
Modified Files:
src/sys/arch/evbarm/conf: ldscript.evbarm
Log Message:
Merge both SECTIONS declarations into one.
Fixes PR 57223.
cats, epoc32 and zaurus need a similar fix.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/ldscript.evbarm
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/ldscript.evbarm
diff -u src/sys/arch/evbarm/conf/ldscript.evbarm:1.14 src/sys/arch/evbarm/conf/ldscript.evbarm:1.15
--- src/sys/arch/evbarm/conf/ldscript.evbarm:1.14 Fri Jul 10 12:25:10 2020
+++ src/sys/arch/evbarm/conf/ldscript.evbarm Sat Feb 11 19:09:57 2023
@@ -1,16 +1,20 @@
-/* $NetBSD: ldscript.evbarm,v 1.14 2020/07/10 12:25:10 skrll Exp $ */
+/* $NetBSD: ldscript.evbarm,v 1.15 2023/02/11 19:09:57 mlelstv Exp $ */
ENTRY(KERNEL_BASE_phys)
SECTIONS
{
+ KERNEL_BASE_phys = @KERNEL_BASE_PHYS@;
+ KERNEL_BASE_virt = @KERNEL_BASE_VIRT@;
+
/* Kernel start: */
- .start :
+ .start (KERNEL_BASE_phys) :
{
*(.start)
}
/* Read-only sections, merged into text segment: */
- .text :
+ .text (KERNEL_BASE_virt + ALIGN(SIZEOF(.start), ALIGNOF(.text))) :
+ AT (LOADADDR(.start) + ALIGN(SIZEOF(.start), ALIGNOF(.text)))
{
*(.text)
*(.text.*)
@@ -80,19 +84,3 @@ SECTIONS
_bss_end__ = . ; __bss_end__ = . ; __end__ = . ;
PROVIDE (end = .);
}
-SECTIONS
-{
- KERNEL_BASE_phys = @KERNEL_BASE_PHYS@;
- KERNEL_BASE_virt = @KERNEL_BASE_VIRT@;
-
- .start (KERNEL_BASE_phys) :
- {
-*(.start)
- } =0
-
- .text (KERNEL_BASE_virt + ALIGN(SIZEOF(.start), ALIGNOF(.text))) :
- AT (LOADADDR(.start) + ALIGN(SIZEOF(.start), ALIGNOF(.text)))
- {
-*(.text)
- } =0
-}
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: mrg Date: Sat Feb 11 07:01:32 UTC 2023 Modified Files: src/sys/arch/evbarm/conf: GENERIC64 Log Message: add siisata(4). been running for ages on a rockpro64. To generate a diff of this commit: cvs rdiff -u -r1.208 -r1.209 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.208 src/sys/arch/evbarm/conf/GENERIC64:1.209 --- src/sys/arch/evbarm/conf/GENERIC64:1.208 Thu Feb 9 14:09:48 2023 +++ src/sys/arch/evbarm/conf/GENERIC64 Sat Feb 11 07:01:32 2023 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC64,v 1.208 2023/02/09 14:09:48 abs Exp $ +# $NetBSD: GENERIC64,v 1.209 2023/02/11 07:01:32 mrg Exp $ # # GENERIC ARM (aarch64) kernel # @@ -412,6 +412,7 @@ bwfm* at sdmmc? # Broadcom BCM43xxx Wi ahcisata* at fdt? # AHCI SATA ahcisata* at acpi? ahcisata* at pci? dev ? function ? +siisata* at pci? dev ? function ? atabus* at ata? atapibus* at atapi? wd* at atabus? drive ?
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: mrg Date: Sat Feb 11 07:01:32 UTC 2023 Modified Files: src/sys/arch/evbarm/conf: GENERIC64 Log Message: add siisata(4). been running for ages on a rockpro64. To generate a diff of this commit: cvs rdiff -u -r1.208 -r1.209 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: src/sys/arch/evbarm/conf
Module Name:src Committed By: simonb Date: Mon Feb 6 12:59:13 UTC 2023 Modified Files: src/sys/arch/evbarm/conf: GENERIC.common Log Message: 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.51 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.51 --- src/sys/arch/evbarm/conf/GENERIC.common:1.50 Thu Sep 29 10:10:06 2022 +++ src/sys/arch/evbarm/conf/GENERIC.common Mon Feb 6 12:59:13 2023 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC.common,v 1.50 2022/09/29 10:10:06 riastradh Exp $ +# $NetBSD: GENERIC.common,v 1.51 2023/02/06 12:59:13 simonb 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: src/sys/arch/evbarm/conf
Module Name:src Committed By: simonb Date: Mon Feb 6 12:59:13 UTC 2023 Modified Files: src/sys/arch/evbarm/conf: GENERIC.common Log Message: 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.51 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: src/sys/arch/evbarm
Module Name:src Committed By: mrg Date: Sun Feb 5 22:42:39 UTC 2023 Modified Files: src/sys/arch/evbarm/evbarm: autoconf.c src/sys/arch/evbarm/fdt: fdt_machdep.c src/sys/arch/evbarm/include: types.h Log Message: 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 XXX: pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/evbarm/autoconf.c cvs rdiff -u -r1.99 -r1.100 src/sys/arch/evbarm/fdt/fdt_machdep.c cvs rdiff -u -r1.15 -r1.16 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: src/sys/arch/evbarm
Module Name:src
Committed By: mrg
Date: Sun Feb 5 22:42:39 UTC 2023
Modified Files:
src/sys/arch/evbarm/evbarm: autoconf.c
src/sys/arch/evbarm/fdt: fdt_machdep.c
src/sys/arch/evbarm/include: types.h
Log Message:
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
XXX: pullup-10
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/evbarm/autoconf.c
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/evbarm/fdt/fdt_machdep.c
cvs rdiff -u -r1.15 -r1.16 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.24
--- src/sys/arch/evbarm/evbarm/autoconf.c:1.23 Sat Dec 19 21:54:00 2020
+++ src/sys/arch/evbarm/evbarm/autoconf.c Sun Feb 5 22:42:39 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.23 2020/12/19 21:54:00 mrg Exp $ */
+/* $NetBSD: autoconf.c,v 1.24 2023/02/05 22:42:39 mrg 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.24 2023/02/05 22:42:39 mrg 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.100
--- 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 Sun Feb 5 22:42:39 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.100 2023/02/05 22:42:39 mrg 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.100 2023/02/05 22:42:39 mrg Exp $");
#include "opt_arm_debug.h"
#include "opt_bootconfig.h"
@@ -741,16 +741,10 @@ delay(u_int us)
static void
fdt_detect_root_device(device_t dev)
{
- struct mbr_sector mbr;
- uint8_t buf[DEV_BSIZE];
- uint8_t hash[16];
- const uint8_t *rhash;
- char rootarg[64];
- struct vnode *vp;
- MD5_CTX md5ctx;
int error, len;
- size_t resid;
- u_int part;
+
+ if (booted_device)
+ return;
const int chosen = OF_finddevice("/chosen");
if (chosen < 0)
@@ -758,6 +752,14 @@ fdt_detect_root_device(device_t dev)
if (of_hasprop(chosen, "netbsd,mbr") &&
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: andvar Date: Fri Dec 30 20:37:01 UTC 2022 Modified Files: src/sys/arch/evbarm/conf: KOBO NETWALKER Log Message: s/Cotroller/Controller/ To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/conf/KOBO cvs rdiff -u -r1.41 -r1.42 src/sys/arch/evbarm/conf/NETWALKER 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/KOBO diff -u src/sys/arch/evbarm/conf/KOBO:1.12 src/sys/arch/evbarm/conf/KOBO:1.13 --- src/sys/arch/evbarm/conf/KOBO:1.12 Tue Sep 29 19:58:50 2020 +++ src/sys/arch/evbarm/conf/KOBO Fri Dec 30 20:37:01 2022 @@ -1,4 +1,4 @@ -# $NetBSD: KOBO,v 1.12 2020/09/29 19:58:50 jmcneill Exp $ +# $NetBSD: KOBO,v 1.13 2022/12/30 20:37:01 andvar Exp $ # # KOBO -- http://kobo.com # @@ -55,7 +55,7 @@ cpu* at mainbus? # On-chip bus axi0 at mainbus? -# Interrupt Cotroller +# Interrupt Controller tzic0 at axi? addr 0x0fffc000 size 0x4000 irqbase 0 # Serial Index: src/sys/arch/evbarm/conf/NETWALKER diff -u src/sys/arch/evbarm/conf/NETWALKER:1.41 src/sys/arch/evbarm/conf/NETWALKER:1.42 --- src/sys/arch/evbarm/conf/NETWALKER:1.41 Tue Sep 29 19:58:50 2020 +++ src/sys/arch/evbarm/conf/NETWALKER Fri Dec 30 20:37:01 2022 @@ -1,4 +1,4 @@ -# $NetBSD: NETWALKER,v 1.41 2020/09/29 19:58:50 jmcneill Exp $ +# $NetBSD: NETWALKER,v 1.42 2022/12/30 20:37:01 andvar Exp $ # # NETWALKER -- http://www.sharp.co.jp/netwalker/ # @@ -48,7 +48,7 @@ cpu0 at mainbus? # On-chip bus axi0 at mainbus? -# Interrupt Cotroller +# Interrupt Controller tzic0 at axi? addr 0xe000 size 0x4000 irqbase 0 # Serial
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: andvar Date: Fri Dec 30 20:37:01 UTC 2022 Modified Files: src/sys/arch/evbarm/conf: KOBO NETWALKER Log Message: s/Cotroller/Controller/ To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/conf/KOBO cvs rdiff -u -r1.41 -r1.42 src/sys/arch/evbarm/conf/NETWALKER Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: nia Date: Sat Dec 24 15:46:50 UTC 2022 Modified Files: src/sys/arch/evbarm/conf: GENERIC64 Log Message: 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.207 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.207 --- src/sys/arch/evbarm/conf/GENERIC64:1.206 Sat Oct 29 13:59:57 2022 +++ src/sys/arch/evbarm/conf/GENERIC64 Sat Dec 24 15:46:50 2022 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC64,v 1.206 2022/10/29 13:59:57 jmcneill Exp $ +# $NetBSD: GENERIC64,v 1.207 2022/12/24 15:46:50 nia 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
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: nia Date: Sat Dec 24 15:46:50 UTC 2022 Modified Files: src/sys/arch/evbarm/conf: GENERIC64 Log Message: 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.207 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: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sat Nov 5 17:32:03 UTC 2022 Modified Files: src/sys/arch/evbarm/conf: GENERIC Log Message: Add cdnsiic and lmtemp To generate a diff of this commit: cvs rdiff -u -r1.113 -r1.114 src/sys/arch/evbarm/conf/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/GENERIC diff -u src/sys/arch/evbarm/conf/GENERIC:1.113 src/sys/arch/evbarm/conf/GENERIC:1.114 --- src/sys/arch/evbarm/conf/GENERIC:1.113 Mon Oct 31 22:45:38 2022 +++ src/sys/arch/evbarm/conf/GENERIC Sat Nov 5 17:32:03 2022 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC,v 1.113 2022/10/31 22:45:38 jmcneill Exp $ +# $NetBSD: GENERIC,v 1.114 2022/11/05 17:32:03 jmcneill Exp $ # # GENERIC ARM (aarch32) kernel # @@ -359,6 +359,7 @@ zynquart* at fdt? pass 4 # Cadence UAR # I2C controllers options I2C_MAX_ADDR=0xfff bsciic* at fdt? # Broadcom BCM283x Serial Control +cdnsiic* at fdt? pass 4 # Cadence I2C exyoi2c* at fdt? # Samsung Exynos I2C imxi2c* at fdt? pass 4 # i.MX I2C rkiic* at fdt? pass 4 # Rockchip I2C @@ -380,6 +381,7 @@ axppmic* at iic? # X-Powers AXP Power axpreg* at axppmic? dsrtc* at iic? # Dallas Semiconductor RTCs em3027rtc* at iic? +lmtemp* at iic? # National Semiconductor LM7x max77620pmic* at iic? pcaiicmux* at iic? # PCA954x / PCA984x I2C switch / mux pcf8563rtc* at iic? # PCF8563 RTC
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sat Nov 5 17:32:03 UTC 2022 Modified Files: src/sys/arch/evbarm/conf: GENERIC Log Message: Add cdnsiic and lmtemp To generate a diff of this commit: cvs rdiff -u -r1.113 -r1.114 src/sys/arch/evbarm/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Mon Oct 31 22:45:39 UTC 2022 Modified Files: src/sys/arch/evbarm/conf: GENERIC Log Message: Add micphy(4) To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/sys/arch/evbarm/conf/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/GENERIC diff -u src/sys/arch/evbarm/conf/GENERIC:1.112 src/sys/arch/evbarm/conf/GENERIC:1.113 --- src/sys/arch/evbarm/conf/GENERIC:1.112 Sat Oct 29 13:59:57 2022 +++ src/sys/arch/evbarm/conf/GENERIC Mon Oct 31 22:45:38 2022 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC,v 1.112 2022/10/29 13:59:57 jmcneill Exp $ +# $NetBSD: GENERIC,v 1.113 2022/10/31 22:45:38 jmcneill Exp $ # # GENERIC ARM (aarch32) kernel # @@ -327,6 +327,7 @@ inphy* at mii? phy ? # Intel 82555 PH iophy* at mii? phy ? # Intel 82553 PHYs lxtphy* at mii? phy ? # Level One LXT-970 PHYs makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs +micphy* at mii? phy ? # Micrel KSZ[89]xxx PHYs nsphy* at mii? phy ? # NS83840 PHYs nsphyter* at mii? phy ? # NS83843 PHYs pnaphy* at mii? phy ? # generic HomePNA PHYs
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Mon Oct 31 22:45:39 UTC 2022 Modified Files: src/sys/arch/evbarm/conf: GENERIC Log Message: Add micphy(4) To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/sys/arch/evbarm/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sat Oct 29 14:01:36 UTC 2022 Removed Files: src/sys/arch/evbarm/conf: files.virt mk.virt Log Message: GC unused files. To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/sys/arch/evbarm/conf/files.virt cvs rdiff -u -r1.2 -r0 src/sys/arch/evbarm/conf/mk.virt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sat Oct 29 14:01:36 UTC 2022 Removed Files: src/sys/arch/evbarm/conf: files.virt mk.virt Log Message: GC unused files. To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/sys/arch/evbarm/conf/files.virt cvs rdiff -u -r1.2 -r0 src/sys/arch/evbarm/conf/mk.virt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sat Oct 29 13:42:40 UTC 2022 Removed Files: src/sys/arch/evbarm/conf: files.devkit8000 Log Message: GC unused file To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/sys/arch/evbarm/conf/files.devkit8000 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sat Oct 29 13:42:40 UTC 2022 Removed Files: src/sys/arch/evbarm/conf: files.devkit8000 Log Message: GC unused file To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/sys/arch/evbarm/conf/files.devkit8000 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm
Module Name:src Committed By: jmcneill Date: Sat Oct 29 13:24:35 UTC 2022 Modified Files: src/sys/arch/evbarm/conf: README.evbarm Removed Files: src/sys/arch/evbarm/conf: TISDP2420 TISDP2420_INSTALL TISDP2430 files.tisdp24xx mk.tisdp24xx std.tisdp24xx src/sys/arch/evbarm/tisdp24xx: if_sm_gpmc.c sdp24xx.h sdp24xx_machdep.c sdp24xx_start.S Log Message: Remove support for TI OMAP 2420 and 2430 eval boards. This is part of the arch/arm/omap removal. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/conf/README.evbarm cvs rdiff -u -r1.43 -r0 src/sys/arch/evbarm/conf/TISDP2420 cvs rdiff -u -r1.2 -r0 src/sys/arch/evbarm/conf/TISDP2420_INSTALL cvs rdiff -u -r1.41 -r0 src/sys/arch/evbarm/conf/TISDP2430 cvs rdiff -u -r1.4 -r0 src/sys/arch/evbarm/conf/files.tisdp24xx cvs rdiff -u -r1.5 -r0 src/sys/arch/evbarm/conf/mk.tisdp24xx cvs rdiff -u -r1.11 -r0 src/sys/arch/evbarm/conf/std.tisdp24xx cvs rdiff -u -r1.6 -r0 src/sys/arch/evbarm/tisdp24xx/if_sm_gpmc.c cvs rdiff -u -r1.3 -r0 src/sys/arch/evbarm/tisdp24xx/sdp24xx.h cvs rdiff -u -r1.26 -r0 src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c cvs rdiff -u -r1.7 -r0 src/sys/arch/evbarm/tisdp24xx/sdp24xx_start.S 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/README.evbarm diff -u src/sys/arch/evbarm/conf/README.evbarm:1.38 src/sys/arch/evbarm/conf/README.evbarm:1.39 --- src/sys/arch/evbarm/conf/README.evbarm:1.38 Sat Oct 29 13:22:23 2022 +++ src/sys/arch/evbarm/conf/README.evbarm Sat Oct 29 13:24:35 2022 @@ -1,4 +1,4 @@ -$NetBSD: README.evbarm,v 1.38 2022/10/29 13:22:23 jmcneill Exp $ +$NetBSD: README.evbarm,v 1.39 2022/10/29 13:24:35 jmcneill Exp $ config date boards --- @@ -51,8 +51,6 @@ SMDK2410 2003/07/31 Samsung SMDK2410 S3C SMDK2800 2002/11/20 Samsung SMDK2800 S3C2800 eval board TEAMASA_NPWR 2002/02/07 Team ASA Npwr IOP310 based server appliance TEAMASA_NPWR_FC 2003/12/24 Team ASA NPWR-FC i80321 server appliance -TISDP2420 2008/04/27 TI OMAP 2420 eval board -TISDP2430 2008/04/27 TI OMAP 2430 eval board TS7200 2004/12/23 Technologic Systems TS-7200 board TWINTAIL 2005/02/26 Genetec corp. "Twintail" PXA255 eval board VIPER 2005/06/06 Arcom Viper PXA255 ARM board
CVS commit: src/sys/arch/evbarm
Module Name:src Committed By: jmcneill Date: Sat Oct 29 13:24:35 UTC 2022 Modified Files: src/sys/arch/evbarm/conf: README.evbarm Removed Files: src/sys/arch/evbarm/conf: TISDP2420 TISDP2420_INSTALL TISDP2430 files.tisdp24xx mk.tisdp24xx std.tisdp24xx src/sys/arch/evbarm/tisdp24xx: if_sm_gpmc.c sdp24xx.h sdp24xx_machdep.c sdp24xx_start.S Log Message: Remove support for TI OMAP 2420 and 2430 eval boards. This is part of the arch/arm/omap removal. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/conf/README.evbarm cvs rdiff -u -r1.43 -r0 src/sys/arch/evbarm/conf/TISDP2420 cvs rdiff -u -r1.2 -r0 src/sys/arch/evbarm/conf/TISDP2420_INSTALL cvs rdiff -u -r1.41 -r0 src/sys/arch/evbarm/conf/TISDP2430 cvs rdiff -u -r1.4 -r0 src/sys/arch/evbarm/conf/files.tisdp24xx cvs rdiff -u -r1.5 -r0 src/sys/arch/evbarm/conf/mk.tisdp24xx cvs rdiff -u -r1.11 -r0 src/sys/arch/evbarm/conf/std.tisdp24xx cvs rdiff -u -r1.6 -r0 src/sys/arch/evbarm/tisdp24xx/if_sm_gpmc.c cvs rdiff -u -r1.3 -r0 src/sys/arch/evbarm/tisdp24xx/sdp24xx.h cvs rdiff -u -r1.26 -r0 src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c cvs rdiff -u -r1.7 -r0 src/sys/arch/evbarm/tisdp24xx/sdp24xx_start.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm
Module Name:src Committed By: jmcneill Date: Sat Oct 29 13:22:23 UTC 2022 Modified Files: src/sys/arch/evbarm/conf: README.evbarm Removed Files: src/sys/arch/evbarm/conf: OSK5912 files.osk5912 mk.osk5912 std.osk5912 src/sys/arch/evbarm/osk5912: if_sm_emifs.c osk5912_machdep.c Log Message: Remove support for TI OMAP 5912 OSK board. This is part of the arch/arm/omap removal. To generate a diff of this commit: cvs rdiff -u -r1.35 -r0 src/sys/arch/evbarm/conf/OSK5912 cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbarm/conf/README.evbarm cvs rdiff -u -r1.2 -r0 src/sys/arch/evbarm/conf/files.osk5912 \ src/sys/arch/evbarm/conf/mk.osk5912 cvs rdiff -u -r1.6 -r0 src/sys/arch/evbarm/conf/std.osk5912 cvs rdiff -u -r1.5 -r0 src/sys/arch/evbarm/osk5912/if_sm_emifs.c cvs rdiff -u -r1.23 -r0 src/sys/arch/evbarm/osk5912/osk5912_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/README.evbarm diff -u src/sys/arch/evbarm/conf/README.evbarm:1.37 src/sys/arch/evbarm/conf/README.evbarm:1.38 --- src/sys/arch/evbarm/conf/README.evbarm:1.37 Sat Oct 29 13:18:57 2022 +++ src/sys/arch/evbarm/conf/README.evbarm Sat Oct 29 13:22:23 2022 @@ -1,4 +1,4 @@ -$NetBSD: README.evbarm,v 1.37 2022/10/29 13:18:57 jmcneill Exp $ +$NetBSD: README.evbarm,v 1.38 2022/10/29 13:22:23 jmcneill Exp $ config date boards --- @@ -43,7 +43,6 @@ OMAP5EVM 2013/07/16 TI OMAP 5 based boar OPENBLOCKS_A6 2012/08/01 Plat'Home. OpenBlockS A6 OPENBLOCKS_AX3 2013/09/30 Plat'Home. OpenBlockS AX3 OPENRD 2012/08/10 open-rd.org Marvell Orion board -OSK5912 2007/01/06 TI OMAP 5912 OSK board POGO 2016/05/12 CloudEngines Pogoplug NAS RPI 2012/07/26 Raspberry Pi RPI2 2015/03/04 Raspberry Pi 2
CVS commit: src/sys/arch/evbarm
Module Name:src Committed By: jmcneill Date: Sat Oct 29 13:22:23 UTC 2022 Modified Files: src/sys/arch/evbarm/conf: README.evbarm Removed Files: src/sys/arch/evbarm/conf: OSK5912 files.osk5912 mk.osk5912 std.osk5912 src/sys/arch/evbarm/osk5912: if_sm_emifs.c osk5912_machdep.c Log Message: Remove support for TI OMAP 5912 OSK board. This is part of the arch/arm/omap removal. To generate a diff of this commit: cvs rdiff -u -r1.35 -r0 src/sys/arch/evbarm/conf/OSK5912 cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbarm/conf/README.evbarm cvs rdiff -u -r1.2 -r0 src/sys/arch/evbarm/conf/files.osk5912 \ src/sys/arch/evbarm/conf/mk.osk5912 cvs rdiff -u -r1.6 -r0 src/sys/arch/evbarm/conf/std.osk5912 cvs rdiff -u -r1.5 -r0 src/sys/arch/evbarm/osk5912/if_sm_emifs.c cvs rdiff -u -r1.23 -r0 src/sys/arch/evbarm/osk5912/osk5912_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm
Module Name:src Committed By: jmcneill Date: Sat Oct 29 13:18:57 UTC 2022 Modified Files: src/sys/arch/evbarm/conf: README.evbarm Removed Files: src/sys/arch/evbarm/conf: HAWK files.hawk mk.hawk std.hawk src/sys/arch/evbarm/hawk: hawk.h hawk_machdep.c hawk_start.S Log Message: Remove support for TI OMAP-L138 based Hawkboard. This change is part of arch/arm/omap removal. To generate a diff of this commit: cvs rdiff -u -r1.9 -r0 src/sys/arch/evbarm/conf/HAWK cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbarm/conf/README.evbarm cvs rdiff -u -r1.2 -r0 src/sys/arch/evbarm/conf/files.hawk \ src/sys/arch/evbarm/conf/std.hawk cvs rdiff -u -r1.1 -r0 src/sys/arch/evbarm/conf/mk.hawk cvs rdiff -u -r1.1 -r0 src/sys/arch/evbarm/hawk/hawk.h \ src/sys/arch/evbarm/hawk/hawk_start.S cvs rdiff -u -r1.5 -r0 src/sys/arch/evbarm/hawk/hawk_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/README.evbarm diff -u src/sys/arch/evbarm/conf/README.evbarm:1.36 src/sys/arch/evbarm/conf/README.evbarm:1.37 --- src/sys/arch/evbarm/conf/README.evbarm:1.36 Sat Oct 29 13:10:25 2022 +++ src/sys/arch/evbarm/conf/README.evbarm Sat Oct 29 13:18:57 2022 @@ -1,4 +1,4 @@ -$NetBSD: README.evbarm,v 1.36 2022/10/29 13:10:25 jmcneill Exp $ +$NetBSD: README.evbarm,v 1.37 2022/10/29 13:18:57 jmcneill Exp $ config date boards --- @@ -15,7 +15,6 @@ GEMINI 2008/10/24 Cortina Systems SL351 GENERIC 2018/04/01 ARMv7 FDT based boards GENERIC64 2018/04/01 ARMv8 (aarch64) FDT based boards GUMSTIX 2006/10/16 Gumstix Inc. PXA255/270 based boards -HAWK 2013/10/02 TI OMAP-L138 based Hawkboard HDL_G 2006/04/16 I-O DATA HDL-G Giga LANDISK HPT5325 2012/03/31 HP t5325 Thin Client IMX23_OLINUXINO 2012/11/20 Olimex iMX233 based OLinuXino boards
CVS commit: src/sys/arch/evbarm
Module Name:src Committed By: jmcneill Date: Sat Oct 29 13:18:57 UTC 2022 Modified Files: src/sys/arch/evbarm/conf: README.evbarm Removed Files: src/sys/arch/evbarm/conf: HAWK files.hawk mk.hawk std.hawk src/sys/arch/evbarm/hawk: hawk.h hawk_machdep.c hawk_start.S Log Message: Remove support for TI OMAP-L138 based Hawkboard. This change is part of arch/arm/omap removal. To generate a diff of this commit: cvs rdiff -u -r1.9 -r0 src/sys/arch/evbarm/conf/HAWK cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbarm/conf/README.evbarm cvs rdiff -u -r1.2 -r0 src/sys/arch/evbarm/conf/files.hawk \ src/sys/arch/evbarm/conf/std.hawk cvs rdiff -u -r1.1 -r0 src/sys/arch/evbarm/conf/mk.hawk cvs rdiff -u -r1.1 -r0 src/sys/arch/evbarm/hawk/hawk.h \ src/sys/arch/evbarm/hawk/hawk_start.S cvs rdiff -u -r1.5 -r0 src/sys/arch/evbarm/hawk/hawk_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm
Module Name:src Committed By: jmcneill Date: Sat Oct 29 13:14:38 UTC 2022 Modified Files: src/sys/arch/evbarm: Makefile Removed Files: src/sys/arch/evbarm/devkit8000: if_dme_gpmc.c Log Message: GC unused files. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/Makefile cvs rdiff -u -r1.3 -r0 src/sys/arch/evbarm/devkit8000/if_dme_gpmc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm
Module Name:src
Committed By: jmcneill
Date: Sat Oct 29 13:14:38 UTC 2022
Modified Files:
src/sys/arch/evbarm: Makefile
Removed Files:
src/sys/arch/evbarm/devkit8000: if_dme_gpmc.c
Log Message:
GC unused files.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/Makefile
cvs rdiff -u -r1.3 -r0 src/sys/arch/evbarm/devkit8000/if_dme_gpmc.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/Makefile
diff -u src/sys/arch/evbarm/Makefile:1.12 src/sys/arch/evbarm/Makefile:1.13
--- src/sys/arch/evbarm/Makefile:1.12 Sat Oct 29 08:33:45 2022
+++ src/sys/arch/evbarm/Makefile Sat Oct 29 13:14:38 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2022/10/29 08:33:45 jmcneill Exp $
+# $NetBSD: Makefile,v 1.13 2022/10/29 13:14:38 jmcneill Exp $
# Makefile for evbarm tags file and boot blocks
@@ -10,7 +10,6 @@ SEVBARM= ${SYSDIR}/arch/evbarm/adi_brh/*
SEVBARM+= ${SYSDIR}/arch/evbarm/armadillo/*.[ch]
SEVBARM+= ${SYSDIR}/arch/evbarm/cp3100/*.[ch]
SEVBARM+= ${SYSDIR}/arch/evbarm/dev/*.[ch]
-SEVBARM+= ${SYSDIR}/arch/evbarm/devkit8000/*.[ch]
SEVBARM+= ${SYSDIR}/arch/evbarm/evbarm/*.[ch]
SEVBARM+= ${SYSDIR}/arch/evbarm/g42xxeb/*.[ch]
SEVBARM+= ${SYSDIR}/arch/evbarm/gemini/*.[ch]
CVS commit: src/sys/arch/evbarm/exynos
Module Name:src Committed By: jmcneill Date: Sat Oct 29 08:43:51 UTC 2022 Removed Files: src/sys/arch/evbarm/exynos: platform.h Log Message: GC unused file To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 src/sys/arch/evbarm/exynos/platform.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/evbarm/exynos
Module Name:src Committed By: jmcneill Date: Sat Oct 29 08:43:51 UTC 2022 Removed Files: src/sys/arch/evbarm/exynos: platform.h Log Message: GC unused file To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 src/sys/arch/evbarm/exynos/platform.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/evbarm/ti
Module Name:src Committed By: jmcneill Date: Sat Oct 29 08:42:41 UTC 2022 Removed Files: src/sys/arch/evbarm/ti: genassym.cf Log Message: GC unused file To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/sys/arch/evbarm/ti/genassym.cf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/ti
Module Name:src Committed By: jmcneill Date: Sat Oct 29 08:42:41 UTC 2022 Removed Files: src/sys/arch/evbarm/ti: genassym.cf Log Message: GC unused file To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/sys/arch/evbarm/ti/genassym.cf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
