Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/arm/samsung Build fixes.
details: https://anonhg.NetBSD.org/src/rev/3215a6f86858
branches: trunk
changeset: 372172:3215a6f86858
user: jmcneill <jmcneill%NetBSD.org@localhost>
date: Sat Oct 29 13:29:46 2022 +0000
description:
Build fixes.
diffstat:
sys/arch/arm/samsung/exynos_platform.c | 8 ++++----
sys/arch/arm/samsung/exynos_soc.c | 9 +++++----
2 files changed, 9 insertions(+), 8 deletions(-)
diffs (66 lines):
diff -r c64a9fdd78e3 -r 3215a6f86858 sys/arch/arm/samsung/exynos_platform.c
--- a/sys/arch/arm/samsung/exynos_platform.c Sat Oct 29 13:24:35 2022 +0000
+++ b/sys/arch/arm/samsung/exynos_platform.c Sat Oct 29 13:29:46 2022 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
#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>
diff -r c64a9fdd78e3 -r 3215a6f86858 sys/arch/arm/samsung/exynos_soc.c
--- a/sys/arch/arm/samsung/exynos_soc.c Sat Oct 29 13:24:35 2022 +0000
+++ b/sys/arch/arm/samsung/exynos_soc.c Sat Oct 29 13:29:46 2022 +0000
@@ -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 @@
#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 */
Home |
Main Index |
Thread Index |
Old Index