PERFORCE change 219923 for review

[Robert Watson]

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

Change 219923 by rwatson at rwatson_zenith_cl_cam_ac_uk on 2012/12/30 20:48:15

	Revert to using hints for all devices except for DE4LED for now,
	as FDT details are shaken out.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#4 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_FDT_DE4.hints#2 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_FDT_DE4_MDROOT#3 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#4 (text+ko) ====

@@ -56,12 +56,14 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "simple-bus";
+		ranges = <>;
 
 		memory {
 			device_type = "memory";
 			reg = <0x0 0x40000000>;		// 1G at 0x0
 		};
 
+/*
 		serial at 7f000000 {
 			compatible = "altera,jtag_uart-11_0";
 			reg = <0x7f000000 0x40>;
@@ -82,12 +84,14 @@
 			compatible = "altera,sdcard_11_2011";
 			reg = <0x7f008000 0x400>;
 		};
+*/
 
 		led at 7f006000 {
 			compatible = "cambridge,de4led";
 			reg = <0x7f006000 0x1>;
 		};
 
+/*
 		ethernet at 7f007000 {
 			compatible = "altera,atse";
 			reg = <0x7f007000 0x540>;
@@ -109,5 +113,6 @@
 			compatible = "intel,strataflash";
 			reg = <0x76000000 0x2000000>;
 		};
+*/
 	};
 };

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

@@ -27,10 +27,10 @@
 #
 # On-board DE4 8-element LED
 #
-hint.terasic_de4led.0.at="nexus0"
-hint.terasic_de4led.0.maddr=0x7f006000
-hint.terasic_de4led.0.msize=1
-hint.terasic_de4led.0.de4led_0_cmd="f9"
+#hint.terasic_de4led.0.at="nexus0"
+#hint.terasic_de4led.0.maddr=0x7f006000
+#hint.terasic_de4led.0.msize=1
+#hint.terasic_de4led.0.de4led_0_cmd="f9"
 
 #
 # Altera Triple-Speed Ethernet Mac, present in tPad and DE-4 configurations

==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_FDT_DE4_MDROOT#3 (text+ko) ====

@@ -10,6 +10,8 @@
 
 ident		BERI_FDT_DE4_MDROOT
 
+hints		"BERI_FDT_DE4.hints"	#Default places to look for devices.
+
 options 	FDT
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=beripad-de4.dts
@@ -21,6 +23,7 @@
 options 	MD_ROOT			# MD is a potential root device
 options 	MD_ROOT_SIZE=8192
 options 	ROOTDEVNAME=\"ufs:md0\"
+makeoptions	MFS_IMAGE=/home/rwatson/mdroot.img
 
 device		altera_avgen
 device		altera_jtag_uart