Module Name: src
Committed By: aymeric
Date: Thu Nov 22 21:08:19 UTC 2018
Modified Files:
src/sys/arch/arm/altera: files.altera
src/sys/arch/arm/cortex: a9tmr.c
src/sys/arch/evbarm/conf: GENERIC files.generic
Removed Files:
src/sys/arch/evbarm/conf: NANOSOC
Log Message:
Switch the DE0 Nano SoC to the GENERIC kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/altera/files.altera
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/cortex/a9tmr.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/GENERIC
cvs rdiff -u -r1.4 -r0 src/sys/arch/evbarm/conf/NANOSOC
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/files.generic
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/files.altera
diff -u src/sys/arch/arm/altera/files.altera:1.1 src/sys/arch/arm/altera/files.altera:1.2
--- src/sys/arch/arm/altera/files.altera:1.1 Wed Sep 19 17:31:38 2018
+++ src/sys/arch/arm/altera/files.altera Thu Nov 22 21:08:19 2018
@@ -1,17 +1,8 @@
-# $NetBSD: files.altera,v 1.1 2018/09/19 17:31:38 aymeric Exp $
+# $NetBSD: files.altera,v 1.2 2018/11/22 21:08:19 aymeric Exp $
#
# Configuration for Altera SoC
#
-file arch/arm/arm32/arm32_boot.c
-file arch/arm/arm32/arm32_kvminit.c
-file arch/arm/arm32/arm32_reboot.c
-file arch/arm/arm32/irq_dispatch.S
-
-file arch/arm/arm32/armv7_generic_space.c
-file arch/arm/arm/arm_generic_dma.c
-file arch/arm/arm/bus_space_a4x.S
-
file arch/arm/altera/cycv_platform.c
device cycvfdt : bus_space_generic, fdtbus
Index: src/sys/arch/arm/cortex/a9tmr.c
diff -u src/sys/arch/arm/cortex/a9tmr.c:1.18 src/sys/arch/arm/cortex/a9tmr.c:1.19
--- src/sys/arch/arm/cortex/a9tmr.c:1.18 Sun Oct 28 21:08:13 2018
+++ src/sys/arch/arm/cortex/a9tmr.c Thu Nov 22 21:08:19 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: a9tmr.c,v 1.18 2018/10/28 21:08:13 aymeric Exp $ */
+/* $NetBSD: a9tmr.c,v 1.19 2018/11/22 21:08:19 aymeric Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: a9tmr.c,v 1.18 2018/10/28 21:08:13 aymeric Exp $");
+__KERNEL_RCSID(0, "$NetBSD: a9tmr.c,v 1.19 2018/11/22 21:08:19 aymeric Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -362,10 +362,15 @@ a9tmr_intr(void *arg)
return 1;
}
+/* XXX This conflicts with gtmr, hence the temporary weak alias kludge */
+#if 1
+void a9tmr_setstatclockrate(int);
void
-setstatclockrate(int newhz)
+a9tmr_setstatclockrate(int newhz)
{
}
+__weak_alias(setstatclockrate, a9tmr_setstatclockrate);
+#endif
static u_int
a9tmr_get_timecount(struct timecounter *tc)
Index: src/sys/arch/evbarm/conf/GENERIC
diff -u src/sys/arch/evbarm/conf/GENERIC:1.13 src/sys/arch/evbarm/conf/GENERIC:1.14
--- src/sys/arch/evbarm/conf/GENERIC:1.13 Mon Nov 5 07:41:46 2018
+++ src/sys/arch/evbarm/conf/GENERIC Thu Nov 22 21:08:19 2018
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC,v 1.13 2018/11/05 07:41:46 skrll Exp $
+# $NetBSD: GENERIC,v 1.14 2018/11/22 21:08:19 aymeric Exp $
#
# GENERIC ARM (aarch32) kernel
#
@@ -14,7 +14,7 @@ include "arch/evbarm/conf/GENERIC.common
#
makeoptions DTSARCH="arm aarch64"
makeoptions DTSGNUARCH="arm arm64"
-makeoptions DTSSUBDIR="allwinner broadcom nvidia rockchip"
+makeoptions DTSSUBDIR="allwinner broadcom nvidia rockchip socfpga"
makeoptions DTS="
bcm2836-rpi-2-b.dts
bcm2837-rpi-3-b.dts
@@ -29,6 +29,8 @@ makeoptions DTS="
exynos5422-odroidxu3.dts
exynos5422-odroidxu4.dts
+ socfpga_cyclone5_de0_sockit.dts
+
sun4i-a10-a1000.dts
sun4i-a10-ba10-tvbox.dts
sun4i-a10-chuwi-v7-cw0825.dts
@@ -208,6 +210,7 @@ pseudo-device openfirm # /dev/openfirm
#options EARLYCONS=exynos, CONSADDR=0x12c20000
#options EARLYCONS=bcm2837, CONSADDR=0x3f215040
+#options EARLYCONS=cycv, CONSADDR=0xffc02000
#options EARLYCONS=rk3328, CONSADDR=0xff130000
#options EARLYCONS=sunxi, CONSADDR=0x01c28000
@@ -239,6 +242,8 @@ cpufreqdt* at cpu?
psci* at fdt?
# Clock and reset controllers
+cycvclkmgr* at fdt? pass 1 # Cyclone V clock manager
+cycvrstmgr* at fdt? pass 0 # Cyclone V reset manager
exy5410clk* at fdt? pass 3 # Exynos5410 clock controller
exy5422clk* at fdt? pass 3 # Exynos5422 clock controller
sun4ia10ccu* at fdt? pass 2 # Allwinner A10/A20 CCU
@@ -277,6 +282,8 @@ sunxisramc* at fdt? pass 4
syscon* at fdt? pass 1 # Generic System Controller
# Timer
+a9tmr* at fdt? pass 2 # ARM Cortex A5/A9 Timer
+arma9tmr* at a9tmr?
gtmr* at fdt? pass 1 # ARM Generic Timer
armgtmr0 at gtmr?
mct* at fdt? pass 2 # Exynos Multi Core Timer (MCT)
@@ -285,6 +292,7 @@ sunxitimer* at fdt?
tegratimer* at fdt? # Timers
# Watchdog
+dwcwdt* at fdt? # DesignWare watchdog
sunxiwdt* at fdt? # Allwinner watchdog
watchdog* at fdt? # Broadcom BCM283x watchdog
@@ -297,6 +305,10 @@ tegralic* at fdt? pass 1 # NVIDIA Tegra
sunxiintc* at fdt? pass 1 # Allwinner INTC
sunxinmi* at fdt? pass 2 # Allwinner NMI / R_INTC
+# Level 2 Cache Controller
+l2cc* at fdt? pass 2 # ARM Cortex A9 L2 Cache Controller
+arml2cc* at l2cc?
+
# Memory controller
tegramc* at fdt? pass 4 # NVIDIA Tegra MC
Index: src/sys/arch/evbarm/conf/files.generic
diff -u src/sys/arch/evbarm/conf/files.generic:1.3 src/sys/arch/evbarm/conf/files.generic:1.4
--- src/sys/arch/evbarm/conf/files.generic:1.3 Mon Nov 5 07:42:56 2018
+++ src/sys/arch/evbarm/conf/files.generic Thu Nov 22 21:08:19 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.generic,v 1.3 2018/11/05 07:42:56 skrll Exp $
+# $NetBSD: files.generic,v 1.4 2018/11/22 21:08:19 aymeric Exp $
#
# A generic (aarch32) kernel configuration info
#
@@ -17,6 +17,7 @@ file arch/arm/arm/arm_generic_dma.c
file arch/arm/arm/bus_space_a4x.S
# Add other board files here
+include "arch/arm/altera/files.altera"
include "arch/arm/broadcom/files.bcm2835"
include "arch/arm/nvidia/files.tegra"
include "arch/arm/samsung/files.exynos"
