svn commit: r255642 - head/sys/powerpc/ofw

[Nathan Whitehorn]

Author: nwhitehorn
Date: Tue Sep 17 17:31:53 2013
New Revision: 255642
URL: http://svnweb.freebsd.org/changeset/base/255642

Log:
  Only attach if properties we need (address, in particular) are present.
  This is the correct version of r255420.
  
  Approved by:	re (kib)

Modified:
  head/sys/powerpc/ofw/ofw_syscons.c

Modified: head/sys/powerpc/ofw/ofw_syscons.c
==============================================================================
--- head/sys/powerpc/ofw/ofw_syscons.c	Tue Sep 17 17:30:49 2013	(r255641)
+++ head/sys/powerpc/ofw/ofw_syscons.c	Tue Sep 17 17:31:53 2013	(r255642)
@@ -264,6 +264,10 @@ ofwfb_configure(int flags)
 	} else
 		return (0);
 
+	if (OF_getproplen(node, "height") != sizeof(sc->sc_height) ||
+	    OF_getproplen(node, "width") != sizeof(sc->sc_width))
+		return (0);
+
 	sc->sc_depth = depth;
 	sc->sc_node = node;
 	sc->sc_console = 1;
@@ -278,6 +282,8 @@ ofwfb_configure(int flags)
 	 *
 	 * XXX We assume #address-cells is 1 at this point.
 	 */
+	if (OF_getproplen(node, "address") != sizeof(fb_phys))
+		return (0);
 	OF_getprop(node, "address", &fb_phys, sizeof(fb_phys));
 
 	bus_space_map(&bs_be_tag, fb_phys, sc->sc_height * sc->sc_stride,