2 files changed, 9 insertions, 7 deletions

diff --git a/sys/arm/broadcom/bcm2835/bcm2835_fb.c b/sys/arm/broadcom/bcm2835/bcm2835_fb.c
index 58caac2..15746ec 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_fb.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_fb.c
@@ -474,15 +474,15 @@ bcmfb_configure(int flags)
 	if ((root != 0) && 
 	    (display = fdt_find_compatible(root, "broadcom,bcm2835-fb", 1))) {
 		if (sc->width == 0) {
-			if ((OF_getprop(display, "broadcom,width", 
+			if ((OF_getencprop(display, "broadcom,width",
 			    &cell, sizeof(cell))) > 0)
-				sc->width = (int)fdt32_to_cpu(cell);
+				sc->width = cell;
 		}
 
 		if (sc->height == 0) {
 			if ((OF_getprop(display, "broadcom,height", 
 			    &cell, sizeof(cell))) > 0)
-				sc->height = (int)fdt32_to_cpu(cell);
+				sc->height = cell;
 		}
 	}
 
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_machdep.c b/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
index 811c108..8615335 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
@@ -78,13 +78,15 @@ bcm2835_late_init(platform_t plat)
 
 	system = OF_finddevice("/system");
 	if (system != 0) {
-		len = OF_getprop(system, "linux,serial", &cells, sizeof(cells));
+		len = OF_getencprop(system, "linux,serial", cells,
+		    sizeof(cells));
 		if (len > 0)
-			board_set_serial(fdt64_to_cpu(*((uint64_t *)cells)));
+			board_set_serial(((uint64_t)cells[0]) << 32 | cells[1]);
 
-		len = OF_getprop(system, "linux,revision", &cells, sizeof(cells));
+		len = OF_getencprop(system, "linux,revision", cells,
+		    sizeof(cells));
 		if (len > 0)
-			board_set_revision(fdt32_to_cpu(*((uint32_t *)cells)));
+			board_set_revision(cells[0]);
 	}
 }