git: d765b211387c - main - Remove __XSCALE__ checks from the arm code

[Andrew Turner]

The branch main has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=d765b211387c4c8a463086caeea8eb8836a50e57

commit d765b211387c4c8a463086caeea8eb8836a50e57
Author:     Andrew Turner <andrew at FreeBSD.org>
AuthorDate: 2021-02-19 15:22:13 +0000
Commit:     Andrew Turner <andrew at FreeBSD.org>
CommitDate: 2021-02-19 15:31:26 +0000

    Remove __XSCALE__ checks from the arm code
    
    XScale support was removed over 2 years ago, remove the last __XSCALE__
    checks from the arm MD code.
    
    Sponsored by:   Innovate UK
---
 sys/arm/arm/dump_machdep.c | 3 ---
 sys/arm/arm/exception.S    | 8 --------
 2 files changed, 11 deletions(-)

diff --git a/sys/arm/arm/dump_machdep.c b/sys/arm/arm/dump_machdep.c
index ead54ca7b225..c89a356d6228 100644
--- a/sys/arm/arm/dump_machdep.c
+++ b/sys/arm/arm/dump_machdep.c
@@ -63,9 +63,6 @@ dumpsys_wbinv_all(void)
 	 * part of stopping.
 	 */
 	dcache_wbinv_poc_all();
-#ifdef __XSCALE__
-	xscale_cache_clean_minidata();
-#endif
 }
 
 void
diff --git a/sys/arm/arm/exception.S b/sys/arm/arm/exception.S
index 92e815b068fa..0416939cb199 100644
--- a/sys/arm/arm/exception.S
+++ b/sys/arm/arm/exception.S
@@ -236,10 +236,6 @@ END(exception_exit)
  * on exit (without transitioning back through the abort mode stack).
  */
 ASENTRY_NP(prefetch_abort_entry)
-#ifdef __XSCALE__
-	nop				/* Make absolutely sure any pending */
-	nop				/* imprecise aborts have occurred. */
-#endif
 	sub	lr, lr, #4		/* Adjust the lr. Transition to scv32 */
 	PUSHFRAMEINSVC			/* mode stack, build trapframe there. */
 	adr	lr, exception_exit	/* Return from handler via standard */
@@ -256,10 +252,6 @@ END(prefetch_abort_entry)
  * on exit (without transitioning back through the abort mode stack).
  */
 ASENTRY_NP(data_abort_entry)
-#ifdef __XSCALE__
-	nop				/* Make absolutely sure any pending */
-	nop				/* imprecise aborts have occurred. */
-#endif
 	sub	lr, lr, #8		/* Adjust the lr. Transition to scv32 */
 	PUSHFRAMEINSVC			/* mode stack, build trapframe there. */
 	adr	lr, exception_exit	/* Exception exit routine */