From bc54686d204f002bf6f3e2912fa63b9bde84c0fc Mon Sep 17 00:00:00 2001 From: Rafal Jaworowski Date: Fri, 9 Jan 2009 10:55:33 +0000 Subject: [PATCH] Rename Marvell ARM CPU specific file according to r186933. --- sys/arm/arm/{cpufunc_asm_feroceon.S => cpufunc_asm_sheeva.S} | 0 sys/arm/mv/files.mv | 2 +- sys/conf/Makefile.arm | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename sys/arm/arm/{cpufunc_asm_feroceon.S => cpufunc_asm_sheeva.S} (100%) diff --git a/sys/arm/arm/cpufunc_asm_feroceon.S b/sys/arm/arm/cpufunc_asm_sheeva.S similarity index 100% rename from sys/arm/arm/cpufunc_asm_feroceon.S rename to sys/arm/arm/cpufunc_asm_sheeva.S diff --git a/sys/arm/mv/files.mv b/sys/arm/mv/files.mv index 0e834f6a971..eb9fa002a25 100644 --- a/sys/arm/mv/files.mv +++ b/sys/arm/mv/files.mv @@ -15,7 +15,7 @@ arm/arm/bus_space_generic.c standard arm/arm/cpufunc_asm_arm10.S standard arm/arm/cpufunc_asm_armv5_ec.S standard -arm/arm/cpufunc_asm_feroceon.S standard +arm/arm/cpufunc_asm_sheeva.S standard arm/arm/irq_dispatch.S standard arm/mv/bus_space.c standard diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm index 98f7d0d7918..310c54d4287 100644 --- a/sys/conf/Makefile.arm +++ b/sys/conf/Makefile.arm @@ -73,7 +73,7 @@ FILES_CPU_FUNC = $S/$M/$M/cpufunc_asm_arm7tdmi.S \ $S/$M/$M/cpufunc_asm_sa1.S $S/$M/$M/cpufunc_asm_arm10.S \ $S/$M/$M/cpufunc_asm_xscale.S $S/$M/$M/cpufunc_asm.S \ $S/$M/$M/cpufunc_asm_xscale_c3.S $S/$M/$M/cpufunc_asm_armv5_ec.S \ - $S/$M/$M/cpufunc_asm_feroceon.S + $S/$M/$M/cpufunc_asm_sheeva.S KERNEL_EXTRA=trampoline KERNEL_EXTRA_INSTALL=kernel.gz.tramp trampoline: ${KERNEL_KO}.tramp