Module Name: src
Committed By: jmcneill
Date: Sun Jul 8 11:37:50 UTC 2018
Modified Files:
src/sys/arch/arm/nvidia: files.tegra tegra_platform.c
Removed Files:
src/sys/arch/arm/nvidia: soc_tegra210.c
Log Message:
Use psci_fdt_bootstrap for MP spinup on Tegra210.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/arm/nvidia/files.tegra
cvs rdiff -u -r1.2 -r0 src/sys/arch/arm/nvidia/soc_tegra210.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/nvidia/tegra_platform.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/nvidia/files.tegra
diff -u src/sys/arch/arm/nvidia/files.tegra:1.48 src/sys/arch/arm/nvidia/files.tegra:1.49
--- src/sys/arch/arm/nvidia/files.tegra:1.48 Sun Apr 1 04:35:04 2018
+++ src/sys/arch/arm/nvidia/files.tegra Sun Jul 8 11:37:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.tegra,v 1.48 2018/04/01 04:35:04 ryo Exp $
+# $NetBSD: files.tegra,v 1.49 2018/07/08 11:37:50 jmcneill Exp $
#
# Configuration info for NVIDIA Tegra ARM Peripherals
#
@@ -13,9 +13,6 @@ device tegra124cpu
attach tegra124cpu at cpu with tegra124_cpu
file arch/arm/nvidia/tegra124_cpu.c tegra124_cpu
-# Tegra T210 (X1) support
-file arch/arm/nvidia/soc_tegra210.c soc_tegra210
-
# Interrupt controller
device tegralic
attach tegralic at fdt with tegra_lic
Index: src/sys/arch/arm/nvidia/tegra_platform.c
diff -u src/sys/arch/arm/nvidia/tegra_platform.c:1.12 src/sys/arch/arm/nvidia/tegra_platform.c:1.13
--- src/sys/arch/arm/nvidia/tegra_platform.c:1.12 Sat Jul 7 20:16:16 2018
+++ src/sys/arch/arm/nvidia/tegra_platform.c Sun Jul 8 11:37:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_platform.c,v 1.12 2018/07/07 20:16:16 jmcneill Exp $ */
+/* $NetBSD: tegra_platform.c,v 1.13 2018/07/08 11:37:50 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <jmcne...@invisible.ca>
@@ -33,7 +33,7 @@
#include "ukbd.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_platform.c,v 1.12 2018/07/07 20:16:16 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_platform.c,v 1.13 2018/07/08 11:37:50 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -108,8 +108,8 @@ tegra210_platform_bootstrap(void)
{
tegra_bootstrap();
-#ifdef MULTIPROCESSOR
- tegra210_mpinit();
+#if defined(MULTIPROCESSOR) && defined(__aarch64__)
+ psci_fdt_bootstrap();
#endif
}
#endif
