From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 09/12] ARM: versatile: move over to multi image support
Date: Tue, 2 May 2023 11:14:16 +0200 [thread overview]
Message-ID: <20230502091419.2551228-10-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20230502091419.2551228-1-s.hauer@pengutronix.de>
With multi image support we can compile the versatile image along
with other images. Enable support for it.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/Kconfig | 1 +
arch/arm/boards/versatile/lowlevel.c | 2 +-
images/Makefile | 1 +
images/Makefile.versatile | 8 ++++++++
4 files changed, 11 insertions(+), 1 deletion(-)
create mode 100644 images/Makefile.versatile
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1da6b396e7..088146894b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -163,6 +163,7 @@ config ARCH_VERSATILE
select HAS_DEBUG_LL
select COMMON_CLK
select COMMON_CLK_OF_PROVIDER
+ select HAVE_PBL_MULTI_IMAGES
config ARCH_TEGRA
bool "NVIDIA Tegra"
diff --git a/arch/arm/boards/versatile/lowlevel.c b/arch/arm/boards/versatile/lowlevel.c
index 2f8d7b514b..04209dc12c 100644
--- a/arch/arm/boards/versatile/lowlevel.c
+++ b/arch/arm/boards/versatile/lowlevel.c
@@ -7,7 +7,7 @@
extern char __dtb_versatile_pb_start[];
-void __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
+ENTRY_FUNCTION(start_versatile_pb, r0, r1, r2)
{
void *fdt;
diff --git a/images/Makefile b/images/Makefile
index aa5814710f..c93f9e2689 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -152,6 +152,7 @@ include $(srctree)/images/Makefile.rockchip
include $(srctree)/images/Makefile.socfpga
include $(srctree)/images/Makefile.stm32mp
include $(srctree)/images/Makefile.tegra
+include $(srctree)/images/Makefile.versatile
include $(srctree)/images/Makefile.vexpress
include $(srctree)/images/Makefile.xburst
include $(srctree)/images/Makefile.at91
diff --git a/images/Makefile.versatile b/images/Makefile.versatile
new file mode 100644
index 0000000000..c57a32868d
--- /dev/null
+++ b/images/Makefile.versatile
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# barebox image generation Makefile for VExpress images
+#
+
+pblb-$(CONFIG_MACH_VERSATILEPB) += start_versatile_pb
+FILE_barebox-versatile-pb.img = start_versatile_pb.pblb
+image-$(CONFIG_MACH_VERSATILEPB) += barebox-versatile-pb.img
--
2.39.2
next prev parent reply other threads:[~2023-05-02 9:15 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-02 9:14 [PATCH 00/12] ARM Versatile updates Sascha Hauer
2023-05-02 9:14 ` [PATCH 01/12] ARM: versatile: Enable CONFIG_RELOCATABLE Sascha Hauer
2023-05-02 9:14 ` [PATCH 02/12] ARM: versatile: Use common clk framework Sascha Hauer
2023-05-02 9:14 ` [PATCH 03/12] ARM: versatile: drop platform code to register UART Sascha Hauer
2023-05-02 9:14 ` [PATCH 04/12] ARM: versatile: drop platform code to register GPIOs Sascha Hauer
2023-05-02 9:14 ` [PATCH 05/12] ARM: versatile: Use flash from device tree Sascha Hauer
2023-05-02 9:14 ` [PATCH 06/12] ARM: versatile: Use smc91c111 " Sascha Hauer
2023-05-02 9:17 ` Ahmad Fatoum
2023-05-02 11:41 ` Sascha Hauer
2023-05-02 9:14 ` [PATCH 07/12] ARM: versatile: make sure to run initcalls on versatile only Sascha Hauer
2023-05-02 9:14 ` [PATCH 08/12] ARM: versatile: simplify ARM1176 support Sascha Hauer
2023-05-02 9:14 ` Sascha Hauer [this message]
2023-05-02 9:14 ` [PATCH 10/12] ARM: versatile: move over to multi arch support Sascha Hauer
2023-05-02 9:14 ` [PATCH 11/12] ARM: versatile: Use existing clocksource driver Sascha Hauer
2023-05-02 9:14 ` [PATCH 12/12] ARM: Merge imx_defconfig and versatilepb_defconfig into multi_v5_v6_defconfig 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=20230502091419.2551228-10-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