Module Name: src
Committed By: jmcneill
Date: Fri Jun 16 21:37:11 UTC 2017
Modified Files:
src/sys/arch/evbarm/conf: TEGRA VEXPRESS_A15 mk.tegra mk.vexpress
Log Message:
Set DTS makeoption in kernel config
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/conf/TEGRA
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/conf/VEXPRESS_A15
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/mk.tegra
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/mk.vexpress
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/evbarm/conf/TEGRA
diff -u src/sys/arch/evbarm/conf/TEGRA:1.23 src/sys/arch/evbarm/conf/TEGRA:1.24
--- src/sys/arch/evbarm/conf/TEGRA:1.23 Fri Jun 2 00:09:56 2017
+++ src/sys/arch/evbarm/conf/TEGRA Fri Jun 16 21:37:11 2017
@@ -1,5 +1,5 @@
#
-# $NetBSD: TEGRA,v 1.23 2017/06/02 00:09:56 jmcneill Exp $
+# $NetBSD: TEGRA,v 1.24 2017/06/16 21:37:11 jmcneill Exp $
#
# NVIDIA Tegra K1 (T124)
#
@@ -7,6 +7,14 @@
include "arch/evbarm/conf/std.tegra"
include "arch/evbarm/conf/GENERIC.common"
+makeoptions DTS="
+ tegra124-apalis-eval.dts
+ tegra124-jetson-tk1.dts
+ tegra124-nyan-big.dts
+ tegra124-nyan-blaze.dts
+ tegra124-venice2.dts
+"
+
options CPU_CORTEXA15
options SOC_TEGRA124
options MULTIPROCESSOR
Index: src/sys/arch/evbarm/conf/VEXPRESS_A15
diff -u src/sys/arch/evbarm/conf/VEXPRESS_A15:1.16 src/sys/arch/evbarm/conf/VEXPRESS_A15:1.17
--- src/sys/arch/evbarm/conf/VEXPRESS_A15:1.16 Thu Jun 8 21:01:31 2017
+++ src/sys/arch/evbarm/conf/VEXPRESS_A15 Fri Jun 16 21:37:11 2017
@@ -1,5 +1,5 @@
#
-# $NetBSD: VEXPRESS_A15,v 1.16 2017/06/08 21:01:31 jmcneill Exp $
+# $NetBSD: VEXPRESS_A15,v 1.17 2017/06/16 21:37:11 jmcneill Exp $
#
# ARM Versatile Express A15
#
@@ -7,6 +7,8 @@
include "arch/evbarm/conf/std.vexpress"
include "arch/evbarm/conf/GENERIC.common"
+makeoptions DTS="vexpress-v2p-ca15-tc1.dts"
+
options CPU_CORTEXA15
options MULTIPROCESSOR
Index: src/sys/arch/evbarm/conf/mk.tegra
diff -u src/sys/arch/evbarm/conf/mk.tegra:1.5 src/sys/arch/evbarm/conf/mk.tegra:1.6
--- src/sys/arch/evbarm/conf/mk.tegra:1.5 Thu Jun 15 22:08:07 2017
+++ src/sys/arch/evbarm/conf/mk.tegra Fri Jun 16 21:37:11 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mk.tegra,v 1.5 2017/06/15 22:08:07 jmcneill Exp $
+# $NetBSD: mk.tegra,v 1.6 2017/06/16 21:37:11 jmcneill Exp $
CPPFLAGS+= -mcpu=cortex-a15 -mfpu=neon
.include "$S/arch/arm/nvidia/tegra_xusb-fw.mk"
@@ -30,9 +30,3 @@ EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.K
EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.gz.ub@}
-
-DTS= tegra124-apalis-eval.dts \
- tegra124-jetson-tk1.dts \
- tegra124-nyan-big.dts \
- tegra124-nyan-blaze.dts \
- tegra124-venice2.dts
Index: src/sys/arch/evbarm/conf/mk.vexpress
diff -u src/sys/arch/evbarm/conf/mk.vexpress:1.3 src/sys/arch/evbarm/conf/mk.vexpress:1.4
--- src/sys/arch/evbarm/conf/mk.vexpress:1.3 Thu Jun 15 22:07:10 2017
+++ src/sys/arch/evbarm/conf/mk.vexpress Fri Jun 16 21:37:11 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mk.vexpress,v 1.3 2017/06/15 22:07:10 jmcneill Exp $
+# $NetBSD: mk.vexpress,v 1.4 2017/06/16 21:37:11 jmcneill Exp $
.if !empty(MACHINE_ARCH:M*eb)
EXTRA_LINKFLAGS+= --be8
@@ -33,5 +33,3 @@ EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.K
EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.gz.ub@}
-
-DTS= vexpress-v2p-ca15-tc1.dts
