1
0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-01 12:19:28 +00:00

ARM: Rename remaining instances of cpufunc_id() to cpu_ident(),

forgotten in r295096.
Remove tlb_flushI/tlb_flushI_SE functions forgotten in r295122.
This commit is contained in:
Michal Meloun 2016-02-01 14:28:58 +00:00
parent 03fa312bb7
commit ebda969939
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=295123
6 changed files with 8 additions and 10 deletions

View File

@ -221,8 +221,6 @@ struct cpu_functions sheeva_cpufuncs = {
armv4_tlb_flushID, /* tlb_flushID */
arm10_tlb_flushID_SE, /* tlb_flushID_SE */
armv4_tlb_flushI, /* tlb_flushI */
arm10_tlb_flushI_SE, /* tlb_flushI_SE */
armv4_tlb_flushD, /* tlb_flushD */
armv4_tlb_flushD_SE, /* tlb_flushD_SE */

View File

@ -49,7 +49,7 @@ void _start(void);
void __start(void);
void __startC(void);
extern unsigned int cpufunc_id(void);
extern unsigned int cpu_ident(void);
extern void armv6_idcache_wbinv_all(void);
extern void armv7_idcache_wbinv_all(void);
extern void do_call(void *, void *, void *, int);
@ -248,7 +248,7 @@ _startC(void)
#ifndef KZIP
#ifdef CPU_ARM9
/* So that idcache_wbinv works; */
if ((cpufunc_id() & 0x0000f000) == 0x00009000)
if ((cpu_ident() & 0x0000f000) == 0x00009000)
arm9_setup();
#endif
#endif
@ -266,7 +266,7 @@ get_cachetype_cp15()
__asm __volatile("mrc p15, 0, %0, c0, c0, 1"
: "=r" (ctype));
cpuid = cpufunc_id();
cpuid = cpu_ident();
/*
* ...and thus spake the ARM ARM:
*
@ -683,7 +683,7 @@ __start(void)
#ifdef CPU_ARM9
/* So that idcache_wbinv works; */
if ((cpufunc_id() & 0x0000f000) == 0x00009000)
if ((cpu_ident() & 0x0000f000) == 0x00009000)
arm9_setup();
#endif
setup_pagetables(pt_addr, (vm_paddr_t)curaddr,

View File

@ -561,7 +561,7 @@ pmap_pte_init_xscale(void)
{
uint32_t id, type;
id = cpufunc_id();
id = cpu_ident();
type = id & ~(CPU_ID_XSCALE_COREREV_MASK|CPU_ID_REVISION_MASK);
if (type == CPU_ID_PXA250 || type == CPU_ID_PXA210) {

View File

@ -128,7 +128,7 @@ get_tclk(void)
{
uint32_t cputype;
cputype = cpufunc_id();
cputype = cpu_ident();
cputype &= CPU_ID_CPU_MASK;
if (cputype == CPU_ID_MV88SV584X_V7)

View File

@ -111,7 +111,7 @@ platform_mp_start_ap(void)
* Initialization procedure depends on core revision,
* in this step CHIP ID is checked to choose proper procedure
*/
cputype = cpufunc_id();
cputype = cpu_ident();
cputype &= CPU_ID_CPU_MASK;
/*

View File

@ -120,7 +120,7 @@ omap4_get_revision(void)
* the ARM cpuid to get the correct revision.
*/
if (revision == 0) {
id_code = cpufunc_id();
id_code = cpu_ident();
revision = (id_code & 0xf) - 1;
}