D49498.id152647.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D49498.id152647.diff
View Options

	diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c
	--- a/sys/arm/arm/pmap-v6.c
	+++ b/sys/arm/arm/pmap-v6.c
	@@ -1716,8 +1716,6 @@
	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
	--- a/sys/arm/arm/support.S
	+++ b/sys/arm/arm/support.S
	@@ -730,17 +730,6 @@
	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
	--- a/sys/conf/options.arm
	+++ b/sys/conf/options.arm
	@@ -7,7 +7,6 @@
	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 @@
	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