Module Name: src
Committed By: martin
Date: Sun Feb 18 16:19:57 UTC 2024
Modified Files:
src/sys/arch/arm/broadcom [netbsd-10]: bcm53xx_eth.c bcm53xx_pax.c
src/sys/arch/evbarm/conf [netbsd-10]: std.bcm53xx
Log Message:
Pull up following revision(s) (requested by skrll in ticket #597):
sys/arch/evbarm/conf/std.bcm53xx: revision 1.21
sys/arch/arm/broadcom/bcm53xx_eth.c: revision 1.43
sys/arch/arm/broadcom/bcm53xx_pax.c: revision 1.23
Define KERNEL_VOFFSET_RUNTIME=1 to fix build of BCM5301X and BCM56340
Fix non-DIAGNOSTIC build
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.42.4.1 src/sys/arch/arm/broadcom/bcm53xx_eth.c
cvs rdiff -u -r1.22.6.1 -r1.22.6.2 src/sys/arch/arm/broadcom/bcm53xx_pax.c
cvs rdiff -u -r1.20 -r1.20.28.1 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/arm/broadcom/bcm53xx_eth.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.42 src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.42.4.1
--- src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.42 Sat Sep 17 19:41:18 2022
+++ src/sys/arch/arm/broadcom/bcm53xx_eth.c Sun Feb 18 16:19:57 2024
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.42 2022/09/17 19:41:18 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.42.4.1 2024/02/18 16:19:57 martin Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -252,9 +252,7 @@ bcmeth_ccb_match(device_t parent, cfdata
if (strcmp(cf->cf_name, loc->loc_name))
return 0;
-#ifdef DIAGNOSTIC
- const int port = cf->cf_loc[BCMCCBCF_PORT];
-#endif
+ const int port __diagused = cf->cf_loc[BCMCCBCF_PORT];
KASSERT(port == BCMCCBCF_PORT_DEFAULT || port == loc->loc_port);
return 1;
Index: src/sys/arch/arm/broadcom/bcm53xx_pax.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_pax.c:1.22.6.1 src/sys/arch/arm/broadcom/bcm53xx_pax.c:1.22.6.2
--- src/sys/arch/arm/broadcom/bcm53xx_pax.c:1.22.6.1 Fri Feb 16 12:07:08 2024
+++ src/sys/arch/arm/broadcom/bcm53xx_pax.c Sun Feb 18 16:19:57 2024
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_pax.c,v 1.22.6.1 2024/02/16 12:07:08 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_pax.c,v 1.22.6.2 2024/02/18 16:19:57 martin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -136,9 +136,7 @@ bcmpax_ccb_match(device_t parent, cfdata
if (strcmp(cf->cf_name, loc->loc_name))
return 0;
-#ifdef DIAGNOSTIC
- const int port = cf->cf_loc[BCMCCBCF_PORT];
-#endif
+ const int port __diagused = cf->cf_loc[BCMCCBCF_PORT];
KASSERT(port == BCMCCBCF_PORT_DEFAULT || port == loc->loc_port);
return 1;
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.20.28.1
--- src/sys/arch/evbarm/conf/std.bcm53xx:1.20 Sat May 18 08:49:23 2019
+++ src/sys/arch/evbarm/conf/std.bcm53xx Sun Feb 18 16:19:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: std.bcm53xx,v 1.20 2019/05/18 08:49:23 skrll Exp $
+# $NetBSD: std.bcm53xx,v 1.20.28.1 2024/02/18 16:19:56 martin 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="0x80100000"
makeoptions LOADADDRESS="0x00100000"
