From f13a4096b7528154a885d20e81c44b1a5c5670ec Mon Sep 17 00:00:00 2001
From: Andrew Turner <andrew@FreeBSD.org>
Date: Wed, 15 Aug 2018 13:13:19 +0000
Subject: [PATCH] Remove PHYSADDR from kernel configurations that don't need
 it. The only place we need to set it is when we also have FLASHADDR set.

Sponsored by:	DARPA, AFRL
---
 sys/arm/conf/NOTES               | 2 --
 sys/arm/mv/discovery/std.db78xxx | 1 -
 sys/arm/mv/orion/std.db88f5xxx   | 1 -
 sys/arm/ralink/std.ralink        | 1 -
 4 files changed, 5 deletions(-)

diff --git a/sys/arm/conf/NOTES b/sys/arm/conf/NOTES
index 5cb08e974d06..2cd3a215f376 100644
--- a/sys/arm/conf/NOTES
+++ b/sys/arm/conf/NOTES
@@ -10,8 +10,6 @@ files	"../mv/kirkwood/files.kirkwood"
 files	"../mv/orion/files.db88f5xxx"
 files	"../mv/orion/files.ts7800"
 
-options 	PHYSADDR=0x00000000
-
 makeoptions	CONF_CFLAGS+="-march=armv5te"
 makeoptions	LDFLAGS="-zmuldefs"
 makeoptions	KERNPHYSADDR=0x00000000
diff --git a/sys/arm/mv/discovery/std.db78xxx b/sys/arm/mv/discovery/std.db78xxx
index f1e9bbcbb43b..a0a22f1c1c1b 100644
--- a/sys/arm/mv/discovery/std.db78xxx
+++ b/sys/arm/mv/discovery/std.db78xxx
@@ -6,4 +6,3 @@ files	"../mv/discovery/files.db78xxx"
 makeoptions	KERNPHYSADDR=0x00900000
 makeoptions	KERNVIRTADDR=0xc0900000
 options		KERNVIRTADDR=0xc0900000
-options		PHYSADDR=0x00000000
diff --git a/sys/arm/mv/orion/std.db88f5xxx b/sys/arm/mv/orion/std.db88f5xxx
index 8a13725e3d2a..8444683be1bd 100644
--- a/sys/arm/mv/orion/std.db88f5xxx
+++ b/sys/arm/mv/orion/std.db88f5xxx
@@ -6,4 +6,3 @@ files	"../mv/orion/files.db88f5xxx"
 makeoptions	KERNPHYSADDR=0x00900000
 makeoptions	KERNVIRTADDR=0xc0900000
 options		KERNVIRTADDR=0xc0900000
-options		PHYSADDR=0x00000000
diff --git a/sys/arm/ralink/std.ralink b/sys/arm/ralink/std.ralink
index dc9c56050480..5cf4459bd231 100644
--- a/sys/arm/ralink/std.ralink
+++ b/sys/arm/ralink/std.ralink
@@ -8,4 +8,3 @@ options		INTRNG
 makeoptions	KERNPHYSADDR=0x40000000
 makeoptions	KERNVIRTADDR=0xc0000000
 options		KERNVIRTADDR=0xc0000000
-options		PHYSADDR=0x40000000