Date: Mon, 10 Jul 2017 15:27:54 +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: r320873 - in head/sys/arm: freescale/imx ti ti/omap4 xilinx Message-ID: <201707101527.v6AFRs2B051210@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew Date: Mon Jul 10 15:27:53 2017 New Revision: 320873 URL: https://svnweb.freebsd.org/changeset/base/320873 Log: Start to move the arm *_mp.h to be names *_machdep.h. These will be used by the reworked pl310 driver interface in https://reviews.freebsd.org/D11546 Added: head/sys/arm/freescale/imx/imx6_machdep.h - copied, changed from r320872, head/sys/arm/freescale/imx/imx6_mp.h head/sys/arm/ti/omap4/omap4_machdep.h - copied, changed from r320872, head/sys/arm/ti/omap4/omap4_mp.h head/sys/arm/xilinx/zy7_machdep.h - copied, changed from r320872, head/sys/arm/xilinx/zy7_mp.h Deleted: head/sys/arm/freescale/imx/imx6_mp.h head/sys/arm/ti/omap4/omap4_mp.h head/sys/arm/xilinx/zy7_mp.h Modified: head/sys/arm/freescale/imx/imx6_machdep.c head/sys/arm/freescale/imx/imx6_mp.c head/sys/arm/ti/omap4/omap4_mp.c head/sys/arm/ti/ti_machdep.c head/sys/arm/xilinx/zy7_machdep.c head/sys/arm/xilinx/zy7_mp.c Modified: head/sys/arm/freescale/imx/imx6_machdep.c ============================================================================== --- head/sys/arm/freescale/imx/imx6_machdep.c Mon Jul 10 14:59:21 2017 (r320872) +++ head/sys/arm/freescale/imx/imx6_machdep.c Mon Jul 10 15:27:53 2017 (r320873) @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); #include <dev/fdt/fdt_common.h> #include <dev/ofw/openfirm.h> -#include <arm/freescale/imx/imx6_mp.h> +#include <arm/freescale/imx/imx6_machdep.h> #include "platform_if.h" Copied and modified: head/sys/arm/freescale/imx/imx6_machdep.h (from r320872, head/sys/arm/freescale/imx/imx6_mp.h) ============================================================================== --- head/sys/arm/freescale/imx/imx6_mp.h Mon Jul 10 14:59:21 2017 (r320872, copy source) +++ head/sys/arm/freescale/imx/imx6_machdep.h Mon Jul 10 15:27:53 2017 (r320873) @@ -26,10 +26,10 @@ * $FreeBSD$ */ -#ifndef IMX6_MP_H -#define IMX6_MP_H +#ifndef IMX6_MACHDEP_H +#define IMX6_MACHDEP_H void imx6_mp_start_ap(platform_t); void imx6_mp_setmaxid(platform_t); -#endif /* IMX6_MP_H */ +#endif /* IMX6_MACHDEP_H */ Modified: head/sys/arm/freescale/imx/imx6_mp.c ============================================================================== --- head/sys/arm/freescale/imx/imx6_mp.c Mon Jul 10 14:59:21 2017 (r320872) +++ head/sys/arm/freescale/imx/imx6_mp.c Mon Jul 10 15:27:53 2017 (r320873) @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include <machine/platform.h> #include <machine/platformvar.h> -#include <arm/freescale/imx/imx6_mp.h> +#include <arm/freescale/imx/imx6_machdep.h> #define SCU_PHYSBASE 0x00a00000 #define SCU_SIZE 0x00001000 Copied and modified: head/sys/arm/ti/omap4/omap4_machdep.h (from r320872, head/sys/arm/ti/omap4/omap4_mp.h) ============================================================================== --- head/sys/arm/ti/omap4/omap4_mp.h Mon Jul 10 14:59:21 2017 (r320872, copy source) +++ head/sys/arm/ti/omap4/omap4_machdep.h Mon Jul 10 15:27:53 2017 (r320873) @@ -25,9 +25,10 @@ * $FreeBSD$ */ -#ifndef _OMAP4_MP_H_ -#define _OMAP4_MP_H_ +#ifndef _OMAP4_MACHDEP_H_ +#define _OMAP4_MACHDEP_H_ + void omap4_mp_setmaxid(platform_t plat); void omap4_mp_start_ap(platform_t plat); -#endif /* _OMAP4_MP_H_ */ +#endif /* _OMAP4_MACHDEP_H_ */ Modified: head/sys/arm/ti/omap4/omap4_mp.c ============================================================================== --- head/sys/arm/ti/omap4/omap4_mp.c Mon Jul 10 14:59:21 2017 (r320872) +++ head/sys/arm/ti/omap4/omap4_mp.c Mon Jul 10 15:27:53 2017 (r320873) @@ -41,8 +41,8 @@ __FBSDID("$FreeBSD$"); #include <machine/platformvar.h> #include <arm/ti/ti_smc.h> +#include <arm/ti/omap4/omap4_machdep.h> #include <arm/ti/omap4/omap4_smc.h> -#include <arm/ti/omap4/omap4_mp.h> void omap4_mp_setmaxid(platform_t plat) Modified: head/sys/arm/ti/ti_machdep.c ============================================================================== --- head/sys/arm/ti/ti_machdep.c Mon Jul 10 14:59:21 2017 (r320872) +++ head/sys/arm/ti/ti_machdep.c Mon Jul 10 15:27:53 2017 (r320873) @@ -52,8 +52,8 @@ __FBSDID("$FreeBSD$"); #include <machine/machdep.h> #include <machine/platformvar.h> +#include <arm/ti/omap4/omap4_machdep.h> #include <arm/ti/omap4/omap4_reg.h> -#include <arm/ti/omap4/omap4_mp.h> #include <arm/ti/ti_cpuid.h> #include "platform_if.h" Modified: head/sys/arm/xilinx/zy7_machdep.c ============================================================================== --- head/sys/arm/xilinx/zy7_machdep.c Mon Jul 10 14:59:21 2017 (r320872) +++ head/sys/arm/xilinx/zy7_machdep.c Mon Jul 10 15:27:53 2017 (r320873) @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); #include <machine/platform.h> #include <machine/platformvar.h> -#include <arm/xilinx/zy7_mp.h> +#include <arm/xilinx/zy7_machdep.h> #include <arm/xilinx/zy7_reg.h> #include "platform_if.h" Copied and modified: head/sys/arm/xilinx/zy7_machdep.h (from r320872, head/sys/arm/xilinx/zy7_mp.h) ============================================================================== --- head/sys/arm/xilinx/zy7_mp.h Mon Jul 10 14:59:21 2017 (r320872, copy source) +++ head/sys/arm/xilinx/zy7_machdep.h Mon Jul 10 15:27:53 2017 (r320873) @@ -25,10 +25,10 @@ * $FreeBSD$ */ -#ifndef _ZY7_MP_H_ -#define _ZY7_MP_H_ +#ifndef _ZY7_MACHDEP_H_ +#define _ZY7_MACHDEP_H_ void zynq7_mp_setmaxid(platform_t); void zynq7_mp_start_ap(platform_t); -#endif /* _ZY7_MP_H_ */ +#endif /* _ZY7_MACHDEP_H_ */ Modified: head/sys/arm/xilinx/zy7_mp.c ============================================================================== --- head/sys/arm/xilinx/zy7_mp.c Mon Jul 10 14:59:21 2017 (r320872) +++ head/sys/arm/xilinx/zy7_mp.c Mon Jul 10 15:27:53 2017 (r320873) @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); #include <machine/intr.h> #include <machine/platformvar.h> -#include <arm/xilinx/zy7_mp.h> +#include <arm/xilinx/zy7_machdep.h> #include <arm/xilinx/zy7_reg.h> #define ZYNQ7_CPU1_ENTRY 0xfffffff0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707101527.v6AFRs2B051210>