PERFORCE change 222633 for review

[Brooks Davis]

http://p4web.freebsd.org/@@222633?ac=10

Change 222633 by brooks at brooks_zenith on 2013/03/04 23:24:39

	Relocate the boot map entry to the end of the media to facilitate
	future changes.  Remove the currently unused osconfig map entry
	as we're rapidly moving towards a boot file system where we can
	easily store that sort of data.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4.hints#23 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4.hints#23 (text+ko) ====

@@ -13,66 +13,55 @@
 hint.map.1.end=0x01820000
 hint.map.1.name="fpga"
 
-# Saved OS configuration
+# Currently unused space on the first chip
+# XXX: To be merged with the kernel map when we begin using the boot loader
 hint.map.2.at="cfid0"
 hint.map.2.start=0x01820000
-hint.map.2.end=0x01840000
-hint.map.2.name="osconfig"
+hint.map.2.end=0x02000000
+hint.map.2.name="reserved"
 
-# Currently unused space on the first chip
-hint.map.3.at="cfid0"
-hint.map.3.start=0x01840000
-hint.map.3.end=0x01f00000
-hint.map.3.name="reserved"
+# Kernel on the second chip
+hint.map.5.at="cfid0"
+hint.map.5.start=0x02000000
+hint.map.5.end=0x03fe0000
+hint.map.5.name="kernel"
 
 # Area for use by the boot loader
 hint.map.4.at="cfid0"
-hint.map.4.start=0x01f00000
-hint.map.4.end=0x02000000
+hint.map.4.start=0x03fe0000
+hint.map.4.end=0x04000000
 hint.map.4.name="boot"
 
-# Kernel on the second chip
-hint.map.5.at="cfid0"
-hint.map.5.start=0x02000000
-hint.map.5.end=0x04000000
-hint.map.5.name="kernel"
+# Reserved configuration blocks.  Don't touch.
+hint.map.5.at="isf0"
+hint.map.5.start=0x00000000
+hint.map.5.end=0x00020000
+hint.map.5.name="config"
+hint.map.5.readonly=1
 
-# Reserved configuration blocks.  Don't touch.
+# Hardwired location of bitfile
 hint.map.6.at="isf0"
-hint.map.6.start=0x00000000
-hint.map.6.end=0x00020000
-hint.map.6.name="config"
-hint.map.6.readonly=1
+hint.map.6.start=0x00020000
+hint.map.6.end=0x01820000
+hint.map.6.name="fpga"
 
-# Hardwired location of bitfile
+# Currently unused space on the first chip
 hint.map.7.at="isf0"
-hint.map.7.start=0x00020000
-hint.map.7.end=0x01820000
-hint.map.7.name="fpga"
+hint.map.7.start=0x01820000
+hint.map.7.end=0x02000000
+hint.map.7.name="reserved"
 
-# Saved OS configuration
-hint.map.8.at="isf0"
-hint.map.8.start=0x01820000
-hint.map.8.end=0x01840000
-hint.map.8.name="osconfig"
-
-# Currently unused space on the first chip
-hint.map.9.at="isf0"
-hint.map.9.start=0x01840000
-hint.map.9.end=0x01f00000
-hint.map.9.name="reserved"
+# Kernel on the second chip
+hint.map.8.at="isf1"
+hint.map.8.start=0x00000000
+hint.map.8.end=0x01fe0000
+hint.map.8.name="kernel"
 
 # Area for use by the boot loader
-hint.map.10.at="isf0"
-hint.map.10.start=0x01f00000
+hint.map.10.at="isf1"
+hint.map.10.start=0x01fe0000
 hint.map.10.end=0x02000000
-hint.map.10.name="boot"
-
-# Kernel on the second chip
-hint.map.11.at="isf1"
-hint.map.11.start=0x00000000
-hint.map.11.end=0x02000000
-hint.map.11.name="kernel"
+hint.map.10.name="kernel"
 
 # Altera Triple-Speed Ethernet Mac, present in tPad and DE-4 configurations
 # configured from fdt(4) but PHYs are still described in here.