diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2023-02-27 16:16:05 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-03-06 14:10:41 +0100 |
| commit | 8d0f5a36f107ce152c94a60a243088855170f637 (patch) | |
| tree | 1cfa5d18f6f50d851d166cc324aa7596d9085820 /arch/arm/boards/boundarydevices-nitrogen6 | |
| parent | 9dbf98e2260c1a7efd32a68bc7078f96c4384523 (diff) | |
| download | barebox-8d0f5a36f107ce152c94a60a243088855170f637.tar.gz barebox-8d0f5a36f107ce152c94a60a243088855170f637.tar.xz | |
ARM: i.MX: Move mach header files to include/mach/imx
Currently arch specific headers can be included with #include <mach/xxx.h>.
With upcoming multi-arch support this is no longer possible as there
won't be a single mach anymore.
Move all i.MX specific header files to include/mach/imx/ to prepare for
multi-arch support.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/boundarydevices-nitrogen6')
7 files changed, 14 insertions, 14 deletions
diff --git a/arch/arm/boards/boundarydevices-nitrogen6/board.c b/arch/arm/boards/boundarydevices-nitrogen6/board.c index dc2d5aa41c..a57cef4fbe 100644 --- a/arch/arm/boards/boundarydevices-nitrogen6/board.c +++ b/arch/arm/boards/boundarydevices-nitrogen6/board.c @@ -4,10 +4,10 @@ #include <common.h> #include <init.h> #include <environment.h> -#include <mach/bbu.h> +#include <mach/imx/bbu.h> #include <linux/phy.h> #include <linux/micrel_phy.h> -#include <mach/imx6.h> +#include <mach/imx/imx6.h> static int nitrogen6x_devices_init(void) { diff --git a/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6dl-1g.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6dl-1g.imxcfg index 8282d4140c..8aa14f3080 100644 --- a/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6dl-1g.imxcfg +++ b/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6dl-1g.imxcfg @@ -4,8 +4,8 @@ soc imx6 loadaddr 0x20000000 ivtofs 0x400 -#include <mach/imx6-ddr-regs.h> -#include <mach/imx6dl-ddr-regs.h> +#include <mach/imx/imx6-ddr-regs.h> +#include <mach/imx/imx6dl-ddr-regs.h> #include "ram-base.imxcfg" #include "800mhz_4x128mx16.imxcfg" diff --git a/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6dl-2g.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6dl-2g.imxcfg index 9ef9b5789f..5544c25e36 100644 --- a/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6dl-2g.imxcfg +++ b/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6dl-2g.imxcfg @@ -4,8 +4,8 @@ soc imx6 loadaddr 0x20000000 ivtofs 0x400 -#include <mach/imx6-ddr-regs.h> -#include <mach/imx6dl-ddr-regs.h> +#include <mach/imx/imx6-ddr-regs.h> +#include <mach/imx/imx6dl-ddr-regs.h> #include "ram-base.imxcfg" #include "800mhz_4x256mx16.imxcfg" diff --git a/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6q-1g.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6q-1g.imxcfg index 5c5af546a7..4cde5c0818 100644 --- a/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6q-1g.imxcfg +++ b/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6q-1g.imxcfg @@ -4,8 +4,8 @@ soc imx6 loadaddr 0x20000000 ivtofs 0x400 -#include <mach/imx6-ddr-regs.h> -#include <mach/imx6q-ddr-regs.h> +#include <mach/imx/imx6-ddr-regs.h> +#include <mach/imx/imx6q-ddr-regs.h> #include "ram-base.imxcfg" #include "1066mhz_4x128mx16.imxcfg" diff --git a/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6q-2g.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6q-2g.imxcfg index 58b9dc7468..4b38b1bfc9 100644 --- a/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6q-2g.imxcfg +++ b/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6q-2g.imxcfg @@ -4,8 +4,8 @@ soc imx6 loadaddr 0x20000000 ivtofs 0x400 -#include <mach/imx6-ddr-regs.h> -#include <mach/imx6q-ddr-regs.h> +#include <mach/imx/imx6-ddr-regs.h> +#include <mach/imx/imx6q-ddr-regs.h> #include "ram-base.imxcfg" #include "1066mhz_4x256mx16.imxcfg" diff --git a/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6qp-max.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6qp-max.imxcfg index 4ab0a653bd..2d43222530 100644 --- a/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6qp-max.imxcfg +++ b/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6qp-max.imxcfg @@ -4,8 +4,8 @@ soc imx6 loadaddr 0x20000000 ivtofs 0x400 -#include <mach/imx6-ddr-regs.h> -#include <mach/imx6q-ddr-regs.h> +#include <mach/imx/imx6-ddr-regs.h> +#include <mach/imx/imx6q-ddr-regs.h> #include "ram-base.imxcfg" #include "1066mhz_4x512mx16-qp.imxcfg" diff --git a/arch/arm/boards/boundarydevices-nitrogen6/lowlevel.c b/arch/arm/boards/boundarydevices-nitrogen6/lowlevel.c index 9312a1d4aa..8ab5116d8e 100644 --- a/arch/arm/boards/boundarydevices-nitrogen6/lowlevel.c +++ b/arch/arm/boards/boundarydevices-nitrogen6/lowlevel.c @@ -1,8 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-only #include <common.h> -#include <mach/generic.h> -#include <mach/esdctl.h> +#include <mach/imx/generic.h> +#include <mach/imx/esdctl.h> #include <asm/barebox-arm.h> extern char __dtb_imx6q_nitrogen6x_start[]; |