mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 06/16] ARM: i.MX23 olinuxino: Check machine type in initcalls
Date: Wed, 18 Sep 2019 09:54:11 +0200	[thread overview]
Message-ID: <20190918075421.20456-7-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20190918075421.20456-1-s.hauer@pengutronix.de>

Check for the right machine type in initcalls before executing them to
make the board multi image safe.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c | 8 ++++++++
 arch/arm/boards/imx233-olinuxino/lowlevel.c        | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c b/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
index c06779ddf6..af548b3c53 100644
--- a/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
+++ b/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
@@ -26,6 +26,7 @@
 #include <errno.h>
 #include <mci.h>
 #include <asm/armlinux.h>
+#include <asm/barebox-arm.h>
 #include <usb/ehci.h>
 #include <mach/usb.h>
 #include <generated/mach-types.h>
@@ -33,6 +34,7 @@
 #include <mach/clock.h>
 #include <mach/mci.h>
 #include <mach/iomux.h>
+#include <generated/mach-types.h>
 
 static struct mxs_mci_platform_data mci_pdata = {
 	.caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED,
@@ -56,6 +58,9 @@ static struct gpio_led led1 = {
 
 static int imx23_olinuxino_devices_init(void)
 {
+	if (barebox_arm_machine() != MACH_TYPE_IMX233_OLINUXINO)
+		return 0;
+
 	armlinux_set_architecture(MACH_TYPE_IMX233_OLINUXINO);
 	defaultenv_append_directory(defaultenv_imx233_olinuxino);
 
@@ -76,6 +81,9 @@ device_initcall(imx23_olinuxino_devices_init);
 
 static int imx23_olinuxino_console_init(void)
 {
+	if (barebox_arm_machine() != MACH_TYPE_IMX233_OLINUXINO)
+		return 0;
+
 	barebox_set_model("Olimex.ltd imx233-olinuxino");
 	barebox_set_hostname("imx233-olinuxino");
 
diff --git a/arch/arm/boards/imx233-olinuxino/lowlevel.c b/arch/arm/boards/imx233-olinuxino/lowlevel.c
index 07a2a0e293..253cf1257b 100644
--- a/arch/arm/boards/imx233-olinuxino/lowlevel.c
+++ b/arch/arm/boards/imx233-olinuxino/lowlevel.c
@@ -7,10 +7,11 @@
 #include <io.h>
 #include <debug_ll.h>
 #include <mach/iomux.h>
+#include <generated/mach-types.h>
 
 ENTRY_FUNCTION(start_barebox_olinuxino_imx23, r0, r1, r2)
 {
-	barebox_arm_entry(IMX_MEMORY_BASE, SZ_64M, NULL);
+	barebox_arm_entry(IMX_MEMORY_BASE, SZ_64M, (void *)MACH_TYPE_IMX233_OLINUXINO);
 }
 
 static const uint32_t pad_setup[] = {
-- 
2.23.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2019-09-18  7:54 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-18  7:54 [PATCH 00/16] ARM: mxs: full multi image support Sascha Hauer
2019-09-18  7:54 ` [PATCH 01/16] ARM: start: Allow to pass machine type as boarddata Sascha Hauer
2019-09-18  7:54 ` [PATCH 02/16] ARM: tx28: Pass and check machine type Sascha Hauer
2019-09-18  7:54 ` [PATCH 03/16] ARM: tx28: Make locally used function static Sascha Hauer
2019-09-18  7:54 ` [PATCH 04/16] ARM: duckbill: Check machine type in initcalls Sascha Hauer
2019-09-18  7:54 ` [PATCH 05/16] ARM: Freescale mx28evk: " Sascha Hauer
2019-09-18  7:54 ` Sascha Hauer [this message]
2019-09-18  7:54 ` [PATCH 07/16] ARM: Crytalfonts cfa10036: " Sascha Hauer
2019-09-18  7:54 ` [PATCH 08/16] ARM: i.MX23 Chumby: " Sascha Hauer
2019-09-18  7:54 ` [PATCH 09/16] ARM: Freescale i.MX23 evk: " Sascha Hauer
2019-09-18  7:54 ` [PATCH 10/16] ARM: mxs: cfa10036: Switch to multi image support Sascha Hauer
2019-09-18  7:54 ` [PATCH 11/16] ARM: mxs: imx23-evk: " Sascha Hauer
2019-09-18  7:54 ` [PATCH 12/16] ARM: mxs: chumby: " Sascha Hauer
2019-09-18  7:54 ` [PATCH 13/16] ARM: mxs: Move HAVE_PBL_MULTI_IMAGES up to ARCH Sascha Hauer
2019-09-18  7:54 ` [PATCH 14/16] ARM: mxs: Allow to compile all boards for a SoC together Sascha Hauer
2019-09-18  7:54 ` [PATCH 15/16] ARM: add common i.MX28 defconfig file Sascha Hauer
2019-09-18  7:54 ` [PATCH 16/16] ARM: add common i.MX23 " 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=20190918075421.20456-7-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