PERFORCE change 1193912 for review
John Baldwin
jhb at FreeBSD.org
Sat May 17 14:00:50 UTC 2014
http://p4web.freebsd.org/@@1193912?ac=10
Change 1193912 by jhb at jhb_pippin on 2014/05/17 14:00:41
IFC @1193911
Affected files ...
.. //depot/projects/smpng/sys/arm/allwinner/a10_machdep.c#6 integrate
.. //depot/projects/smpng/sys/arm/arm/machdep.c#51 integrate
.. //depot/projects/smpng/sys/arm/arm/platform.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/platform_if.m#1 branch
.. //depot/projects/smpng/sys/arm/broadcom/bcm2835/bcm2835_machdep.c#5 integrate
.. //depot/projects/smpng/sys/arm/conf/RPI-B#10 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx51_machdep.c#4 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx53_machdep.c#3 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx6_machdep.c#3 integrate
.. //depot/projects/smpng/sys/arm/freescale/vybrid/vf_machdep.c#2 integrate
.. //depot/projects/smpng/sys/arm/include/devmap.h#3 integrate
.. //depot/projects/smpng/sys/arm/include/machdep.h#11 integrate
.. //depot/projects/smpng/sys/arm/include/platform.h#1 branch
.. //depot/projects/smpng/sys/arm/include/platformvar.h#1 branch
.. //depot/projects/smpng/sys/arm/lpc/lpc_machdep.c#7 integrate
.. //depot/projects/smpng/sys/arm/mv/mv_machdep.c#27 integrate
.. //depot/projects/smpng/sys/arm/rockchip/rk30xx_machdep.c#4 integrate
.. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_machdep.c#4 integrate
.. //depot/projects/smpng/sys/arm/tegra/tegra2_machdep.c#6 integrate
.. //depot/projects/smpng/sys/arm/ti/ti_machdep.c#7 integrate
.. //depot/projects/smpng/sys/arm/versatile/versatile_machdep.c#3 integrate
.. //depot/projects/smpng/sys/arm/xilinx/zy7_machdep.c#4 integrate
.. //depot/projects/smpng/sys/conf/files.arm#34 integrate
.. //depot/projects/smpng/sys/conf/options.arm#39 integrate
.. //depot/projects/smpng/sys/dev/fdt/fdt_arm_platform.c#1 branch
.. //depot/projects/smpng/sys/netinet/ip_fw.h#65 integrate
.. //depot/projects/smpng/sys/netinet/tcp_var.h#95 integrate
.. //depot/projects/smpng/sys/netpfil/ipfw/ip_fw_table.c#5 integrate
.. //depot/projects/smpng/sys/netpfil/pf/pf_norm.c#4 integrate
Differences ...
==== //depot/projects/smpng/sys/arm/allwinner/a10_machdep.c#6 (text+ko) ====
@@ -32,7 +32,7 @@
#include "opt_platform.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/allwinner/a10_machdep.c 263711 2014-03-25 08:31:47Z ganbold $");
+__FBSDID("$FreeBSD: head/sys/arm/allwinner/a10_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -45,30 +45,31 @@
#include <machine/bus.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
#include <dev/fdt/fdt_common.h>
#include <arm/allwinner/a10_wdog.h>
vm_offset_t
-initarm_lastaddr(void)
+platform_lastaddr(void)
{
return (arm_devmap_lastaddr());
}
void
-initarm_early_init(void)
+platform_probe_and_attach(void)
{
}
void
-initarm_gpio_init(void)
+platform_gpio_init(void)
{
}
void
-initarm_late_init(void)
+platform_late_init(void)
{
}
@@ -83,7 +84,7 @@
* perhaps a 1MB block would be more appropriate.
*/
int
-initarm_devmap_init(void)
+platform_devmap_init(void)
{
arm_devmap_add_entry(0x01C00000, 0x00400000); /* 4MB */
==== //depot/projects/smpng/sys/arm/arm/machdep.c#51 (text+ko) ====
@@ -49,7 +49,7 @@
#include "opt_timer.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/arm/machdep.c 265914 2014-05-12 13:08:37Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/arm/machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -98,6 +98,7 @@
#include <machine/metadata.h>
#include <machine/pcb.h>
#include <machine/physmem.h>
+#include <machine/platform.h>
#include <machine/reg.h>
#include <machine/trap.h>
#include <machine/undefined.h>
@@ -1091,7 +1092,7 @@
EXFLAG_NODUMP | EXFLAG_NOALLOC);
/* Platform-specific initialisation */
- initarm_early_init();
+ platform_probe_and_attach();
pcpu0_init();
@@ -1207,9 +1208,9 @@
VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE, PTE_CACHE);
/* Establish static device mappings. */
- err_devmap = initarm_devmap_init();
+ err_devmap = platform_devmap_init();
arm_devmap_bootstrap(l1pagetable, NULL);
- vm_max_kernel_address = initarm_lastaddr();
+ vm_max_kernel_address = platform_lastaddr();
cpu_domains((DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL * 2)) | DOMAIN_CLIENT);
pmap_pa = kernel_l1pt.pv_pa;
@@ -1229,7 +1230,7 @@
*/
OF_interpret("perform-fixup", 0);
- initarm_gpio_init();
+ platform_gpio_init();
cninit();
@@ -1247,7 +1248,7 @@
printf("WARNING: could not fully configure devmap, error=%d\n",
err_devmap);
- initarm_late_init();
+ platform_late_init();
/*
* Pages were allocated during the secondary bootstrap for the
==== //depot/projects/smpng/sys/arm/broadcom/bcm2835/bcm2835_machdep.c#5 (text+ko) ====
@@ -41,7 +41,7 @@
#include "opt_global.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c 260371 2014-01-06 15:48:16Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -54,31 +54,24 @@
#include <machine/bus.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
+#include <machine/platformvar.h>
#include <dev/fdt/fdt_common.h>
#include <arm/broadcom/bcm2835/bcm2835_wdog.h>
-vm_offset_t
-initarm_lastaddr(void)
+#include "platform_if.h"
+
+static vm_offset_t
+bcm2835_lastaddr(platform_t plat)
{
return (arm_devmap_lastaddr());
}
-void
-initarm_early_init(void)
-{
-
-}
-
-void
-initarm_gpio_init(void)
-{
-}
-
-void
-initarm_late_init(void)
+static void
+bcm2835_late_init(platform_t plat)
{
phandle_t system;
pcell_t cells[2];
@@ -101,8 +94,8 @@
* All on-chip peripherals exist in a 16MB range starting at 0x20000000.
* Map the entire range using 1MB section mappings.
*/
-int
-initarm_devmap_init(void)
+static int
+bcm2835_devmap_init(platform_t plat)
{
arm_devmap_add_entry(0x20000000, 0x01000000);
@@ -129,4 +122,13 @@
bcmwd_watchdog_reset();
while (1);
}
+static platform_method_t bcm2835_methods[] = {
+ PLATFORMMETHOD(platform_devmap_init, bcm2835_devmap_init),
+ PLATFORMMETHOD(platform_lastaddr, bcm2835_lastaddr),
+ PLATFORMMETHOD(platform_late_init, bcm2835_late_init),
+
+ PLATFORMMETHOD_END,
+};
+
+FDT_PLATFORM_DEF(bcm2835, "bcm2835", 0, "raspberrypi,model-b");
==== //depot/projects/smpng/sys/arm/conf/RPI-B#10 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/RPI-B 263301 2014-03-18 14:41:18Z imp $
+# $FreeBSD: head/sys/arm/conf/RPI-B 266301 2014-05-17 11:27:36Z andrew $
ident RPI-B
@@ -59,6 +59,7 @@
#options ROOTDEVNAME=\"ufs:mmcsd0s2\"
options PREEMPTION
+options PLATFORM
device bpf
device loop
==== //depot/projects/smpng/sys/arm/freescale/imx/imx51_machdep.c#4 (text+ko) ====
@@ -27,7 +27,7 @@
#include "opt_platform.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx51_machdep.c 257678 2013-11-05 05:18:18Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx51_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,18 +39,19 @@
#include <machine/bus.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
#include <arm/freescale/imx/imx_machdep.h>
vm_offset_t
-initarm_lastaddr(void)
+platform_lastaddr(void)
{
return (arm_devmap_lastaddr());
}
void
-initarm_early_init(void)
+platform_probe_and_attach(void)
{
/* XXX - Get rid of this stuff soon. */
@@ -59,13 +60,13 @@
}
void
-initarm_gpio_init(void)
+platform_gpio_init(void)
{
}
void
-initarm_late_init(void)
+platform_late_init(void)
{
}
@@ -78,7 +79,7 @@
* Notably missing are entries for GPU, IPU, in general anything video related.
*/
int
-initarm_devmap_init(void)
+platform_devmap_init(void)
{
arm_devmap_add_entry(0x70000000, 0x00100000);
==== //depot/projects/smpng/sys/arm/freescale/imx/imx53_machdep.c#3 (text+ko) ====
@@ -27,7 +27,7 @@
#include "opt_platform.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx53_machdep.c 257678 2013-11-05 05:18:18Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx53_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,17 +39,19 @@
#include <machine/bus.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
+
#include <arm/freescale/imx/imx_machdep.h>
vm_offset_t
-initarm_lastaddr(void)
+platform_lastaddr(void)
{
return (arm_devmap_lastaddr());
}
void
-initarm_early_init(void)
+platform_probe_and_attach(void)
{
/* XXX - Get rid of this stuff soon. */
@@ -58,13 +60,13 @@
}
void
-initarm_gpio_init(void)
+platform_gpio_init(void)
{
}
void
-initarm_late_init(void)
+platform_late_init(void)
{
}
@@ -77,7 +79,7 @@
* Notably missing are entries for GPU, IPU, in general anything video related.
*/
int
-initarm_devmap_init(void)
+platform_devmap_init(void)
{
arm_devmap_add_entry(0x50000000, 0x00100000);
==== //depot/projects/smpng/sys/arm/freescale/imx/imx6_machdep.c#3 (text+ko) ====
@@ -27,7 +27,7 @@
#include "opt_platform.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx6_machdep.c 264056 2014-04-02 21:06:43Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx6_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,6 +39,7 @@
#include <machine/bus.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
#include <arm/arm/mpcore_timervar.h>
#include <arm/freescale/imx/imx6_anatopreg.h>
@@ -46,14 +47,14 @@
#include <arm/freescale/imx/imx_machdep.h>
vm_offset_t
-initarm_lastaddr(void)
+platform_lastaddr(void)
{
return (arm_devmap_lastaddr());
}
void
-initarm_early_init(void)
+platform_probe_and_attach(void)
{
/* Inform the MPCore timer driver that its clock is variable. */
@@ -61,13 +62,13 @@
}
void
-initarm_gpio_init(void)
+platform_gpio_init(void)
{
}
void
-initarm_late_init(void)
+platform_late_init(void)
{
}
@@ -89,7 +90,7 @@
* as OCRAM that probably shouldn't be mapped as PTE_DEVICE memory.
*/
int
-initarm_devmap_init(void)
+platform_devmap_init(void)
{
const uint32_t IMX6_ARMMP_PHYS = 0x00a00000;
const uint32_t IMX6_ARMMP_SIZE = 0x00100000;
==== //depot/projects/smpng/sys/arm/freescale/vybrid/vf_machdep.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
#include "opt_platform.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/freescale/vybrid/vf_machdep.c 258057 2013-11-12 18:02:56Z br $");
+__FBSDID("$FreeBSD: head/sys/arm/freescale/vybrid/vf_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -41,36 +41,37 @@
#include <machine/bus.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
#include <dev/fdt/fdt_common.h>
vm_offset_t
-initarm_lastaddr(void)
+platform_lastaddr(void)
{
return (arm_devmap_lastaddr());
}
void
-initarm_early_init(void)
+platform_probe_and_attach(void)
{
}
void
-initarm_gpio_init(void)
+platform_gpio_init(void)
{
}
void
-initarm_late_init(void)
+platform_late_init(void)
{
}
int
-initarm_devmap_init(void)
+platform_devmap_init(void)
{
arm_devmap_add_entry(0x40000000, 0x100000);
==== //depot/projects/smpng/sys/arm/include/devmap.h#3 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/arm/include/devmap.h 260493 2014-01-09 20:57:19Z ian $
+ * $FreeBSD: head/sys/arm/include/devmap.h 266303 2014-05-17 11:29:44Z andrew $
*/
#ifndef _MACHINE_DEVMAP_H_
@@ -45,7 +45,7 @@
* Return the lowest KVA address used in any entry in the registered devmap
* table. This works with whatever table is registered, including the internal
* table used by arm_devmap_add_entry() if that routine was used. Platforms can
- * implement initarm_lastaddr() by calling this if static device mappings are
+ * implement platform_lastaddr() by calling this if static device mappings are
* their only use of high KVA space.
*/
vm_offset_t arm_devmap_lastaddr(void);
==== //depot/projects/smpng/sys/arm/include/machdep.h#11 (text+ko) ====
@@ -1,5 +1,5 @@
/* $NetBSD: machdep.h,v 1.7 2002/02/21 02:52:21 thorpej Exp $ */
-/* $FreeBSD: head/sys/arm/include/machdep.h 262534 2014-02-26 22:06:10Z ian $ */
+/* $FreeBSD: head/sys/arm/include/machdep.h 266301 2014-05-17 11:27:36Z andrew $ */
#ifndef _MACHDEP_BOOT_MACHDEP_H_
#define _MACHDEP_BOOT_MACHDEP_H_
@@ -34,40 +34,6 @@
vm_offset_t parse_boot_param(struct arm_boot_params *abp);
void arm_generic_initclocks(void);
-/*
- * Initialization functions called by the common initarm() function in
- * arm/machdep.c (but not necessarily from the custom initarm() functions of
- * older code).
- *
- * - initarm_early_init() is called very early, after parsing the boot params
- * and after physical memory has been located and sized.
- *
- * - initarm_devmap_init() is called as one of the last steps of early virtual
- * memory initialization, shortly before the new page tables are installed.
- *
- * - initarm_lastaddr() is called after initarm_devmap_init(), and must return
- * the address of the first byte of unusable KVA space. This allows a
- * platform to carve out of the top of the KVA space whatever reserves it
- * needs for things like static device mapping, and this is called to get the
- * value before calling pmap_bootstrap() which uses the value to size the
- * available KVA.
- *
- * - initarm_gpio_init() is called after the static device mappings are
- * established and just before cninit(). The intention is that the routine
- * can do any hardware setup (such as gpio or pinmux) necessary to make the
- * console functional.
- *
- * - initarm_late_init() is called just after cninit(). This is the first of
- * the init routines that can use printf() and expect the output to appear on
- * a standard console.
- *
- */
-void initarm_early_init(void);
-int initarm_devmap_init(void);
-vm_offset_t initarm_lastaddr(void);
-void initarm_gpio_init(void);
-void initarm_late_init(void);
-
/* Board-specific attributes */
void board_set_serial(uint64_t);
void board_set_revision(uint32_t);
==== //depot/projects/smpng/sys/arm/lpc/lpc_machdep.c#7 (text+ko) ====
@@ -39,7 +39,7 @@
#include "opt_platform.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/lpc/lpc_machdep.c 265858 2014-05-10 21:30:19Z andrew $");
+__FBSDID("$FreeBSD: head/sys/arm/lpc/lpc_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -53,6 +53,7 @@
#include <machine/fdt.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
#include <arm/lpc/lpcreg.h>
#include <arm/lpc/lpcvar.h>
@@ -60,19 +61,19 @@
#include <dev/fdt/fdt_common.h>
vm_offset_t
-initarm_lastaddr(void)
+platform_lastaddr(void)
{
return (arm_devmap_lastaddr());
}
void
-initarm_early_init(void)
+platform_probe_and_attach(void)
{
}
void
-initarm_gpio_init(void)
+platform_gpio_init(void)
{
/*
@@ -82,7 +83,7 @@
}
void
-initarm_late_init(void)
+platform_late_init(void)
{
}
@@ -92,7 +93,7 @@
* dts file when this code was converted to arm_devmap_add_entry().
*/
int
-initarm_devmap_init(void)
+platform_devmap_init(void)
{
arm_devmap_add_entry(LPC_DEV_PHYS_BASE, LPC_DEV_SIZE);
==== //depot/projects/smpng/sys/arm/mv/mv_machdep.c#27 (text+ko) ====
@@ -39,7 +39,7 @@
#include "opt_platform.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/mv/mv_machdep.c 265852 2014-05-10 20:03:03Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/mv/mv_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -53,6 +53,7 @@
#include <machine/devmap.h>
#include <machine/fdt.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
#include <arm/mv/mvreg.h> /* XXX */
#include <arm/mv/mvvar.h> /* XXX eventually this should be eliminated */
@@ -201,14 +202,14 @@
}
vm_offset_t
-initarm_lastaddr(void)
+platform_lastaddr(void)
{
return (fdt_immr_va);
}
void
-initarm_early_init(void)
+platform_probe_and_attach(void)
{
if (fdt_immr_addr(MV_BASE) != 0)
@@ -216,7 +217,7 @@
}
void
-initarm_gpio_init(void)
+platform_gpio_init(void)
{
/*
@@ -228,7 +229,7 @@
}
void
-initarm_late_init(void)
+platform_late_init(void)
{
/*
* Re-initialise decode windows
@@ -297,7 +298,7 @@
* Supply a default do-nothing implementation of mv_pci_devmap() via a weak
* alias. Many Marvell platforms don't support a PCI interface, but to support
* those that do, we end up with a reference to this function below, in
- * initarm_devmap_init(). If "device pci" appears in the kernel config, the
+ * platform_devmap_init(). If "device pci" appears in the kernel config, the
* real implementation of this function in arm/mv/mv_pci.c overrides the weak
* alias defined here.
*/
@@ -321,7 +322,7 @@
* Construct pmap_devmap[] with DT-derived config data.
*/
int
-initarm_devmap_init(void)
+platform_devmap_init(void)
{
phandle_t root, child;
pcell_t bank_count;
==== //depot/projects/smpng/sys/arm/rockchip/rk30xx_machdep.c#4 (text+ko) ====
@@ -32,7 +32,7 @@
#include "opt_platform.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/rockchip/rk30xx_machdep.c 265739 2014-05-09 05:39:57Z ganbold $");
+__FBSDID("$FreeBSD: head/sys/arm/rockchip/rk30xx_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -46,31 +46,32 @@
#include <machine/bus.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
#include <dev/fdt/fdt_common.h>
#include <arm/rockchip/rk30xx_wdog.h>
vm_offset_t
-initarm_lastaddr(void)
+platform_lastaddr(void)
{
return (arm_devmap_lastaddr());
}
void
-initarm_early_init(void)
+platform_probe_and_attach(void)
{
}
void
-initarm_gpio_init(void)
+platform_gpio_init(void)
{
}
void
-initarm_late_init(void)
+platform_late_init(void)
{
/* Enable cache */
@@ -82,7 +83,7 @@
* Set up static device mappings.
*/
int
-initarm_devmap_init(void)
+platform_devmap_init(void)
{
arm_devmap_add_entry(0x10000000, 0x00200000);
==== //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_machdep.c#4 (text+ko) ====
@@ -28,7 +28,7 @@
#include "opt_platform.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/samsung/exynos/exynos5_machdep.c 258096 2013-11-13 16:17:05Z br $");
+__FBSDID("$FreeBSD: head/sys/arm/samsung/exynos/exynos5_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -41,36 +41,37 @@
#include <machine/bus.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
#include <dev/fdt/fdt_common.h>
vm_offset_t
-initarm_lastaddr(void)
+platform_lastaddr(void)
{
return (arm_devmap_lastaddr());
}
void
-initarm_early_init(void)
+platform_probe_and_attach(void)
{
}
void
-initarm_gpio_init(void)
+platform_gpio_init(void)
{
}
void
-initarm_late_init(void)
+platform_late_init(void)
{
}
int
-initarm_devmap_init(void)
+platform_devmap_init(void)
{
/* UART */
==== //depot/projects/smpng/sys/arm/tegra/tegra2_machdep.c#6 (text+ko) ====
@@ -34,7 +34,7 @@
#include "opt_platform.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/tegra/tegra2_machdep.c 260323 2014-01-05 16:45:34Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/tegra/tegra2_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -47,6 +47,7 @@
#include <machine/bus.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
#include <dev/fdt/fdt_common.h>
@@ -99,24 +100,24 @@
#endif
vm_offset_t
-initarm_lastaddr(void)
+platform_lastaddr(void)
{
return (arm_devmap_lastaddr());
}
void
-initarm_early_init(void)
+platform_probe_and_attach(void)
{
}
void
-initarm_gpio_init(void)
+platform_gpio_init(void)
{
}
void
-initarm_late_init(void)
+platform_late_init(void)
{
}
@@ -126,7 +127,7 @@
* before conversion to the newer arm_devmap_add_entry() routine.
*/
int
-initarm_devmap_init(void)
+platform_devmap_init(void)
{
arm_devmap_add_entry(0x70000000, 0x00100000);
==== //depot/projects/smpng/sys/arm/ti/ti_machdep.c#7 (text+ko) ====
@@ -38,7 +38,7 @@
#include "opt_platform.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/ti/ti_machdep.c 260294 2014-01-04 22:14:59Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/ti/ti_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -51,30 +51,31 @@
#include <machine/bus.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
#include <arm/ti/omap4/omap4_reg.h>
void (*ti_cpu_reset)(void) = NULL;
vm_offset_t
-initarm_lastaddr(void)
+platform_lastaddr(void)
{
return (arm_devmap_lastaddr());
}
void
-initarm_early_init(void)
+platform_probe_and_attach(void)
{
}
void
-initarm_gpio_init(void)
+platform_gpio_init(void)
{
}
void
-initarm_late_init(void)
+platform_late_init(void)
{
}
@@ -83,7 +84,7 @@
* peripherals using 1mb section mappings.
*/
int
-initarm_devmap_init(void)
+platform_devmap_init(void)
{
#if defined(SOC_OMAP4)
arm_devmap_add_entry(0x48000000, 0x01000000); /*16mb L4_PER devices */
==== //depot/projects/smpng/sys/arm/versatile/versatile_machdep.c#3 (text+ko) ====
@@ -38,7 +38,7 @@
#include "opt_global.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/versatile/versatile_machdep.c 257669 2013-11-05 02:57:34Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/versatile/versatile_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -51,6 +51,7 @@
#include <machine/bus.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
#include <dev/fdt/fdt_common.h>
@@ -58,25 +59,25 @@
#define DEVMAP_BOOTSTRAP_MAP_START 0xE0000000
vm_offset_t
-initarm_lastaddr(void)
+platform_lastaddr(void)
{
return (DEVMAP_BOOTSTRAP_MAP_START);
}
void
-initarm_early_init(void)
+platform_probe_and_attach(void)
{
}
void
-initarm_gpio_init(void)
+platform_gpio_init(void)
{
}
void
-initarm_late_init(void)
+platform_late_init(void)
{
}
@@ -91,7 +92,7 @@
* Construct pmap_devmap[] with DT-derived config data.
*/
int
-initarm_devmap_init(void)
+platform_devmap_init(void)
{
int i = 0;
fdt_devmap[i].pd_va = 0xf0100000;
==== //depot/projects/smpng/sys/arm/xilinx/zy7_machdep.c#4 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/arm/xilinx/zy7_machdep.c 265148 2014-04-30 14:38:13Z ian $
+ * $FreeBSD: head/sys/arm/xilinx/zy7_machdep.c 266301 2014-05-17 11:27:36Z andrew $
*/
/*
@@ -36,7 +36,7 @@
#include "opt_global.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/xilinx/zy7_machdep.c 265148 2014-04-30 14:38:13Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/xilinx/zy7_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -51,31 +51,32 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list