summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-09-17 23:16:38 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-10-02 08:42:20 +0200
commit30fe1717564bb9405728730b99ba8219f6932112 (patch)
treed534df4007de9559e0ae9e1b6cb7fb8855ea4519
parent8cec514f9f9de487467c10170f986a05e0786857 (diff)
downloadbarebox-30fe1717564bb9405728730b99ba8219f6932112.tar.gz
barebox-30fe1717564bb9405728730b99ba8219f6932112.tar.xz
ARM: mxs: imx23-evk: Switch to multi image support
Build the i.MX23 EVK as multi image. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/boards/freescale-mx23-evk/lowlevel.c2
-rw-r--r--arch/arm/mach-mxs/Kconfig1
-rw-r--r--images/Makefile.mxs4
3 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/boards/freescale-mx23-evk/lowlevel.c b/arch/arm/boards/freescale-mx23-evk/lowlevel.c
index 2321a469ab..99e08d88c7 100644
--- a/arch/arm/boards/freescale-mx23-evk/lowlevel.c
+++ b/arch/arm/boards/freescale-mx23-evk/lowlevel.c
@@ -5,7 +5,7 @@
#include <asm/barebox-arm.h>
#include <mach/imx23-regs.h>
-void __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
+ENTRY_FUNCTION(start_imx23_evk, r0, r1, r2)
{
arm_cpu_lowlevel_init();
barebox_arm_entry(IMX_MEMORY_BASE, SZ_32M, (void *)MACH_TYPE_MX23EVK);
diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
index 2409c53dd7..fd6b5929a3 100644
--- a/arch/arm/mach-mxs/Kconfig
+++ b/arch/arm/mach-mxs/Kconfig
@@ -34,6 +34,7 @@ choice
config MACH_MX23EVK
bool "mx23-evk"
+ select HAVE_PBL_MULTI_IMAGES
help
Say Y here if you are using the Freescale i.MX23-EVK board
diff --git a/images/Makefile.mxs b/images/Makefile.mxs
index b230c02562..4c69c347fb 100644
--- a/images/Makefile.mxs
+++ b/images/Makefile.mxs
@@ -68,3 +68,7 @@ image-$(CONFIG_MACH_IMX233_OLINUXINO) += barebox-olinuxino-imx23-2nd.img
pblb-$(CONFIG_MACH_CFA10036) += start_cfa10036
FILE_barebox-crystalfonts-cfa10036-2nd.img = start_cfa10036.pblb
image-$(CONFIG_MACH_CFA10036) += barebox-crystalfonts-cfa10036-2nd.img
+
+pblb-$(CONFIG_MACH_MX23EVK) += start_imx23_evk
+FILE_barebox-freescale-mx23-evk-2nd.img = start_imx23_evk.pblb
+image-$(CONFIG_MACH_MX23EVK) += barebox-freescale-mx23-evk-2nd.img