Use the platform_*_t typedefs to help check the platform function types are

correct.

Sponsored by:	ABT Systems Ltd

diff --git a/sys/arm/allwinner/aw_machdep.c b/sys/arm/allwinner/aw_machdep.c
index d9effb8eec9180cf80f0105697cefb242d885d43..2c34475656ee2e27e0b8d04c64d52209fdfb54bd 100644 (file)
--- a/sys/arm/allwinner/aw_machdep.c
+++ b/sys/arm/allwinner/aw_machdep.c
@@ -54,6 +54,17 @@ __FBSDID("$FreeBSD$");
 
 #include "platform_if.h"
 
+static platform_attach_t a10_attach;
+static platform_attach_t a13_attach;
+static platform_attach_t a20_attach;
+static platform_attach_t a31_attach;
+static platform_attach_t a31s_attach;
+static platform_attach_t a83t_attach;
+static platform_attach_t h3_attach;
+static platform_lastaddr_t allwinner_lastaddr;
+static platform_devmap_init_t allwinner_devmap_init;
+static platform_cpu_reset_t allwinner_cpu_reset;
+
 static u_int soc_type;
 static u_int soc_family;
 

diff --git a/sys/arm/broadcom/bcm2835/bcm2835_machdep.c b/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
index bd1762f88963f805a6ef07b2fdea4c0e714a6f87..5101f62c3d4183e9f6c7ebb08461294757c634dc 100644 (file)
--- a/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
@@ -62,6 +62,16 @@ __FBSDID("$FreeBSD$");
 
 #include "platform_if.h"
 
+#ifdef SOC_BCM2835
+static platform_devmap_init_t bcm2835_devmap_init;
+#endif
+#ifdef SOC_BCM2836
+static platform_devmap_init_t bcm2836_devmap_init;
+#endif
+static platform_lastaddr_t bcm2835_lastaddr;
+static platform_late_init_t bcm2835_late_init;
+static platform_cpu_reset_t bcm2835_cpu_reset;
+
 static vm_offset_t
 bcm2835_lastaddr(platform_t plat)
 {

diff --git a/sys/arm/freescale/imx/imx51_machdep.c b/sys/arm/freescale/imx/imx51_machdep.c
index 645d2810b3dd39d47f6fa4a2c34c4d2b3b8404d6..3d208768b9848493eb3ca633aca0758240b0f3c3 100644 (file)
--- a/sys/arm/freescale/imx/imx51_machdep.c
+++ b/sys/arm/freescale/imx/imx51_machdep.c
@@ -45,6 +45,11 @@ __FBSDID("$FreeBSD$");
 
 #include "platform_if.h"
 
+static platform_attach_t imx51_attach;
+static platform_devmap_init_t imx51_devmap_init;
+static platform_lastaddr_t imx51_lastaddr;
+static platform_cpu_reset_t imx51_cpu_reset;
+
 static vm_offset_t
 imx51_lastaddr(platform_t plat)
 {
@@ -88,7 +93,8 @@ imx51_cpu_reset(platform_t plat)
        imx_wdog_cpu_reset(0x73F98000);
 }
 
-u_int imx_soc_type()
+u_int
+imx_soc_type(void)
 {
        return (IMXSOC_51);
 }

diff --git a/sys/arm/freescale/imx/imx53_machdep.c b/sys/arm/freescale/imx/imx53_machdep.c
index 7596a2082f57c553cd61ff89c02ca0850a68c3d6..81a5486a1a19e30e7b7bea798056bbe9381dd799 100644 (file)
--- a/sys/arm/freescale/imx/imx53_machdep.c
+++ b/sys/arm/freescale/imx/imx53_machdep.c
@@ -45,6 +45,11 @@ __FBSDID("$FreeBSD$");
 
 #include "platform_if.h"
 
+static platform_attach_t imx53_attach;
+static platform_devmap_init_t imx53_devmap_init;
+static platform_lastaddr_t imx53_lastaddr;
+static platform_cpu_reset_t imx53_cpu_reset;
+
 static vm_offset_t
 imx53_lastaddr(platform_t plat)
 {
@@ -88,7 +93,8 @@ imx53_cpu_reset(platform_t plat)
        imx_wdog_cpu_reset(0x53F98000);
 }
 
-u_int imx_soc_type()
+u_int
+imx_soc_type(void)
 {
        return (IMXSOC_53);
 }

diff --git a/sys/arm/freescale/imx/imx6_machdep.c b/sys/arm/freescale/imx/imx6_machdep.c
index 4fa4523adabaaec1e733c1fe3897742961542e07..a2c5fd8d51e617913ce2cf996d9ff627e5d079b0 100644 (file)
--- a/sys/arm/freescale/imx/imx6_machdep.c
+++ b/sys/arm/freescale/imx/imx6_machdep.c
@@ -54,6 +54,12 @@ __FBSDID("$FreeBSD$");
 
 static uint32_t gpio1_node;
 
+static platform_attach_t imx6_attach;
+static platform_devmap_init_t imx6_devmap_init;
+static platform_lastaddr_t imx6_lastaddr;
+static platform_late_init_t imx6_late_init;
+static platform_cpu_reset_t imx6_cpu_reset;
+
 #ifndef INTRNG
 /*
  * Work around the linux workaround for imx6 erratum 006687, in which some
@@ -259,7 +265,8 @@ imx6_cpu_reset(platform_t plat)
  *      hwsoc      = 0x00000063
  *      scu config = 0x00005503
  */
-u_int imx_soc_type()
+u_int
+imx_soc_type(void)
 {
        uint32_t digprog, hwsoc;
        uint32_t *pcr;

diff --git a/sys/arm/nvidia/tegra124/tegra124_machdep.c b/sys/arm/nvidia/tegra124/tegra124_machdep.c
index b874b5abd0f33d09aa5cdd7db4b828924b990dfd..3ef47a16abba1defdc0f512962a79a746357f7f7 100644 (file)
--- a/sys/arm/nvidia/tegra124/tegra124_machdep.c
+++ b/sys/arm/nvidia/tegra124/tegra124_machdep.c
@@ -60,6 +60,12 @@ __FBSDID("$FreeBSD$");
                                        PMC_SCRATCH0_MODE_BOOTLOADER | \
                                        PMC_SCRATCH0_MODE_RCM)
 
+static platform_attach_t tegra124_attach;
+static platform_lastaddr_t tegra124_lastaddr;
+static platform_devmap_init_t tegra124_devmap_init;
+static platform_late_init_t tegra124_late_init;
+static platform_cpu_reset_t tegra124_cpu_reset;
+
 static vm_offset_t
 tegra124_lastaddr(platform_t plat)
 {

diff --git a/sys/arm/ti/ti_machdep.c b/sys/arm/ti/ti_machdep.c
index 23cfea021da6ebf3fafb6650692dd48a76c7df64..7963e225696e81a79c36289fe2e39fa6a0d0cc8a 100644 (file)
--- a/sys/arm/ti/ti_machdep.c
+++ b/sys/arm/ti/ti_machdep.c
@@ -58,6 +58,17 @@ __FBSDID("$FreeBSD$");
 
 #include "platform_if.h"
 
+#if defined(SOC_OMAP4)
+static platform_attach_t omap4_attach;
+static platform_devmap_init_t ti_omap4_devmap_init;
+#endif
+#if defined(SOC_TI_AM335X)
+static platform_attach_t ti_am335x_attach;
+static platform_devmap_init_t ti_am335x_devmap_init;
+#endif
+static platform_lastaddr_t ti_lastaddr;
+static platform_cpu_reset_t ti_plat_cpu_reset;
+
 void (*ti_cpu_reset)(void) = NULL;
 
 int _ti_chip = -1;