Module Name: src
Committed By: andvar
Date: Tue Feb 20 23:36:02 UTC 2024
Modified Files:
src/sys/arch/arm/at91: at91bus.c
src/sys/arch/evbarm/adi_brh: brh_machdep.c
src/sys/arch/evbarm/armadillo: armadillo9_machdep.c
src/sys/arch/evbarm/g42xxeb: g42xxeb_machdep.c
src/sys/arch/evbarm/iq80310: iq80310_machdep.c
src/sys/arch/evbarm/iyonix: iyonix_machdep.c
src/sys/arch/evbarm/lubbock: lubbock_machdep.c
src/sys/arch/evbarm/mini2440: mini2440_machdep.c
src/sys/arch/evbarm/npwr_fc: npwr_fc_machdep.c
src/sys/arch/evbarm/smdk2xx0: smdk2410_machdep.c smdk2800_machdep.c
src/sys/arch/evbarm/tsarm: tsarm_machdep.c
src/sys/arch/evbarm/viper: viper_machdep.c
Log Message:
Fix format specifier for physmem from %d to 0x%"PRIxPSIZE" in multiple places.
Should fix VERBOSE_INIT_ARM for various evbarm kernel configs.
Also add 0x prefix in few previously fixed places to improve readability.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/at91/at91bus.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/evbarm/adi_brh/brh_machdep.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
cvs rdiff -u -r1.96 -r1.97 src/sys/arch/evbarm/iq80310/iq80310_machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/iyonix/iyonix_machdep.c
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/evbarm/lubbock/lubbock_machdep.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/mini2440/mini2440_machdep.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbarm/tsarm/tsarm_machdep.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/viper/viper_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/arm/at91/at91bus.c
diff -u src/sys/arch/arm/at91/at91bus.c:1.29 src/sys/arch/arm/at91/at91bus.c:1.30
--- src/sys/arch/arm/at91/at91bus.c:1.29 Sat Aug 7 16:18:43 2021
+++ src/sys/arch/arm/at91/at91bus.c Tue Feb 20 23:36:01 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: at91bus.c,v 1.29 2021/08/07 16:18:43 thorpej Exp $ */
+/* $NetBSD: at91bus.c,v 1.30 2024/02/20 23:36:01 andvar Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.29 2021/08/07 16:18:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.30 2024/02/20 23:36:01 andvar Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -260,7 +260,7 @@ at91bus_setup(BootConfig *mem)
physmem = (physical_end - physical_start) / PAGE_SIZE;
#ifdef VERBOSE_INIT_ARM
- printf("physmemory: %d pages at 0x%08lx -> 0x%08lx\n", physmem,
+ printf("physmemory: 0x%"PRIxPSIZE" pages at 0x%08lx -> 0x%08lx\n", physmem,
physical_start, physical_end - 1);
#endif
Index: src/sys/arch/evbarm/adi_brh/brh_machdep.c
diff -u src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.55 src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.56
--- src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.55 Tue Dec 26 09:56:45 2023
+++ src/sys/arch/evbarm/adi_brh/brh_machdep.c Tue Feb 20 23:36:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: brh_machdep.c,v 1.55 2023/12/26 09:56:45 andvar Exp $ */
+/* $NetBSD: brh_machdep.c,v 1.56 2024/02/20 23:36:02 andvar Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.55 2023/12/26 09:56:45 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.56 2024/02/20 23:36:02 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: %"PRIxPSIZE" pages at "
+ printf("physmemory: 0x%"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.40 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.41
--- src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.40 Tue Dec 26 09:56:44 2023
+++ src/sys/arch/evbarm/armadillo/armadillo9_machdep.c Tue Feb 20 23:36:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: armadillo9_machdep.c,v 1.40 2023/12/26 09:56:44 andvar Exp $ */
+/* $NetBSD: armadillo9_machdep.c,v 1.41 2024/02/20 23:36:02 andvar Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -110,7 +110,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.40 2023/12/26 09:56:44 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.41 2024/02/20 23:36:02 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: %"PRIxPSIZE" pages at "
+ printf("physmemory: 0x%"PRIxPSIZE" pages at "
"0x%08"PRIxPADDR" -> 0x%08"PRIxPADDR"\n",
physmem, physical_start, physical_end - 1);
#endif
Index: src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.41 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.42
--- src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.41 Thu Oct 12 11:33:37 2023
+++ src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c Tue Feb 20 23:36:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: g42xxeb_machdep.c,v 1.41 2023/10/12 11:33:37 skrll Exp $ */
+/* $NetBSD: g42xxeb_machdep.c,v 1.42 2024/02/20 23:36:02 andvar Exp $ */
/*
* Copyright (c) 2002, 2003, 2004, 2005 Genetec Corporation.
@@ -516,7 +516,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: 0x%"PRIxPSIZE" pages at 0x%08lx -> 0x%08lx\n", physmem,
physical_start, physical_end - 1);
#endif
Index: src/sys/arch/evbarm/iq80310/iq80310_machdep.c
diff -u src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.96 src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.97
--- src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.96 Thu Oct 12 11:33:38 2023
+++ src/sys/arch/evbarm/iq80310/iq80310_machdep.c Tue Feb 20 23:36:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80310_machdep.c,v 1.96 2023/10/12 11:33:38 skrll Exp $ */
+/* $NetBSD: iq80310_machdep.c,v 1.97 2024/02/20 23:36:02 andvar Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.96 2023/10/12 11:33:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.97 2024/02/20 23:36:02 andvar Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -409,7 +409,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: 0x%"PRIxPSIZE" pages at 0x%08lx -> 0x%08lx\n", physmem,
physical_start, physical_end - 1);
#endif
Index: src/sys/arch/evbarm/iyonix/iyonix_machdep.c
diff -u src/sys/arch/evbarm/iyonix/iyonix_machdep.c:1.5 src/sys/arch/evbarm/iyonix/iyonix_machdep.c:1.6
--- src/sys/arch/evbarm/iyonix/iyonix_machdep.c:1.5 Thu Oct 12 11:33:38 2023
+++ src/sys/arch/evbarm/iyonix/iyonix_machdep.c Tue Feb 20 23:36:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: iyonix_machdep.c,v 1.5 2023/10/12 11:33:38 skrll Exp $ */
+/* $NetBSD: iyonix_machdep.c,v 1.6 2024/02/20 23:36:02 andvar Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.5 2023/10/12 11:33:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.6 2024/02/20 23:36:02 andvar Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -518,7 +518,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: 0x%"PRIxPSIZE" pages at 0x%08lx -> 0x%08lx\n", physmem,
physical_start, physical_end - 1);
#endif
Index: src/sys/arch/evbarm/lubbock/lubbock_machdep.c
diff -u src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.45 src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.46
--- src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.45 Thu Oct 12 11:33:38 2023
+++ src/sys/arch/evbarm/lubbock/lubbock_machdep.c Tue Feb 20 23:36:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: lubbock_machdep.c,v 1.45 2023/10/12 11:33:38 skrll Exp $ */
+/* $NetBSD: lubbock_machdep.c,v 1.46 2024/02/20 23:36:02 andvar Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -112,7 +112,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.45 2023/10/12 11:33:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.46 2024/02/20 23:36:02 andvar Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -592,7 +592,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: 0x%"PRIxPSIZE" pages at 0x%08lx -> 0x%08lx\n", physmem,
physical_start, physical_end - 1);
#endif
Index: src/sys/arch/evbarm/mini2440/mini2440_machdep.c
diff -u src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.21 src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.22
--- src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.21 Mon Jun 19 03:52:50 2023
+++ src/sys/arch/evbarm/mini2440/mini2440_machdep.c Tue Feb 20 23:36:02 2024
@@ -131,7 +131,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mini2440_machdep.c,v 1.21 2023/06/19 03:52:50 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mini2440_machdep.c,v 1.22 2024/02/20 23:36:02 andvar Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -551,7 +551,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: 0x%"PRIxPSIZE" pages at 0x%08lx -> 0x%08lx\n", physmem,
physical_start, physical_end - 1);
printf("phys_end: 0x%08lx\n", physical_end);
#endif
Index: src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
diff -u src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.31 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.32
--- src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.31 Fri Feb 9 22:08:32 2024
+++ src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c Tue Feb 20 23:36:01 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: npwr_fc_machdep.c,v 1.31 2024/02/09 22:08:32 andvar Exp $ */
+/* $NetBSD: npwr_fc_machdep.c,v 1.32 2024/02/20 23:36:01 andvar Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.31 2024/02/09 22:08:32 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.32 2024/02/20 23:36:01 andvar Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -418,7 +418,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: 0x%"PRIxPSIZE" pages at 0x%08lx -> 0x%08lx\n", physmem,
physical_start, physical_end - 1);
#endif
Index: src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
diff -u src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.46 src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.47
--- src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.46 Thu Apr 20 08:28:05 2023
+++ src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c Tue Feb 20 23:36:01 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: smdk2410_machdep.c,v 1.46 2023/04/20 08:28:05 skrll Exp $ */
+/* $NetBSD: smdk2410_machdep.c,v 1.47 2024/02/20 23:36:01 andvar Exp $ */
/*
* Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.46 2023/04/20 08:28:05 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.47 2024/02/20 23:36:01 andvar Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -541,7 +541,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: 0x%"PRIxPSIZE" pages at 0x%08lx -> 0x%08lx\n", physmem,
physical_start, physical_end - 1);
#endif
Index: src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
diff -u src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.51 src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.52
--- src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.51 Thu Apr 20 08:28:05 2023
+++ src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c Tue Feb 20 23:36:01 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: smdk2800_machdep.c,v 1.51 2023/04/20 08:28:05 skrll Exp $ */
+/* $NetBSD: smdk2800_machdep.c,v 1.52 2024/02/20 23:36:01 andvar Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Fujitsu Component Limited
@@ -106,7 +106,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.51 2023/04/20 08:28:05 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.52 2024/02/20 23:36:01 andvar Exp $");
#include "opt_ddb.h"
#include "opt_console.h"
@@ -452,7 +452,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: 0x%"PRIxPSIZE" pages at 0x%08lx -> 0x%08lx\n", physmem,
physical_start, physical_end - 1);
#endif
Index: src/sys/arch/evbarm/tsarm/tsarm_machdep.c
diff -u src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.36 src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.37
--- src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.36 Tue May 2 09:49:33 2023
+++ src/sys/arch/evbarm/tsarm/tsarm_machdep.c Tue Feb 20 23:36:01 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: tsarm_machdep.c,v 1.36 2023/05/02 09:49:33 jmcneill Exp $ */
+/* $NetBSD: tsarm_machdep.c,v 1.37 2024/02/20 23:36:01 andvar Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsarm_machdep.c,v 1.36 2023/05/02 09:49:33 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsarm_machdep.c,v 1.37 2024/02/20 23:36:01 andvar Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -443,7 +443,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: 0x%"PRIxPSIZE" pages at 0x%08lx -> 0x%08lx\n", physmem,
physical_start, physical_end - 1);
#endif
Index: src/sys/arch/evbarm/viper/viper_machdep.c
diff -u src/sys/arch/evbarm/viper/viper_machdep.c:1.34 src/sys/arch/evbarm/viper/viper_machdep.c:1.35
--- src/sys/arch/evbarm/viper/viper_machdep.c:1.34 Thu Oct 12 11:33:38 2023
+++ src/sys/arch/evbarm/viper/viper_machdep.c Tue Feb 20 23:36:01 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: viper_machdep.c,v 1.34 2023/10/12 11:33:38 skrll Exp $ */
+/* $NetBSD: viper_machdep.c,v 1.35 2024/02/20 23:36:01 andvar Exp $ */
/*
* Startup routines for the Arcom Viper. Below you can trace the
@@ -112,7 +112,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.34 2023/10/12 11:33:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.35 2024/02/20 23:36:01 andvar Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -458,7 +458,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: 0x%"PRIxPSIZE" pages at 0x%08lx -> 0x%08lx\n", physmem,
physical_start, physical_end - 1);
#endif
