Date: Sun, 14 Sep 2014 23:48:18 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r271607 - head/sys/arm/freescale/imx Message-ID: <201409142348.s8ENmI3D007585@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ian Date: Sun Sep 14 23:48:18 2014 New Revision: 271607 URL: http://svnweb.freebsd.org/changeset/base/271607 Log: Use gic_decode_fdt() rather than a local routine to parse fdt interrupt properties. Move fdt_pic_table and fdt_fixup_table into imx6_machdep.c, which means imx6 doesn't need imx_common.c anymore. Modified: head/sys/arm/freescale/imx/files.imx6 head/sys/arm/freescale/imx/imx6_machdep.c Modified: head/sys/arm/freescale/imx/files.imx6 ============================================================================== --- head/sys/arm/freescale/imx/files.imx6 Sun Sep 14 23:39:13 2014 (r271606) +++ head/sys/arm/freescale/imx/files.imx6 Sun Sep 14 23:48:18 2014 (r271607) @@ -23,7 +23,6 @@ arm/freescale/imx/imx6_ccm.c standard arm/freescale/imx/imx6_machdep.c standard arm/freescale/imx/imx6_mp.c optional smp arm/freescale/imx/imx6_pl310.c standard -arm/freescale/imx/imx_common.c standard arm/freescale/imx/imx_iomux.c standard arm/freescale/imx/imx_machdep.c standard arm/freescale/imx/imx_gpt.c standard Modified: head/sys/arm/freescale/imx/imx6_machdep.c ============================================================================== --- head/sys/arm/freescale/imx/imx6_machdep.c Sun Sep 14 23:39:13 2014 (r271606) +++ head/sys/arm/freescale/imx/imx6_machdep.c Sun Sep 14 23:48:18 2014 (r271607) @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/devmap.h> +#include <machine/intr.h> #include <machine/machdep.h> #include <machine/platform.h> @@ -46,6 +47,18 @@ __FBSDID("$FreeBSD$"); #include <arm/freescale/imx/imx6_anatopvar.h> #include <arm/freescale/imx/imx_machdep.h> +#include <dev/fdt/fdt_common.h> +#include <dev/ofw/openfirm.h> + +struct fdt_fixup_entry fdt_fixup_table[] = { + { NULL, NULL } +}; + +fdt_pic_decode_t fdt_pic_table[] = { + &gic_decode_fdt, + NULL +}; + vm_offset_t platform_lastaddr(void) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409142348.s8ENmI3D007585>