Date: Tue, 13 Dec 2016 13:46:09 +0000 (UTC) From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r310022 - in head/sys/arm: allwinner broadcom/bcm2835 freescale/imx nvidia/tegra124 ti Message-ID: <201612131346.uBDDk9Al038447@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew Date: Tue Dec 13 13:46:09 2016 New Revision: 310022 URL: https://svnweb.freebsd.org/changeset/base/310022 Log: Use the platform_*_t typedefs to help check the platform function types are correct. Sponsored by: ABT Systems Ltd Modified: head/sys/arm/allwinner/aw_machdep.c head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c head/sys/arm/freescale/imx/imx51_machdep.c head/sys/arm/freescale/imx/imx53_machdep.c head/sys/arm/freescale/imx/imx6_machdep.c head/sys/arm/nvidia/tegra124/tegra124_machdep.c head/sys/arm/ti/ti_machdep.c Modified: head/sys/arm/allwinner/aw_machdep.c ============================================================================== --- head/sys/arm/allwinner/aw_machdep.c Tue Dec 13 13:43:22 2016 (r310021) +++ head/sys/arm/allwinner/aw_machdep.c Tue Dec 13 13:46:09 2016 (r310022) @@ -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; Modified: head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c ============================================================================== --- head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c Tue Dec 13 13:43:22 2016 (r310021) +++ head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c Tue Dec 13 13:46:09 2016 (r310022) @@ -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) { Modified: head/sys/arm/freescale/imx/imx51_machdep.c ============================================================================== --- head/sys/arm/freescale/imx/imx51_machdep.c Tue Dec 13 13:43:22 2016 (r310021) +++ head/sys/arm/freescale/imx/imx51_machdep.c Tue Dec 13 13:46:09 2016 (r310022) @@ -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); } Modified: head/sys/arm/freescale/imx/imx53_machdep.c ============================================================================== --- head/sys/arm/freescale/imx/imx53_machdep.c Tue Dec 13 13:43:22 2016 (r310021) +++ head/sys/arm/freescale/imx/imx53_machdep.c Tue Dec 13 13:46:09 2016 (r310022) @@ -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); } Modified: head/sys/arm/freescale/imx/imx6_machdep.c ============================================================================== --- head/sys/arm/freescale/imx/imx6_machdep.c Tue Dec 13 13:43:22 2016 (r310021) +++ head/sys/arm/freescale/imx/imx6_machdep.c Tue Dec 13 13:46:09 2016 (r310022) @@ -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; Modified: head/sys/arm/nvidia/tegra124/tegra124_machdep.c ============================================================================== --- head/sys/arm/nvidia/tegra124/tegra124_machdep.c Tue Dec 13 13:43:22 2016 (r310021) +++ head/sys/arm/nvidia/tegra124/tegra124_machdep.c Tue Dec 13 13:46:09 2016 (r310022) @@ -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) { Modified: head/sys/arm/ti/ti_machdep.c ============================================================================== --- head/sys/arm/ti/ti_machdep.c Tue Dec 13 13:43:22 2016 (r310021) +++ head/sys/arm/ti/ti_machdep.c Tue Dec 13 13:46:09 2016 (r310022) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612131346.uBDDk9Al038447>