From: Andrew Davis <afd@ti.com>
To: Simon Glass <sjg@chromium.org>, Tom Rini <trini@konsulko.com>,
Christian Gmeiner <christian.gmeiner@gmail.com>,
<u-boot@lists.denx.de>
Cc: Andrew Davis <afd@ti.com>
Subject: [PATCH v3 07/12] arm: mach-k3: Move sysfw-loader.h out of mach includes
Date: Thu, 6 Apr 2023 09:09:58 -0500 [thread overview]
Message-ID: <20230406141003.17511-8-afd@ti.com> (raw)
In-Reply-To: <20230406141003.17511-1-afd@ti.com>
This header is only used locally by K3 init files, no need to have it
up with the global mach includes. Move into local includes.
Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
---
arch/arm/mach-k3/am625_init.c | 2 +-
arch/arm/mach-k3/am62a7_init.c | 2 +-
arch/arm/mach-k3/am642_init.c | 2 +-
arch/arm/mach-k3/am654_init.c | 2 +-
arch/arm/mach-k3/j721e_init.c | 2 +-
arch/arm/mach-k3/j721s2_init.c | 2 +-
arch/arm/mach-k3/{include/mach => }/sysfw-loader.h | 0
7 files changed, 6 insertions(+), 6 deletions(-)
rename arch/arm/mach-k3/{include/mach => }/sysfw-loader.h (100%)
diff --git a/arch/arm/mach-k3/am625_init.c b/arch/arm/mach-k3/am625_init.c
index a91c15ca4e1..026c4f9c02d 100644
--- a/arch/arm/mach-k3/am625_init.c
+++ b/arch/arm/mach-k3/am625_init.c
@@ -9,7 +9,7 @@
#include <spl.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
-#include <asm/arch/sysfw-loader.h>
+#include "sysfw-loader.h"
#include "common.h"
#include <dm.h>
#include <dm/uclass-internal.h>
diff --git a/arch/arm/mach-k3/am62a7_init.c b/arch/arm/mach-k3/am62a7_init.c
index 02da24a3d6f..a89a9b4ae3a 100644
--- a/arch/arm/mach-k3/am62a7_init.c
+++ b/arch/arm/mach-k3/am62a7_init.c
@@ -8,7 +8,7 @@
#include <spl.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
-#include <asm/arch/sysfw-loader.h>
+#include "sysfw-loader.h"
#include "common.h"
#include <dm.h>
#include <dm/uclass-internal.h>
diff --git a/arch/arm/mach-k3/am642_init.c b/arch/arm/mach-k3/am642_init.c
index 86aced54646..c7720cbaf35 100644
--- a/arch/arm/mach-k3/am642_init.c
+++ b/arch/arm/mach-k3/am642_init.c
@@ -12,7 +12,7 @@
#include <spl.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
-#include <asm/arch/sysfw-loader.h>
+#include "sysfw-loader.h"
#include <asm/arch/sys_proto.h>
#include "common.h"
#include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-k3/am654_init.c b/arch/arm/mach-k3/am654_init.c
index abd0c0bccbc..12d74635cb0 100644
--- a/arch/arm/mach-k3/am654_init.c
+++ b/arch/arm/mach-k3/am654_init.c
@@ -13,7 +13,7 @@
#include <asm/io.h>
#include <spl.h>
#include <asm/arch/hardware.h>
-#include <asm/arch/sysfw-loader.h>
+#include "sysfw-loader.h"
#include <asm/arch/sys_proto.h>
#include "common.h"
#include <dm.h>
diff --git a/arch/arm/mach-k3/j721e_init.c b/arch/arm/mach-k3/j721e_init.c
index 8176ab8a499..eec5b726b95 100644
--- a/arch/arm/mach-k3/j721e_init.c
+++ b/arch/arm/mach-k3/j721e_init.c
@@ -12,7 +12,7 @@
#include <asm/io.h>
#include <asm/armv7_mpu.h>
#include <asm/arch/hardware.h>
-#include <asm/arch/sysfw-loader.h>
+#include "sysfw-loader.h"
#include "common.h"
#include <asm/arch/sys_proto.h>
#include <linux/soc/ti/ti_sci_protocol.h>
diff --git a/arch/arm/mach-k3/j721s2_init.c b/arch/arm/mach-k3/j721s2_init.c
index fb95984c1ab..4785a747bf3 100644
--- a/arch/arm/mach-k3/j721s2_init.c
+++ b/arch/arm/mach-k3/j721s2_init.c
@@ -12,7 +12,7 @@
#include <asm/io.h>
#include <asm/armv7_mpu.h>
#include <asm/arch/hardware.h>
-#include <asm/arch/sysfw-loader.h>
+#include "sysfw-loader.h"
#include "common.h"
#include <asm/arch/sys_proto.h>
#include <linux/soc/ti/ti_sci_protocol.h>
diff --git a/arch/arm/mach-k3/include/mach/sysfw-loader.h b/arch/arm/mach-k3/sysfw-loader.h
similarity index 100%
rename from arch/arm/mach-k3/include/mach/sysfw-loader.h
rename to arch/arm/mach-k3/sysfw-loader.h
--
2.39.2
next prev parent reply other threads:[~2023-04-06 14:12 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-06 14:09 [PATCH v3 00/12] Remove K3 misc sys_proto.h header Andrew Davis
2023-04-06 14:09 ` [PATCH v3 01/12] arm: mach-k3: Move MSMC fixup to SoC level Andrew Davis
2023-04-06 14:09 ` [PATCH v3 02/12] arm: mach-k3: Move J721e SoC detection out of common section Andrew Davis
2023-04-06 15:59 ` Christian Gmeiner
2023-04-06 16:29 ` Andrew Davis
2023-04-06 14:09 ` [PATCH v3 03/12] soc: soc_ti_k3: Use hardware.h to remove definition duplication Andrew Davis
2023-04-06 14:09 ` [PATCH v3 04/12] configs: j721x_evm: Remove unneeded check for SYS_K3_SPL_ATF Andrew Davis
2023-04-06 14:09 ` [PATCH v3 05/12] configs: j721s2_evm.h: Remove refrences to J7200 EVM Andrew Davis
2023-04-06 14:09 ` [PATCH v3 06/12] arm: mach-k3: Make release_resources_for_core_shutdown() common Andrew Davis
2023-04-06 14:09 ` Andrew Davis [this message]
2023-04-06 14:09 ` [PATCH v3 08/12] arm: mach-k3: Add weak do_board_detect() to common file Andrew Davis
2023-04-06 16:01 ` Christian Gmeiner
2023-04-06 14:10 ` [PATCH v3 09/12] arm: mach-k3: Remove unused fdt_disable_node() Andrew Davis
2023-04-06 14:10 ` [PATCH v3 10/12] arm: mach-k3: Move sdelay() and wait_on_value() declaration Andrew Davis
2023-04-06 14:10 ` [PATCH v3 11/12] arm: mach-k3: Move J721s2 SPL init functions to mach-k3 Andrew Davis
2023-04-06 14:10 ` [PATCH v3 12/12] arm: mach-k3: Remove empty sys_proto.h include Andrew Davis
2023-04-06 16:02 ` Christian Gmeiner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230406141003.17511-8-afd@ti.com \
--to=afd@ti.com \
--cc=christian.gmeiner@gmail.com \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox