From owner-svn-src-all@FreeBSD.ORG Mon Mar 30 08:38:20 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BC920E3A; Mon, 30 Mar 2015 08:38:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9D79C9DD; Mon, 30 Mar 2015 08:38:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2U8cKdd057321; Mon, 30 Mar 2015 08:38:20 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2U8cI1e057316; Mon, 30 Mar 2015 08:38:18 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201503300838.t2U8cI1e057316@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Mon, 30 Mar 2015 08:38:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r280842 - in head/sys: arm/arm arm/include conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Mar 2015 08:38:20 -0000 Author: andrew Date: Mon Mar 30 08:38:18 2015 New Revision: 280842 URL: https://svnweb.freebsd.org/changeset/base/280842 Log: Remove support for CPU_FA626TE. It's unused by any of our kernel configs. Modified: head/sys/arm/arm/cpufunc.c head/sys/arm/arm/elf_trampoline.c head/sys/arm/include/cpuconf.h head/sys/arm/include/cpufunc.h head/sys/conf/options.arm Modified: head/sys/arm/arm/cpufunc.c ============================================================================== --- head/sys/arm/arm/cpufunc.c Mon Mar 30 08:37:03 2015 (r280841) +++ head/sys/arm/arm/cpufunc.c Mon Mar 30 08:38:18 2015 (r280842) @@ -494,7 +494,7 @@ struct cpu_functions xscalec3_cpufuncs = #endif /* CPU_XSCALE_81342 */ -#if defined(CPU_FA526) || defined(CPU_FA626TE) +#if defined(CPU_FA526) struct cpu_functions fa526_cpufuncs = { /* CPU functions */ @@ -555,7 +555,7 @@ struct cpu_functions fa526_cpufuncs = { fa526_setup /* cpu setup */ }; -#endif /* CPU_FA526 || CPU_FA626TE */ +#endif /* CPU_FA526 */ #if defined(CPU_ARM1176) struct cpu_functions arm1176_cpufuncs = { @@ -705,7 +705,7 @@ u_int cpu_reset_needs_v4_MMU_disable; /* defined (CPU_ARM9E) || \ defined(CPU_ARM1176) || defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_FA526) || defined(CPU_FA626TE) || defined(CPU_MV_PJ4B) || \ + defined(CPU_FA526) || defined(CPU_MV_PJ4B) || \ defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) || \ defined(CPU_CORTEXA) || defined(CPU_KRAIT) @@ -943,7 +943,7 @@ set_cpufuncs() } #endif /* CPU_MV_PJ4B */ -#if defined(CPU_FA526) || defined(CPU_FA626TE) +#if defined(CPU_FA526) if (cputype == CPU_ID_FA526 || cputype == CPU_ID_FA626TE) { cpufuncs = fa526_cpufuncs; cpu_reset_needs_v4_MMU_disable = 1; /* SA needs it */ @@ -955,7 +955,7 @@ set_cpufuncs() goto out; } -#endif /* CPU_FA526 || CPU_FA626TE */ +#endif /* CPU_FA526 */ #ifdef CPU_XSCALE_80200 if (cputype == CPU_ID_80200) { @@ -1378,7 +1378,7 @@ cortexa_setup(void) } #endif /* CPU_CORTEXA */ -#if defined(CPU_FA526) || defined(CPU_FA626TE) +#if defined(CPU_FA526) void fa526_setup(void) { @@ -1415,7 +1415,7 @@ fa526_setup(void) ctrl = cpuctrl; cpu_control(0xffffffff, cpuctrl); } -#endif /* CPU_FA526 || CPU_FA626TE */ +#endif /* CPU_FA526 */ #if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ Modified: head/sys/arm/arm/elf_trampoline.c ============================================================================== --- head/sys/arm/arm/elf_trampoline.c Mon Mar 30 08:37:03 2015 (r280841) +++ head/sys/arm/arm/elf_trampoline.c Mon Mar 30 08:38:18 2015 (r280842) @@ -59,7 +59,7 @@ extern void do_call(void *, void *, void #if defined(CPU_ARM9) #define cpu_idcache_wbinv_all arm9_idcache_wbinv_all extern void arm9_idcache_wbinv_all(void); -#elif defined(CPU_FA526) || defined(CPU_FA626TE) +#elif defined(CPU_FA526) #define cpu_idcache_wbinv_all fa526_idcache_wbinv_all extern void fa526_idcache_wbinv_all(void); #elif defined(CPU_ARM9E) Modified: head/sys/arm/include/cpuconf.h ============================================================================== --- head/sys/arm/include/cpuconf.h Mon Mar 30 08:37:03 2015 (r280841) +++ head/sys/arm/include/cpuconf.h Mon Mar 30 08:38:18 2015 (r280842) @@ -57,7 +57,6 @@ defined(CPU_XSCALE_80321) + \ defined(CPU_XSCALE_PXA2X0) + \ defined(CPU_FA526) + \ - defined(CPU_FA626TE) + \ defined(CPU_XSCALE_IXP425)) + \ defined(CPU_CORTEXA) + \ defined(CPU_KRAIT) + \ @@ -75,8 +74,7 @@ #if (defined(CPU_ARM9E) || defined(CPU_ARM10) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) || \ - defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_FA626TE)) + defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425)) #define ARM_ARCH_5 1 #else #define ARM_ARCH_5 0 @@ -149,8 +147,7 @@ * require different PTE layout to use. */ #if (defined(CPU_ARM9) || defined(CPU_ARM9E) || \ - defined(CPU_ARM10) || defined(CPU_FA526) || \ - defined(CPU_FA626TE)) + defined(CPU_ARM10) || defined(CPU_FA526)) #define ARM_MMU_GENERIC 1 #else #define ARM_MMU_GENERIC 0 Modified: head/sys/arm/include/cpufunc.h ============================================================================== --- head/sys/arm/include/cpufunc.h Mon Mar 30 08:37:03 2015 (r280841) +++ head/sys/arm/include/cpufunc.h Mon Mar 30 08:38:18 2015 (r280842) @@ -286,7 +286,7 @@ u_int cpufunc_faultstatus (void); u_int cpufunc_faultaddress (void); u_int cpu_pfr (int); -#if defined(CPU_FA526) || defined(CPU_FA626TE) +#if defined(CPU_FA526) void fa526_setup (void); void fa526_setttb (u_int ttb); void fa526_context_switch (void); @@ -434,7 +434,7 @@ void armv5_ec_idcache_wbinv_range(vm_off #if defined(CPU_ARM9) || defined(CPU_ARM9E) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ - defined(CPU_FA526) || defined(CPU_FA626TE) || \ + defined(CPU_FA526) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) Modified: head/sys/conf/options.arm ============================================================================== --- head/sys/conf/options.arm Mon Mar 30 08:37:03 2015 (r280841) +++ head/sys/conf/options.arm Mon Mar 30 08:38:18 2015 (r280842) @@ -14,7 +14,6 @@ CPU_ARM1176 opt_global.h CPU_CORTEXA opt_global.h CPU_KRAIT opt_global.h CPU_FA526 opt_global.h -CPU_FA626TE opt_global.h CPU_MV_PJ4B opt_global.h CPU_XSCALE_80219 opt_global.h CPU_XSCALE_80321 opt_global.h