Index: head/sys/arm/conf/VERSATILEPB
===================================================================
--- head/sys/arm/conf/VERSATILEPB	(revision 320641)
+++ head/sys/arm/conf/VERSATILEPB	(revision 320642)
@@ -1,76 +1,77 @@
 #
 # VERSATILEPB - Configuration for QEMU version of Versatile Platform Board
 #
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
 #    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
 # FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
 # latest information.
 #
 # An exhaustive list of options and more detailed explanations of the
 # device lines is also present in the ../../conf/NOTES and NOTES files.
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
 # $FreeBSD$
 
 ident		VERSATILEPB
 machine		arm	armv6
 cpu 		CPU_ARM1176
 
 include 	"std.armv6"
 files		"../versatile/files.versatile"
 makeoptions	MODULES_OVERRIDE=""
 
 options 	KERNVIRTADDR=0xc0100000
 makeoptions	KERNVIRTADDR=0xc0100000
 
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	LINUX_BOOT_ABI		# Process metadata passed from Linux boot loaders
 
 options 	ROOTDEVNAME=\"ufs:da0s1a\"
 
 device		bpf
 device		loop
 device		mii
 device		mii_bitbang
 device		smc
 device		smcphy
 device		ether
 device		uart
 device		pl011
 device		pl190
 
 device		pty
 device		snp
 
 device		pci
 
 # SCSI Controllers
 device		sym			# NCR/Symbios/LSI Logic 53C8XX/53C1010/53C1510D
 
 # ATA/SCSI peripherals
 device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		pass			# Passthrough device (direct ATA/SCSI access)
 
 # NOTE: serial console is disabled if syscons enabled
 # Comment following lines for headless setup
 device		sc
 device		kbdmux
 options 	SC_DFLT_FONT    	# compile font in
 makeoptions	SC_DFLT_FONT=cp437
 
 device		md
 device		random			# Entropy device
 
 options 	INTRNG
+options 	PLATFORM
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=versatile-pb.dts
Index: head/sys/arm/versatile/versatile_machdep.c
===================================================================
--- head/sys/arm/versatile/versatile_machdep.c	(revision 320641)
+++ head/sys/arm/versatile/versatile_machdep.c	(revision 320642)
@@ -1,108 +1,103 @@
 /*-
  * Copyright (c) 2012 Oleksandr Tymoshenko.
  * All rights reserved.
  *
  * This code is derived from software written for Brini by Mark Brinicombe
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *      This product includes software developed by Brini.
  * 4. The name of the company nor the name of the author may be used to
  *    endorse or promote products derived from this software without specific
  *    prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY BRINI ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL BRINI OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  */
 
 #include "opt_ddb.h"
 #include "opt_platform.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/devmap.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
 #include <machine/machdep.h>
-#include <machine/platform.h> 
+#include <machine/platform.h>
+#include <machine/platformvar.h>
 
+#include "platform_if.h"
+
 /* Start of address space used for bootstrap map */
 #define DEVMAP_BOOTSTRAP_MAP_START	0xE0000000
 
-vm_offset_t
-platform_lastaddr(void)
+static vm_offset_t
+versatile_lastaddr(platform_t plat)
 {
 
 	return (DEVMAP_BOOTSTRAP_MAP_START);
 }
 
-void
-platform_probe_and_attach(void)
-{
-
-}
-
-void
-platform_gpio_init(void)
-{
-}
-
-void
-platform_late_init(void)
-{
-}
-
 #define FDT_DEVMAP_MAX	(2)		/* FIXME */
 static struct devmap_entry fdt_devmap[FDT_DEVMAP_MAX] = {
 	{ 0, 0, 0, },
 	{ 0, 0, 0, }
 };
 
 
 /*
  * Construct devmap table with DT-derived config data.
  */
-int
-platform_devmap_init(void)
+static int
+versatile_devmap_init(platform_t plat)
 {
 	int i = 0;
 	fdt_devmap[i].pd_va = 0xf0100000;
 	fdt_devmap[i].pd_pa = 0x10100000;
 	fdt_devmap[i].pd_size = 0x01000000;       /* 1 MB */
 
 	devmap_register_table(&fdt_devmap[0]);
 	return (0);
 }
 
-void
-cpu_reset(void)
+static void
+versatile_cpu_reset(platform_t plat)
 {
 	printf("cpu_reset\n");
 	while (1);
 }
 
+static platform_method_t versatile_methods[] = {
+	PLATFORMMETHOD(platform_lastaddr,	versatile_lastaddr),
+	PLATFORMMETHOD(platform_devmap_init,	versatile_devmap_init),
+	PLATFORMMETHOD(platform_cpu_reset,	versatile_cpu_reset),
+
+	PLATFORMMETHOD_END,
+};
+FDT_PLATFORM_DEF(versatile, "versatile", 0, "arm,versatile-pb", 1);