Module Name: src
Committed By: jmcneill
Date: Sat Oct 29 13:29:47 UTC 2022
Modified Files:
src/sys/arch/arm/samsung: exynos_platform.c exynos_soc.c
Log Message:
Build fixes.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/arm/samsung/exynos_platform.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/arm/samsung/exynos_soc.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/samsung/exynos_platform.c
diff -u src/sys/arch/arm/samsung/exynos_platform.c:1.38 src/sys/arch/arm/samsung/exynos_platform.c:1.39
--- src/sys/arch/arm/samsung/exynos_platform.c:1.38 Sat Apr 24 23:36:28 2021
+++ src/sys/arch/arm/samsung/exynos_platform.c Sat Oct 29 13:29:46 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_platform.c,v 1.38 2021/04/24 23:36:28 thorpej Exp $ */
+/* $NetBSD: exynos_platform.c,v 1.39 2022/10/29 13:29:46 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <jmcne...@invisible.ca>
@@ -35,15 +35,15 @@
#include "ukbd.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.38 2021/04/24 23:36:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.39 2022/10/29 13:29:46 jmcneill Exp $");
+#define EXYNOS_CORE_VBASE KERNEL_IO_VBASE
/*
* Booting a CA7 core on Exynos5422 is currently broken, disable starting CA7 secondaries.
*/
#define EXYNOS5422_DISABLE_CA7_CLUSTER
-
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/cpu.h>
@@ -62,7 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: exynos_platf
#include <arm/samsung/mct_var.h>
#include <arm/samsung/sscom_reg.h>
-#include <evbarm/exynos/platform.h>
+#include <evbarm/fdt/platform.h>
#include <evbarm/fdt/machdep.h>
#include <arm/fdt/arm_fdtvar.h>
Index: src/sys/arch/arm/samsung/exynos_soc.c
diff -u src/sys/arch/arm/samsung/exynos_soc.c:1.40 src/sys/arch/arm/samsung/exynos_soc.c:1.41
--- src/sys/arch/arm/samsung/exynos_soc.c:1.40 Sun Sep 19 10:34:08 2021
+++ src/sys/arch/arm/samsung/exynos_soc.c Sat Oct 29 13:29:46 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_soc.c,v 1.40 2021/09/19 10:34:08 andvar Exp $ */
+/* $NetBSD: exynos_soc.c,v 1.41 2022/10/29 13:29:46 jmcneill Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include "opt_exynos.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_soc.c,v 1.40 2021/09/19 10:34:08 andvar Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_soc.c,v 1.41 2022/10/29 13:29:46 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -58,8 +58,9 @@ __KERNEL_RCSID(1, "$NetBSD: exynos_soc.c
#include <arm/cortex/pl310_var.h>
#include <arm/cortex/pl310_reg.h>
-/* XXXNH */
-#include <evbarm/exynos/platform.h>
+#include <evbarm/fdt/platform.h>
+
+#define EXYNOS_CORE_VBASE KERNEL_IO_VBASE
/* these variables are retrieved in start.S and stored in .data */
