Module Name: src
Committed By: aymeric
Date: Sat Jan 5 13:55:46 UTC 2019
Modified Files:
src/distrib/utils/embedded/files: armv7_boot.cmd
src/sys/arch/evbarm/conf: GENERIC
Added Files:
src/sys/arch/arm/dts: socfpga_cyclone5_de0_nano_soc.dts
Removed Files:
src/sys/arch/arm/dts: socfpga_cyclone5_de0_sockit.dts
Log Message:
Rename the DE0 Nano SoC dts file to its new linux/uboot name
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/embedded/files/armv7_boot.cmd
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts
cvs rdiff -u -r1.2 -r0 src/sys/arch/arm/dts/socfpga_cyclone5_de0_sockit.dts
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/files/armv7_boot.cmd
diff -u src/distrib/utils/embedded/files/armv7_boot.cmd:1.10 src/distrib/utils/embedded/files/armv7_boot.cmd:1.11
--- src/distrib/utils/embedded/files/armv7_boot.cmd:1.10 Thu Jan 3 18:21:55 2019
+++ src/distrib/utils/embedded/files/armv7_boot.cmd Sat Jan 5 13:55:46 2019
@@ -8,7 +8,6 @@ if test "${board}" = "de0-nano-soc" ; th
setenv bootargs 'root=ld0a'
setenv mmcpart 0:1
setenv use_fdt 1
- setenv fdtfile socfpga_cyclone5_de0_sockit.dtb
fi
if test "${soc}" = "exynos" ; then
setenv kernel netbsd-GENERIC.ub
Index: src/sys/arch/evbarm/conf/GENERIC
diff -u src/sys/arch/evbarm/conf/GENERIC:1.15 src/sys/arch/evbarm/conf/GENERIC:1.16
--- src/sys/arch/evbarm/conf/GENERIC:1.15 Thu Jan 3 10:44:04 2019
+++ src/sys/arch/evbarm/conf/GENERIC Sat Jan 5 13:55:46 2019
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC,v 1.15 2019/01/03 10:44:04 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.16 2019/01/05 13:55:46 aymeric Exp $
#
# GENERIC ARM (aarch32) kernel
#
@@ -29,7 +29,7 @@ makeoptions DTS="
exynos5422-odroidxu3.dts
exynos5422-odroidxu4.dts
- socfpga_cyclone5_de0_sockit.dts
+ socfpga_cyclone5_de0_nano_soc.dts
sun4i-a10-a1000.dts
sun4i-a10-ba10-tvbox.dts
Added files:
Index: src/sys/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts
diff -u /dev/null src/sys/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts:1.1
--- /dev/null Sat Jan 5 13:55:46 2019
+++ src/sys/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts Sat Jan 5 13:55:46 2019
@@ -0,0 +1,20 @@
+
+
+#include "../../../external/gpl2/dts/dist/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts"
+
+/ {
+ soc {
+ gtimer@fffec200 {
+ compatible = "arm,cortex-a9-global-timer";
+ reg = <0xfffec200 0x20>;
+ clocks = <&mpu_periph_clk>;
+ interrupts = <1 11 0x301>;
+ };
+ usb@ffb40000 {
+ dr_mode = "host";
+ };
+ watchdog@ffd02000 {
+ resets = <&rst L4WD0_RESET>;
+ };
+ };
+};
