svn commit: r186539 - head/sys/arm/conf

[Bjoern A. Zeeb]

Author: bz
Date: Sun Dec 28 11:04:24 2008
New Revision: 186539
URL: http://svn.freebsd.org/changeset/base/186539

Log:
  Include std.ixp425 for "cpu" and comment out duplicate memory map
  options. Using the already included std.avila is not considered
  to be entirely right (and the options slightly differ) but the best
  match we currently have. Upcoming work should fit better.
  
  Reorder another variable to match the layout of other configs.
  
  Reviewed by:	sam, warner (earlier version with options removed)

Modified:
  head/sys/arm/conf/NSLU

Modified: head/sys/arm/conf/NSLU
==============================================================================
--- head/sys/arm/conf/NSLU	Sun Dec 28 07:09:00 2008	(r186538)
+++ head/sys/arm/conf/NSLU	Sun Dec 28 11:04:24 2008	(r186539)
@@ -19,14 +19,18 @@
 
 ident		NSLU
 
-options 	PHYSADDR=0x10000000
-options 	KERNPHYSADDR=0x10200000	
-options 	KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
-options 	FLASHADDR=0x50000000
-options 	LOADERRAMADDR=0x00000000
-options 	STARTUP_PAGETABLE_ADDR=0x10000000
+# XXX What is defined in std.avila does not exactly match the following:
+#options 	PHYSADDR=0x10000000
+#options 	KERNPHYSADDR=0x10200000	
+#options 	KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
+#options 	FLASHADDR=0x50000000
+#options 	LOADERRAMADDR=0x00000000
+#options 	STARTUP_PAGETABLE_ADDR=0x10000000
 
+include		"../xscale/ixp425/std.ixp425"
+# NB: memory mapping is defined in std.avila (see also comment above)
 include		"../xscale/ixp425/std.avila"
+options 	XSCALE_CACHE_READ_WRITE_ALLOCATE
 #To statically compile in device wiring instead of /boot/device.hints
 hints		"NSLU.hints"		#Default places to look for devices.
 makeoptions	MODULES_OVERRIDE=""
@@ -99,7 +103,6 @@ device		bpf
 device		pty
 device		loop
 
-options 	XSCALE_CACHE_READ_WRITE_ALLOCATE
 device		md
 device          random          # Entropy device