From c4a4eb59e3159973f1b0bb3efb151d873f3fd79a Mon Sep 17 00:00:00 2001 From: Svatopluk Kraus Date: Sat, 20 Feb 2016 07:45:21 +0000 Subject: [PATCH] Rename busdma_machdep.c to busdma_machdep-v4.c, pmap.c to pmap-v4.c and trap.c to trap-v4.c to be plain and consistent with other armv4 specific files. --- sys/arm/arm/{busdma_machdep.c => busdma_machdep-v4.c} | 0 sys/arm/arm/{pmap.c => pmap-v4.c} | 0 sys/arm/arm/{trap.c => trap-v4.c} | 0 sys/conf/files.arm | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename sys/arm/arm/{busdma_machdep.c => busdma_machdep-v4.c} (100%) rename sys/arm/arm/{pmap.c => pmap-v4.c} (100%) rename sys/arm/arm/{trap.c => trap-v4.c} (100%) diff --git a/sys/arm/arm/busdma_machdep.c b/sys/arm/arm/busdma_machdep-v4.c similarity index 100% rename from sys/arm/arm/busdma_machdep.c rename to sys/arm/arm/busdma_machdep-v4.c diff --git a/sys/arm/arm/pmap.c b/sys/arm/arm/pmap-v4.c similarity index 100% rename from sys/arm/arm/pmap.c rename to sys/arm/arm/pmap-v4.c diff --git a/sys/arm/arm/trap.c b/sys/arm/arm/trap-v4.c similarity index 100% rename from sys/arm/arm/trap.c rename to sys/arm/arm/trap-v4.c diff --git a/sys/conf/files.arm b/sys/conf/files.arm index ac8b4e8914e6..d142450962c2 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -6,7 +6,7 @@ arm/arm/blockio.S standard arm/arm/bus_space_asm_generic.S standard arm/arm/bus_space_base.c optional fdt arm/arm/bus_space_generic.c standard -arm/arm/busdma_machdep.c optional !armv6 +arm/arm/busdma_machdep-v4.c optional !armv6 arm/arm/busdma_machdep-v6.c optional armv6 arm/arm/copystr.S standard arm/arm/cpufunc.c standard @@ -62,7 +62,7 @@ arm/arm/pl190.c optional pl190 arm/arm/pl310.c optional pl310 arm/arm/platform.c optional platform arm/arm/platform_if.m optional platform -arm/arm/pmap.c optional !armv6 +arm/arm/pmap-v4.c optional !armv6 arm/arm/pmap-v6.c optional armv6 arm/arm/pmu.c optional pmu | fdt hwpmc arm/arm/sc_machdep.c optional sc @@ -77,7 +77,7 @@ arm/arm/swtch-v4.S optional !armv6 arm/arm/swtch-v6.S optional armv6 arm/arm/sys_machdep.c standard arm/arm/syscall.c standard -arm/arm/trap.c optional !armv6 +arm/arm/trap-v4.c optional !armv6 arm/arm/trap-v6.c optional armv6 arm/arm/uio_machdep.c standard arm/arm/undefined.c standard