Index: head/sys/arm/at91/std.at91
===================================================================
--- head/sys/arm/at91/std.at91	(revision 163680)
+++ head/sys/arm/at91/std.at91	(revision 163681)
@@ -1,5 +1,10 @@
 # $FreeBSD$
 
 files	"../at91/files.at91"
 cpu	CPU_ARM9
 makeoptions	CONF_CFLAGS=-mcpu=arm9
+makeoptions	KERNPHYSADDR=0x20000000
+makeoptions	KERNVIRTADDR=0xc0000000
+options		KERNPHYSADDR=0x20000000	
+options		KERNVIRTADDR=0xc0000000	
+options		PHYSADDR=0x20000000
Index: head/sys/arm/at91/std.kb920x
===================================================================
--- head/sys/arm/at91/std.kb920x	(revision 163680)
+++ head/sys/arm/at91/std.kb920x	(revision 163681)
@@ -1,10 +1,5 @@
 #$FreeBSD$
 include "../at91/std.at91"
 files	"../at91/files.kb920x"
 
-makeoptions	KERNPHYSADDR=0x20000000
-makeoptions	KERNVIRTADDR=0xc0000000
-options		KERNPHYSADDR=0x20000000	
-options		KERNVIRTADDR=0xc0000000	
-options		PHYSADDR=0x20000000
 options		STARTUP_PAGETABLE_ADDR=0x20800000