Module Name: src
Committed By: rin
Date: Fri Jan 29 13:10:08 UTC 2021
Modified Files:
src/sys/arch/arm/altera: cycv_platform.c
src/sys/arch/arm/amlogic: meson_platform.c
src/sys/arch/arm/nxp: imx6_platform.c
src/sys/arch/arm/ti: ti_gpio.c
Log Message:
Fix build without MULTIPROCESSOR.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/altera/cycv_platform.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/amlogic/meson_platform.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nxp/imx6_platform.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/ti/ti_gpio.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/altera/cycv_platform.c
diff -u src/sys/arch/arm/altera/cycv_platform.c:1.15 src/sys/arch/arm/altera/cycv_platform.c:1.16
--- src/sys/arch/arm/altera/cycv_platform.c:1.15 Fri Nov 27 07:11:49 2020
+++ src/sys/arch/arm/altera/cycv_platform.c Fri Jan 29 13:10:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cycv_platform.c,v 1.15 2020/11/27 07:11:49 skrll Exp $ */
+/* $NetBSD: cycv_platform.c,v 1.16 2021/01/29 13:10:07 rin Exp $ */
/* This file is in the public domain. */
@@ -7,7 +7,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cycv_platform.c,v 1.15 2020/11/27 07:11:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cycv_platform.c,v 1.16 2021/01/29 13:10:07 rin Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -79,10 +79,12 @@ cycv_platform_bootstrap(void)
static int
cycv_mpstart(void)
{
+ int ret = 0;
+
+#ifdef MULTIPROCESSOR
bus_space_tag_t bst = &armv7_generic_bs_tag;
bus_space_handle_t bsh_rst;
bus_space_handle_t bsh_scu;
- int ret = 0;
bus_space_map(bst, CYCV_RSTMGR_BASE, CYCV_RSTMGR_SIZE, 0, &bsh_rst);
bus_space_map(bst, CYCV_SCU_BASE, CYCV_SCU_SIZE, 0, &bsh_scu);
@@ -123,6 +125,7 @@ cycv_mpstart(void)
aprint_error("cpu%d: WARNING: AP failed to start\n", 1);
ret++;
}
+#endif
return ret;
}
Index: src/sys/arch/arm/amlogic/meson_platform.c
diff -u src/sys/arch/arm/amlogic/meson_platform.c:1.16 src/sys/arch/arm/amlogic/meson_platform.c:1.17
--- src/sys/arch/arm/amlogic/meson_platform.c:1.16 Mon Sep 28 11:54:22 2020
+++ src/sys/arch/arm/amlogic/meson_platform.c Fri Jan 29 13:10:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: meson_platform.c,v 1.16 2020/09/28 11:54:22 jmcneill Exp $ */
+/* $NetBSD: meson_platform.c,v 1.17 2021/01/29 13:10:07 rin Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <jmcne...@invisible.ca>
@@ -33,7 +33,7 @@
#include "arml2cc.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: meson_platform.c,v 1.16 2020/09/28 11:54:22 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: meson_platform.c,v 1.17 2021/01/29 13:10:07 rin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -319,16 +319,19 @@ meson8b_platform_reset(void)
}
}
+#ifdef MULTIPROCESSOR
static void
meson8b_mpinit_delay(u_int n)
{
for (volatile int i = 0; i < n; i++)
;
}
+#endif
static int
cpu_enable_meson8b(int phandle)
{
+#ifdef MULTIPROCESSOR
const bus_addr_t cbar = armreg_cbar_read();
bus_space_tag_t bst = &arm_generic_bs_tag;
@@ -396,6 +399,7 @@ cpu_enable_meson8b(int phandle)
uint32_t ctrl = bus_space_read_4(bst, cpuconf_bsh, MESON8B_SRAM_CPUCONF_CTRL_REG);
ctrl |= __BITS(cpuno,0);
bus_space_write_4(bst, cpuconf_bsh, MESON8B_SRAM_CPUCONF_CTRL_REG, ctrl);
+#endif
return 0;
}
Index: src/sys/arch/arm/nxp/imx6_platform.c
diff -u src/sys/arch/arm/nxp/imx6_platform.c:1.2 src/sys/arch/arm/nxp/imx6_platform.c:1.3
--- src/sys/arch/arm/nxp/imx6_platform.c:1.2 Wed Jan 27 03:10:20 2021
+++ src/sys/arch/arm/nxp/imx6_platform.c Fri Jan 29 13:10:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_platform.c,v 1.2 2021/01/27 03:10:20 thorpej Exp $ */
+/* $NetBSD: imx6_platform.c,v 1.3 2021/01/29 13:10:07 rin Exp $ */
/*-
* Copyright (c) 2019 Genetec Corporation. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_platform.c,v 1.2 2021/01/27 03:10:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_platform.c,v 1.3 2021/01/29 13:10:07 rin Exp $");
#include "arml2cc.h"
#include "opt_console.h"
@@ -191,6 +191,8 @@ imx_platform_mpstart(void)
bus_space_unmap(bst, bsh, AIPS1_SRC_SIZE);
return arm_fdt_cpu_mpstart();
+#else
+ return 0;
#endif
}
Index: src/sys/arch/arm/ti/ti_gpio.c
diff -u src/sys/arch/arm/ti/ti_gpio.c:1.11 src/sys/arch/arm/ti/ti_gpio.c:1.12
--- src/sys/arch/arm/ti/ti_gpio.c:1.11 Fri Jan 29 13:07:32 2021
+++ src/sys/arch/arm/ti/ti_gpio.c Fri Jan 29 13:10:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_gpio.c,v 1.11 2021/01/29 13:07:32 rin Exp $ */
+/* $NetBSD: ti_gpio.c,v 1.12 2021/01/29 13:10:07 rin Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ti_gpio.c,v 1.11 2021/01/29 13:07:32 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_gpio.c,v 1.12 2021/01/29 13:10:07 rin Exp $");
#include <sys/param.h>
#include <sys/bitops.h>
@@ -36,6 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: ti_gpio.c,v
#include <sys/gpio.h>
#include <sys/intr.h>
#include <sys/kmem.h>
+#include <sys/lwp.h>
#include <sys/mutex.h>
#include <sys/systm.h>
