socsvn commit: r287129 - in soc2015/mihai/bhyve-on-arm-head/sys: arm/conf boot/fdt/dts/arm dev/ofw

[mihai at FreeBSD.org]

Author: mihai
Date: Mon Jun 15 19:36:27 2015
New Revision: 287129
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287129

Log:
  sys: fix compile errors

Modified:
  soc2015/mihai/bhyve-on-arm-head/sys/arm/conf/FVP_VE_CORTEX_A15x1
  soc2015/mihai/bhyve-on-arm-head/sys/boot/fdt/dts/arm/fvp_ve-cortex_a15x1.dts
  soc2015/mihai/bhyve-on-arm-head/sys/dev/ofw/ofw_bus_subr.c

Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/conf/FVP_VE_CORTEX_A15x1
==============================================================================
--- soc2015/mihai/bhyve-on-arm-head/sys/arm/conf/FVP_VE_CORTEX_A15x1	Mon Jun 15 18:43:32 2015	(r287128)
+++ soc2015/mihai/bhyve-on-arm-head/sys/arm/conf/FVP_VE_CORTEX_A15x1	Mon Jun 15 19:36:27 2015	(r287129)
@@ -2,7 +2,7 @@
 # FVP_VE_CORTEX_A15x1 - custom configuration
 #
 
-ident		./FVP_VE_CORTEX_A15x1
+ident		FVP_VE_CORTEX_A15x1
 
 makeoption	ARM_LITTLE_ENDIAN
 

Modified: soc2015/mihai/bhyve-on-arm-head/sys/boot/fdt/dts/arm/fvp_ve-cortex_a15x1.dts
==============================================================================
--- soc2015/mihai/bhyve-on-arm-head/sys/boot/fdt/dts/arm/fvp_ve-cortex_a15x1.dts	Mon Jun 15 18:43:32 2015	(r287128)
+++ soc2015/mihai/bhyve-on-arm-head/sys/boot/fdt/dts/arm/fvp_ve-cortex_a15x1.dts	Mon Jun 15 19:36:27 2015	(r287129)
@@ -10,8 +10,8 @@
 /dts-v1/;
 
 / {
-	model = "RTSM_VE_Cortex_A15x1";
-	compatible = "arm,rtsm_ve,cortex_a15x1", "arm,vexpress";
+	model = "FVP_VE_Cortex_A15x1";
+	compatible = "arm,fvp_ve,cortex_a15x1", "arm,vexpress";
 	interrupt-parent = <&gic>;
 	#address-cells = <2>;
 	#size-cells = <2>;
@@ -121,7 +121,7 @@
 				<0 0 41 &gic 0 41 4>,
 				<0 0 42 &gic 0 42 4>;
 
-		/include/ "rtsm_ve-motherboard.dtsi"
+		/include/ "fvp_ve-motherboard.dtsi"
 	};
 };
 

Modified: soc2015/mihai/bhyve-on-arm-head/sys/dev/ofw/ofw_bus_subr.c
==============================================================================
--- soc2015/mihai/bhyve-on-arm-head/sys/dev/ofw/ofw_bus_subr.c	Mon Jun 15 18:43:32 2015	(r287128)
+++ soc2015/mihai/bhyve-on-arm-head/sys/dev/ofw/ofw_bus_subr.c	Mon Jun 15 19:36:27 2015	(r287129)
@@ -440,7 +440,6 @@
 
 	nintr = OF_getencprop_alloc(node, "interrupts",  sizeof(*intr),
 	    (void **)&intr);
-	printf("%s %d\n",__func__,nintr);
 	if (nintr > 0) {
 		if (OF_searchencprop(node, "interrupt-parent", &iparent,
 		    sizeof(iparent)) == -1) {
@@ -495,7 +494,6 @@
 			}
 		}
 		irqnum = ofw_bus_map_intr(dev, iparent, icells, &intr[i]);
-		printf("%s irqnum:%d\m",irqnum);
 		resource_list_add(rl, SYS_RES_IRQ, rid++, irqnum, irqnum, 1);
 	}
 	if (rlen != NULL)