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@xxxxxxxxxxxxxx>
---
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
