git: c7142afec42c - main - arm: Remove FLASHADDR and PHYSADDR

The branch main has been updated by andrew:

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

commit c7142afec42c4f0a3aa4da845f4c4e15b5e3f018
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2025-03-27 13:21:52 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2025-03-27 13:47:38 +0000

    arm: Remove FLASHADDR and PHYSADDR
    
    They appear to have been used when executing directly from flash,
    however are now unused.
    
    Reviewed by:    cognet, imp
    Sponsored by:   Arm Ltd
    Differential Revision:  https://reviews.freebsd.org/D49498
---
 sys/arm/arm/pmap-v6.c |  2 --
 sys/arm/arm/support.S | 11 -----------
 sys/conf/options.arm  |  2 --
 3 files changed, 15 deletions(-)

diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c
index 6cc78b187a9a..bb2aced34c94 100644
--- a/sys/arm/arm/pmap-v6.c
+++ b/sys/arm/arm/pmap-v6.c
@@ -1716,8 +1716,6 @@ pmap_init(void)
 	pt2_entry_t *pte2p, pte2;
 	u_int i, pte1_idx, pv_npg;
 
-	PDEBUG(1, printf("%s: phys_start = %#x\n", __func__, PHYSADDR));
-
 	/*
 	 * Initialize the vm page array entries for kernel pmap's
 	 * L2 page table pages allocated in advance.
diff --git a/sys/arm/arm/support.S b/sys/arm/arm/support.S
index cbe3ff489076..cbfbb086b1ed 100644
--- a/sys/arm/arm/support.S
+++ b/sys/arm/arm/support.S
@@ -730,17 +730,6 @@ ENTRY(memcpy)
 	pld	[r1]
 	cmp	r2, #0x0c
 	ble	.Lmemcpy_short		/* <= 12 bytes */
-#ifdef FLASHADDR
-#if FLASHADDR > PHYSADDR
-	ldr	r3, =FLASHADDR
-	cmp	r3, pc
-	bls	.Lnormal
-#else
-	ldr	r3, =FLASHADDR
-	cmp	r3, pc
-	bhi	.Lnormal
-#endif
-#endif
 	mov	r3, r0			/* We must not clobber r0 */
 
 	/* Word-align the destination buffer */
diff --git a/sys/conf/options.arm b/sys/conf/options.arm
index a41d2387459c..0c0002d50b88 100644
--- a/sys/conf/options.arm
+++ b/sys/conf/options.arm
@@ -7,7 +7,6 @@ SMP_ON_UP		opt_global.h # Runtime detection of MP extensions
 DEV_GIC			opt_global.h
 DEV_PMU			opt_global.h
 EFI			opt_platform.h
-FLASHADDR		opt_global.h
 GIC_DEFAULT_ICFGR_INIT	opt_global.h
 INTRNG			opt_global.h
 FREEBSD_BOOT_LOADER	opt_global.h
@@ -16,7 +15,6 @@ KERNVIRTADDR		opt_global.h
 LINUX_BOOT_ABI		opt_global.h
 LOCORE_MAP_MB		opt_locore.h
 NKPT2PG			opt_pmap.h
-PHYSADDR		opt_global.h
 PLATFORM		opt_global.h
 SOCDEV_PA		opt_global.h
 SOCDEV_VA		opt_global.h