Date: Sun, 3 Mar 2013 23:37:28 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 222580 for review Message-ID: <201303032337.r23NbS57040537@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@222580?ac=10 Change 222580 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/03/03 23:36:37 Merge addition of geom map entry for boot region of the DE4 Intel StrataFlash from FreeBSD/beri to CheriBSD. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4.hints#11 integrate Differences ... ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4.hints#11 (text+ko) ==== @@ -22,45 +22,57 @@ # Currently unused space on the first chip hint.map.3.at="cfid0" hint.map.3.start=0x01840000 -hint.map.3.end=0x02000000 +hint.map.3.end=0x01f00000 hint.map.3.name="reserved" +# 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.name="boot" + # Kernel on the second chip -hint.map.4.at="cfid0" -hint.map.4.start=0x02000000 -hint.map.4.end=0x04000000 -hint.map.4.name="kernel" +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 +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 # Hardwired location of bitfile -hint.map.6.at="isf0" -hint.map.6.start=0x00020000 -hint.map.6.end=0x01820000 -hint.map.6.name="fpga" +hint.map.7.at="isf0" +hint.map.7.start=0x00020000 +hint.map.7.end=0x01820000 +hint.map.7.name="fpga" # Saved OS configuration -hint.map.7.at="isf0" -hint.map.7.start=0x01820000 -hint.map.7.end=0x01840000 -hint.map.7.name="osconfig" +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.8.at="isf0" -hint.map.8.start=0x01840000 -hint.map.8.end=0x02000000 -hint.map.8.name="reserved" +hint.map.9.at="isf0" +hint.map.9.start=0x01840000 +hint.map.9.end=0x01f00000 +hint.map.9.name="reserved" + +# Area for use by the boot loader +hint.map.10.at="isf0" +hint.map.10.start=0x01f00000 +hint.map.10.end=0x02000000 +hint.map.10.name="boot" # Kernel on the second chip -hint.map.9.at="isf1" -hint.map.9.start=0x00000000 -hint.map.9.end=0x02000000 -hint.map.9.name="kernel" +hint.map.11.at="isf1" +hint.map.11.start=0x00000000 +hint.map.11.end=0x02000000 +hint.map.11.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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303032337.r23NbS57040537>