From 31f00852855e4d76f4c19ae47732ba416dd21098 Mon Sep 17 00:00:00 2001
From: Ye Li <ye.li@nxp.com>
Date: Sat, 7 Aug 2021 16:00:37 +0800
Subject: arm: imx8: Move container image header file to mach-imx

Since the container is shared among i.MX platforms, move its header file
to mach-imx

Signed-off-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 arch/arm/include/asm/arch-imx8/image.h | 67 ----------------------------------
 arch/arm/include/asm/mach-imx/image.h  | 67 ++++++++++++++++++++++++++++++++++
 arch/arm/mach-imx/cmd_dek.c            |  2 +-
 arch/arm/mach-imx/image-container.c    |  2 +-
 arch/arm/mach-imx/imx8/ahab.c          |  2 +-
 arch/arm/mach-imx/parse-container.c    |  2 +-
 6 files changed, 71 insertions(+), 71 deletions(-)
 delete mode 100644 arch/arm/include/asm/arch-imx8/image.h
 create mode 100644 arch/arm/include/asm/mach-imx/image.h

diff --git a/arch/arm/include/asm/arch-imx8/image.h b/arch/arm/include/asm/arch-imx8/image.h
deleted file mode 100644
index 547beeb9860..00000000000
--- a/arch/arm/include/asm/arch-imx8/image.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright 2018-2019 NXP
- */
-
-#ifndef __CONTAINER_HEADER_H_
-#define __CONTAINER_HEADER_H_
-
-#include <linux/sizes.h>
-#include <linux/types.h>
-
-#define IV_MAX_LEN			32
-#define HASH_MAX_LEN			64
-
-#define CONTAINER_HDR_ALIGNMENT 0x400
-#define CONTAINER_HDR_EMMC_OFFSET 0
-#define CONTAINER_HDR_MMCSD_OFFSET SZ_32K
-#define CONTAINER_HDR_QSPI_OFFSET SZ_4K
-#define CONTAINER_HDR_NAND_OFFSET SZ_128M
-
-struct container_hdr {
-	u8 version;
-	u8 length_lsb;
-	u8 length_msb;
-	u8 tag;
-	u32 flags;
-	u16 sw_version;
-	u8 fuse_version;
-	u8 num_images;
-	u16 sig_blk_offset;
-	u16 reserved;
-} __packed;
-
-struct boot_img_t {
-	u32 offset;
-	u32 size;
-	u64 dst;
-	u64 entry;
-	u32 hab_flags;
-	u32 meta;
-	u8 hash[HASH_MAX_LEN];
-	u8 iv[IV_MAX_LEN];
-} __packed;
-
-struct signature_block_hdr {
-	u8 version;
-	u8 length_lsb;
-	u8 length_msb;
-	u8 tag;
-	u16 srk_table_offset;
-	u16 cert_offset;
-	u16 blob_offset;
-	u16 signature_offset;
-	u32 reserved;
-} __packed;
-
-struct generate_key_blob_hdr {
-	u8 version;
-	u8 length_lsb;
-	u8 length_msb;
-	u8 tag;
-	u8 flags;
-	u8 size;
-	u8 algorithm;
-	u8 mode;
-} __packed;
-#endif
diff --git a/arch/arm/include/asm/mach-imx/image.h b/arch/arm/include/asm/mach-imx/image.h
new file mode 100644
index 00000000000..547beeb9860
--- /dev/null
+++ b/arch/arm/include/asm/mach-imx/image.h
@@ -0,0 +1,67 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2018-2019 NXP
+ */
+
+#ifndef __CONTAINER_HEADER_H_
+#define __CONTAINER_HEADER_H_
+
+#include <linux/sizes.h>
+#include <linux/types.h>
+
+#define IV_MAX_LEN			32
+#define HASH_MAX_LEN			64
+
+#define CONTAINER_HDR_ALIGNMENT 0x400
+#define CONTAINER_HDR_EMMC_OFFSET 0
+#define CONTAINER_HDR_MMCSD_OFFSET SZ_32K
+#define CONTAINER_HDR_QSPI_OFFSET SZ_4K
+#define CONTAINER_HDR_NAND_OFFSET SZ_128M
+
+struct container_hdr {
+	u8 version;
+	u8 length_lsb;
+	u8 length_msb;
+	u8 tag;
+	u32 flags;
+	u16 sw_version;
+	u8 fuse_version;
+	u8 num_images;
+	u16 sig_blk_offset;
+	u16 reserved;
+} __packed;
+
+struct boot_img_t {
+	u32 offset;
+	u32 size;
+	u64 dst;
+	u64 entry;
+	u32 hab_flags;
+	u32 meta;
+	u8 hash[HASH_MAX_LEN];
+	u8 iv[IV_MAX_LEN];
+} __packed;
+
+struct signature_block_hdr {
+	u8 version;
+	u8 length_lsb;
+	u8 length_msb;
+	u8 tag;
+	u16 srk_table_offset;
+	u16 cert_offset;
+	u16 blob_offset;
+	u16 signature_offset;
+	u32 reserved;
+} __packed;
+
+struct generate_key_blob_hdr {
+	u8 version;
+	u8 length_lsb;
+	u8 length_msb;
+	u8 tag;
+	u8 flags;
+	u8 size;
+	u8 algorithm;
+	u8 mode;
+} __packed;
+#endif
diff --git a/arch/arm/mach-imx/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c
index 1e3cfee4739..89da89c51d5 100644
--- a/arch/arm/mach-imx/cmd_dek.c
+++ b/arch/arm/mach-imx/cmd_dek.c
@@ -17,7 +17,7 @@
 #include <tee.h>
 #ifdef CONFIG_IMX_SECO_DEK_ENCAP
 #include <asm/arch/sci/sci.h>
-#include <asm/arch/image.h>
+#include <asm/mach-imx/image.h>
 #endif
 #include <cpu_func.h>
 
diff --git a/arch/arm/mach-imx/image-container.c b/arch/arm/mach-imx/image-container.c
index 5abc0d3a39f..9e18f6630fc 100644
--- a/arch/arm/mach-imx/image-container.c
+++ b/arch/arm/mach-imx/image-container.c
@@ -11,7 +11,7 @@
 #include <mmc.h>
 #include <spi_flash.h>
 #include <nand.h>
-#include <asm/arch/image.h>
+#include <asm/mach-imx/image.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
 
diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c
index 015267c8b2d..5a4d39cdaad 100644
--- a/arch/arm/mach-imx/imx8/ahab.c
+++ b/arch/arm/mach-imx/imx8/ahab.c
@@ -13,7 +13,7 @@
 #include <asm/mach-imx/sys_proto.h>
 #include <asm/arch-imx/cpu.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/arch/image.h>
+#include <asm/mach-imx/image.h>
 #include <console.h>
 #include <cpu_func.h>
 
diff --git a/arch/arm/mach-imx/parse-container.c b/arch/arm/mach-imx/parse-container.c
index 375098902f8..e4354bf930c 100644
--- a/arch/arm/mach-imx/parse-container.c
+++ b/arch/arm/mach-imx/parse-container.c
@@ -7,7 +7,7 @@
 #include <errno.h>
 #include <log.h>
 #include <spl.h>
-#include <asm/arch/image.h>
+#include <asm/mach-imx/image.h>
 #include <asm/arch/sci/sci.h>
 
 #define SEC_SECURE_RAM_BASE		0x31800000UL
-- 
cgit v1.2.3