Module Name: src Committed By: skrll Date: Mon Aug 12 11:45:53 UTC 2019
Modified Files: src/sys/arch/arm/imx/fdt: files.imx6 src/sys/arch/evbarm/conf: files.imx Log Message: Rearrange so that sys/arch/arm/imx/fdt/files.imx6 can be included by sys/arch/evbarm/conf/files.generic To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/imx/fdt/files.imx6 cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/files.imx 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/imx/fdt/files.imx6 diff -u src/sys/arch/arm/imx/fdt/files.imx6:1.4 src/sys/arch/arm/imx/fdt/files.imx6:1.5 --- src/sys/arch/arm/imx/fdt/files.imx6:1.4 Tue Jul 30 06:52:57 2019 +++ src/sys/arch/arm/imx/fdt/files.imx6 Mon Aug 12 11:45:53 2019 @@ -1,16 +1,8 @@ -# $NetBSD: files.imx6,v 1.4 2019/07/30 06:52:57 hkenken Exp $ +# $NetBSD: files.imx6,v 1.5 2019/08/12 11:45:53 skrll Exp $ # # Configuration info for the Freescale i.MX6 # -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/imx/fdt/imx6_platform.c soc_imx # SOC parameters Index: src/sys/arch/evbarm/conf/files.imx diff -u src/sys/arch/evbarm/conf/files.imx:1.1 src/sys/arch/evbarm/conf/files.imx:1.2 --- src/sys/arch/evbarm/conf/files.imx:1.1 Wed Jul 24 13:12:34 2019 +++ src/sys/arch/evbarm/conf/files.imx Mon Aug 12 11:45:53 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.imx,v 1.1 2019/07/24 13:12:34 hkenken Exp $ +# $NetBSD: files.imx,v 1.2 2019/08/12 11:45:53 skrll Exp $ # # NXP(Freescale) i.MX configuration info # @@ -8,5 +8,13 @@ include "arch/arm/cortex/files.cortex" include "arch/evbarm/conf/files.fdt" +file arch/arm/arm32/arm32_boot.c arm32 +file arch/arm/arm32/arm32_kvminit.c arm32 +file arch/arm/arm32/arm32_reboot.c arm32 +file arch/arm/arm32/irq_dispatch.S arm32 +file arch/arm/arm32/armv7_generic_space.c arm32 +file arch/arm/arm/arm_generic_dma.c arm32 +file arch/arm/arm/bus_space_a4x.S arm32 + include "arch/arm/imx/fdt/files.imx6"