From cd6e8c4dc858692bbbc8155ca7645832de22c1e8 Mon Sep 17 00:00:00 2001 From: raj Date: Fri, 4 Apr 2008 17:35:24 +0000 Subject: [PATCH] Make kernel.tramp build properly on ARM9E. Reviewed by: imp Approved by: cognet (mentor) --- sys/arm/arm/elf_trampoline.c | 2 ++ sys/conf/Makefile.arm | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/arm/arm/elf_trampoline.c b/sys/arm/arm/elf_trampoline.c index 908d1bf0fc97..8f30abf85c38 100644 --- a/sys/arm/arm/elf_trampoline.c +++ b/sys/arm/arm/elf_trampoline.c @@ -59,6 +59,8 @@ void __startC(void); #define cpu_idcache_wbinv_all arm8_cache_purgeID #elif defined(CPU_ARM9) #define cpu_idcache_wbinv_all arm9_idcache_wbinv_all +#elif defined(CPU_ARM9E) +#define cpu_idcache_wbinv_all armv5_ec_idcache_wbinv_all #elif defined(CPU_ARM10) #define cpu_idcache_wbinv_all arm10_idcache_wbinv_all #elif defined(CPU_SA110) || defined(CPU_SA1110) || defined(CPU_SA1100) || \ diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm index e913b2afba96..12660f52bf98 100644 --- a/sys/conf/Makefile.arm +++ b/sys/conf/Makefile.arm @@ -71,7 +71,7 @@ FILES_CPU_FUNC = $S/$M/$M/cpufunc_asm_arm7tdmi.S \ $S/$M/$M/cpufunc_asm_arm8.S $S/$M/$M/cpufunc_asm_arm9.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_xscale_c3.S $S/$M/$M/cpufunc_asm_armv5_ec.S KERNEL_EXTRA=trampoline KERNEL_EXTRA_INSTALL=kernel.gz.tramp trampoline: ${KERNEL_KO}.tramp