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 /common | |
| parent | 9dbf98e2260c1a7efd32a68bc7078f96c4384523 (diff) | |
| download | barebox-8d0f5a36f107ce152c94a60a243088855170f637.tar.gz | |
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 'common')
| -rw-r--r-- | common/filetype.c | 2 | ||||
| -rw-r--r-- | common/imx-bbu-nand-fcb.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/common/filetype.c b/common/filetype.c index 8f79f48bc1..68ea45861d 100644 --- a/common/filetype.c +++ b/common/filetype.c @@ -18,7 +18,7 @@ #include <image-sparse.h> #include <elf.h> -#include <arm/mach-imx/include/mach/imx-header.h> +#include <mach/imx/imx-header.h> struct filetype_str { const char *name; /* human readable filetype */ diff --git a/common/imx-bbu-nand-fcb.c b/common/imx-bbu-nand-fcb.c index 24b0e7592e..f154f6705d 100644 --- a/common/imx-bbu-nand-fcb.c +++ b/common/imx-bbu-nand-fcb.c @@ -25,11 +25,13 @@ #include <linux/bitops.h> #include <io.h> #include <crc.h> -#include <mach/generic.h> #include <mtd/mtd-peb.h> #include <soc/imx/imx-nand-bcb.h> #ifdef CONFIG_ARCH_IMX -#include <mach/imx6.h> +#include <mach/imx/imx6.h> +#include <mach/imx/generic.h> +#else +#include <mach/generic.h> #endif static inline int fcb_is_bch_encoded(void) @@ -1566,7 +1568,7 @@ static int imx7_fcb_read(struct mtd_info *mtd, int block, struct fcb_block **ret } #ifdef CONFIG_ARCH_IMX7 -#include <mach/imx7-regs.h> +#include <mach/imx/imx7-regs.h> static void imx7_fcb_create(struct imx_nand_fcb_bbu_handler *imx_handler, struct fcb_block *fcb, struct mtd_info *mtd) |