From 0391575d9733702f4cfeda47a14ad49328b52c10 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Mon, 27 Feb 2023 22:20:55 +0100
Subject: ARM: zynq: Move mach header files to include/mach/zynq

Currently arch specific headers can be included with
longer possible as there won't be a single mach anymore.

Move all zynq specific header files to include/mach/zynq/ to
prepare for multi-arch support.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 scripts/Makefile       | 2 +-
 scripts/zynq_mkimage.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/Makefile b/scripts/Makefile
index ac88ebb240..72ad9ad7a6 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -20,7 +20,7 @@ hostprogs-always-$(CONFIG_MIPS)				+= mips-relocs
 hostprogs-always-$(CONFIG_MVEBU_HOSTTOOLS)		+= kwbimage kwboot mvebuimg
 hostprogs-always-$(CONFIG_OMAP_IMAGE)			+= omap_signGP mk-omap-image
 hostprogs-always-$(CONFIG_DAVINCI_IMAGE)		+= mkublheader
-HOSTCFLAGS_zynq_mkimage.o = -I$(srctree) -I$(srctree)/arch/arm/mach-zynq/include
+HOSTCFLAGS_zynq_mkimage.o = -I$(srctree) -I$(srctree)/include/mach
 hostprogs-always-$(CONFIG_ZYNQ_MKIMAGE)			+= zynq_mkimage
 hostprogs-always-$(CONFIG_SOCFPGA_MKIMAGE)		+= socfpga_mkimage
 hostprogs-always-$(CONFIG_MXS_HOSTTOOLS)		+= mxsimage mxsboot
diff --git a/scripts/zynq_mkimage.c b/scripts/zynq_mkimage.c
index b611d5c69b..9c1e23ef00 100644
--- a/scripts/zynq_mkimage.c
+++ b/scripts/zynq_mkimage.c
@@ -5,7 +5,7 @@
 #include <errno.h>
 #include <getopt.h>
 #include <linux/kernel.h>
-#include <mach/zynq-flash-header.h>
+#include <zynq/zynq-flash-header.h>
 #include <malloc.h>
 #include <stdint.h>
 #include <stdio.h>
-- 
cgit v1.2.1