Date: Fri, 23 Sep 2016 14:11:23 +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: r306267 - in head/sys: arm/allwinner arm/altera/socfpga arm/amlogic/aml8726 arm/annapurna/alpine arm/at91 arm/broadcom/bcm2835 arm/freescale/imx arm/freescale/vybrid arm/lpc arm/nvidia/... Message-ID: <201609231411.u8NEBN6m087568@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew Date: Fri Sep 23 14:11:23 2016 New Revision: 306267 URL: https://svnweb.freebsd.org/changeset/base/306267 Log: Restrict where we need to define fdt_fixup_table to just PowerPC and Marvell. Sponsored by: ABT Systems Ltd Modified: head/sys/arm/allwinner/a10_common.c head/sys/arm/altera/socfpga/socfpga_common.c head/sys/arm/amlogic/aml8726/aml8726_machdep.c head/sys/arm/annapurna/alpine/common.c head/sys/arm/at91/at91_common.c head/sys/arm/broadcom/bcm2835/bcm2835_common.c head/sys/arm/freescale/imx/imx6_machdep.c head/sys/arm/freescale/imx/imx_common.c head/sys/arm/freescale/vybrid/vf_common.c head/sys/arm/lpc/lpc_intc.c head/sys/arm/nvidia/tegra124/tegra124_machdep.c head/sys/arm/qemu/virt_common.c head/sys/arm/rockchip/rk30xx_common.c head/sys/arm/samsung/exynos/exynos5_common.c head/sys/arm/ti/ti_common.c head/sys/arm/versatile/versatile_common.c head/sys/arm/xilinx/zy7_machdep.c head/sys/dev/ofw/ofw_fdt.c Modified: head/sys/arm/allwinner/a10_common.c ============================================================================== --- head/sys/arm/allwinner/a10_common.c Fri Sep 23 13:23:52 2016 (r306266) +++ head/sys/arm/allwinner/a10_common.c Fri Sep 23 14:11:23 2016 (r306267) @@ -38,10 +38,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/vmparam.h> -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int Modified: head/sys/arm/altera/socfpga/socfpga_common.c ============================================================================== --- head/sys/arm/altera/socfpga/socfpga_common.c Fri Sep 23 13:23:52 2016 (r306266) +++ head/sys/arm/altera/socfpga/socfpga_common.c Fri Sep 23 14:11:23 2016 (r306267) @@ -70,10 +70,6 @@ end: while (1); } -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: head/sys/arm/amlogic/aml8726/aml8726_machdep.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_machdep.c Fri Sep 23 13:23:52 2016 (r306266) +++ head/sys/arm/amlogic/aml8726/aml8726_machdep.c Fri Sep 23 14:11:23 2016 (r306267) @@ -165,10 +165,6 @@ platform_devmap_init(void) return (0); } -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG #ifndef DEV_GIC static int Modified: head/sys/arm/annapurna/alpine/common.c ============================================================================== --- head/sys/arm/annapurna/alpine/common.c Fri Sep 23 13:23:52 2016 (r306266) +++ head/sys/arm/annapurna/alpine/common.c Fri Sep 23 14:11:23 2016 (r306267) @@ -56,9 +56,6 @@ __FBSDID("$FreeBSD$"); #define LOCK 0x00000001 extern bus_addr_t al_devmap_pa; -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; static int alpine_get_wdt_base(uint32_t *pbase, uint32_t *psize); static int alpine_pic_decode_fdt(uint32_t iparent, uint32_t *intr, Modified: head/sys/arm/at91/at91_common.c ============================================================================== --- head/sys/arm/at91/at91_common.c Fri Sep 23 13:23:52 2016 (r306266) +++ head/sys/arm/at91/at91_common.c Fri Sep 23 14:11:23 2016 (r306267) @@ -49,10 +49,6 @@ __FBSDID("$FreeBSD$"); extern const struct devmap_entry at91_devmap[]; -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_aic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: head/sys/arm/broadcom/bcm2835/bcm2835_common.c ============================================================================== --- head/sys/arm/broadcom/bcm2835/bcm2835_common.c Fri Sep 23 13:23:52 2016 (r306266) +++ head/sys/arm/broadcom/bcm2835/bcm2835_common.c Fri Sep 23 14:11:23 2016 (r306267) @@ -46,10 +46,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/vmparam.h> -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_intc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: head/sys/arm/freescale/imx/imx6_machdep.c ============================================================================== --- head/sys/arm/freescale/imx/imx6_machdep.c Fri Sep 23 13:23:52 2016 (r306266) +++ head/sys/arm/freescale/imx/imx6_machdep.c Fri Sep 23 14:11:23 2016 (r306267) @@ -52,10 +52,6 @@ __FBSDID("$FreeBSD$"); #include "platform_if.h" -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - static uint32_t gpio1_node; #ifndef INTRNG Modified: head/sys/arm/freescale/imx/imx_common.c ============================================================================== --- head/sys/arm/freescale/imx/imx_common.c Fri Sep 23 13:23:52 2016 (r306266) +++ head/sys/arm/freescale/imx/imx_common.c Fri Sep 23 14:11:23 2016 (r306267) @@ -50,10 +50,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/vmparam.h> -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_intc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: head/sys/arm/freescale/vybrid/vf_common.c ============================================================================== --- head/sys/arm/freescale/vybrid/vf_common.c Fri Sep 23 13:23:52 2016 (r306266) +++ head/sys/arm/freescale/vybrid/vf_common.c Fri Sep 23 14:11:23 2016 (r306267) @@ -62,10 +62,6 @@ end: while (1); } -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: head/sys/arm/lpc/lpc_intc.c ============================================================================== --- head/sys/arm/lpc/lpc_intc.c Fri Sep 23 13:23:52 2016 (r306266) +++ head/sys/arm/lpc/lpc_intc.c Fri Sep 23 14:11:23 2016 (r306267) @@ -227,10 +227,6 @@ lpc_intc_eoi(void *data) } -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: head/sys/arm/nvidia/tegra124/tegra124_machdep.c ============================================================================== --- head/sys/arm/nvidia/tegra124/tegra124_machdep.c Fri Sep 23 13:23:52 2016 (r306266) +++ head/sys/arm/nvidia/tegra124/tegra124_machdep.c Fri Sep 23 14:11:23 2016 (r306267) @@ -61,10 +61,6 @@ __FBSDID("$FreeBSD$"); PMC_SCRATCH0_MODE_BOOTLOADER | \ PMC_SCRATCH0_MODE_RCM) -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - static vm_offset_t tegra124_lastaddr(platform_t plat) { Modified: head/sys/arm/qemu/virt_common.c ============================================================================== --- head/sys/arm/qemu/virt_common.c Fri Sep 23 13:23:52 2016 (r306266) +++ head/sys/arm/qemu/virt_common.c Fri Sep 23 14:11:23 2016 (r306267) @@ -37,10 +37,6 @@ __FBSDID("$FreeBSD$"); #include <machine/intr.h> -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG fdt_pic_decode_t fdt_pic_table[] = { &gic_decode_fdt, Modified: head/sys/arm/rockchip/rk30xx_common.c ============================================================================== --- head/sys/arm/rockchip/rk30xx_common.c Fri Sep 23 13:23:52 2016 (r306266) +++ head/sys/arm/rockchip/rk30xx_common.c Fri Sep 23 14:11:23 2016 (r306267) @@ -38,10 +38,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/vmparam.h> -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_aintc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: head/sys/arm/samsung/exynos/exynos5_common.c ============================================================================== --- head/sys/arm/samsung/exynos/exynos5_common.c Fri Sep 23 13:23:52 2016 (r306266) +++ head/sys/arm/samsung/exynos/exynos5_common.c Fri Sep 23 14:11:23 2016 (r306267) @@ -49,10 +49,6 @@ cpu_reset(void) while (1); } -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: head/sys/arm/ti/ti_common.c ============================================================================== --- head/sys/arm/ti/ti_common.c Fri Sep 23 13:23:52 2016 (r306266) +++ head/sys/arm/ti/ti_common.c Fri Sep 23 14:11:23 2016 (r306267) @@ -49,10 +49,6 @@ __FBSDID("$FreeBSD$"); #include <machine/intr.h> #include <machine/vmparam.h> -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG #ifdef SOC_TI_AM335X static int Modified: head/sys/arm/versatile/versatile_common.c ============================================================================== --- head/sys/arm/versatile/versatile_common.c Fri Sep 23 13:23:52 2016 (r306266) +++ head/sys/arm/versatile/versatile_common.c Fri Sep 23 14:11:23 2016 (r306267) @@ -46,10 +46,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/vmparam.h> -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_intc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: head/sys/arm/xilinx/zy7_machdep.c ============================================================================== --- head/sys/arm/xilinx/zy7_machdep.c Fri Sep 23 13:23:52 2016 (r306266) +++ head/sys/arm/xilinx/zy7_machdep.c Fri Sep 23 14:11:23 2016 (r306267) @@ -93,10 +93,6 @@ platform_devmap_init(void) } -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_gic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: head/sys/dev/ofw/ofw_fdt.c ============================================================================== --- head/sys/dev/ofw/ofw_fdt.c Fri Sep 23 13:23:52 2016 (r306266) +++ head/sys/dev/ofw/ofw_fdt.c Fri Sep 23 14:11:23 2016 (r306267) @@ -52,6 +52,15 @@ __FBSDID("$FreeBSD$"); #define debugf(fmt, args...) #endif +#if defined(__arm__) +#if defined(SOC_MV_ARMADAXP) || defined(SOC_MV_ARMADA38X) || \ + defined(SOC_MV_DISCOVERY) || defined(SOC_MV_DOVE) || \ + defined(SOC_MV_FREY) || defined(SOC_MV_KIRKWOOD) || \ + defined(SOC_MV_LOKIPLUS) || defined(SOC_MV_ORION) +#define FDT_MARVELL +#endif +#endif + static int ofw_fdt_init(ofw_t, void *); static phandle_t ofw_fdt_peer(ofw_t, phandle_t); static phandle_t ofw_fdt_child(ofw_t, phandle_t); @@ -415,7 +424,7 @@ ofw_fdt_package_to_path(ofw_t ofw, phand return (-1); } -#if defined(__arm__) || defined(__powerpc__) +#if defined(FDT_MARVELL) || defined(__powerpc__) static int ofw_fdt_fixup(ofw_t ofw) { @@ -454,7 +463,7 @@ ofw_fdt_fixup(ofw_t ofw) static int ofw_fdt_interpret(ofw_t ofw, const char *cmd, int nret, cell_t *retvals) { -#if defined(__arm__) || defined(__powerpc__) +#if defined(FDT_MARVELL) || defined(__powerpc__) int rv; /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609231411.u8NEBN6m087568>