From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 04/13] ARM: Drop HAVE_MACH_ARM_HEAD
Date: Thu, 2 Mar 2023 12:15:57 +0100 [thread overview]
Message-ID: <20230302111606.1054037-5-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20230302111606.1054037-1-s.hauer@pengutronix.de>
HAVE_MACH_ARM_HEAD stands in the way of adding multi arch support,
as barebox-arm-head.h compiles differently on different archs.
There are no users left, so remove it.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/Kconfig | 3 ---
arch/arm/include/asm/barebox-arm-head.h | 4 ----
2 files changed, 7 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1281b8be38..6aa0ec4074 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -16,9 +16,6 @@ config ARM_LINUX
default y
depends on CMD_BOOTZ || CMD_BOOTU || BOOTM
-config HAVE_MACH_ARM_HEAD
- bool
-
config ARM_USE_COMPRESSED_DTB
bool
select USE_COMPRESSED_DTB
diff --git a/arch/arm/include/asm/barebox-arm-head.h b/arch/arm/include/asm/barebox-arm-head.h
index 1a1d58c1aa..135d0585b1 100644
--- a/arch/arm/include/asm/barebox-arm-head.h
+++ b/arch/arm/include/asm/barebox-arm-head.h
@@ -19,9 +19,6 @@ void barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2);
#define ARM_HEAD_SPARE_MARKER 0x55555555
#ifdef CONFIG_CPU_32
-#ifdef CONFIG_HAVE_MACH_ARM_HEAD
-#include <mach/barebox-arm-head.h>
-#else
static inline void __barebox_arm_head(void)
{
__asm__ __volatile__ (
@@ -71,7 +68,6 @@ static inline void barebox_arm_head(void)
);
}
#endif
-#endif
#endif /* __ASSEMBLY__ */
--
2.30.2
next prev parent reply other threads:[~2023-03-02 11:17 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-02 11:15 [PATCH 00/13] ARM: misc cleanups Sascha Hauer
2023-03-02 11:15 ` [PATCH 01/13] ARM: add ENTRY_FUNCTION_HEAD macro Sascha Hauer
2023-03-02 11:15 ` [PATCH 02/13] ARM: mvebu: Use ENTRY_FUNCTION_HEAD Sascha Hauer
2023-03-02 11:15 ` [PATCH 03/13] ARM: at91: " Sascha Hauer
2023-03-02 16:40 ` Ahmad Fatoum
2023-03-03 8:32 ` Sascha Hauer
2023-03-02 11:15 ` Sascha Hauer [this message]
2023-03-02 11:15 ` [PATCH 05/13] ARM: drop CONFIG_HAS_ASM_DEBUG_LL Sascha Hauer
2023-03-02 11:15 ` [PATCH 06/13] regulator: pfuze: remove unused include Sascha Hauer
2023-03-02 11:16 ` [PATCH 07/13] ARM: drop unused zynq code in Makefile Sascha Hauer
2023-03-02 11:16 ` [PATCH 08/13] ARM: drop unused mvebu " Sascha Hauer
2023-03-02 11:16 ` [PATCH 09/13] ARM: drop unused am35xx " Sascha Hauer
2023-03-02 11:16 ` [PATCH 10/13] ARM: Makefile: Drop board-y Sascha Hauer
2023-03-02 11:16 ` [PATCH 11/13] ARM: i.MX: Add missing include Sascha Hauer
2023-03-02 11:16 ` [PATCH 12/13] ARM: stm32mp_defconfig: Enable remaining boards Sascha Hauer
2023-03-02 11:16 ` [PATCH 13/13] mci: imx-esdhc-pbl: add missing include Sascha Hauer
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=20230302111606.1054037-5-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/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