mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 03/11] ARM: i.MX51 babbage: prepare for multiboard support
Date: Wed, 26 Jun 2013 10:00:49 +0200	[thread overview]
Message-ID: <1372233657-19455-4-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1372233657-19455-1-git-send-email-s.hauer@pengutronix.de>

Merge two initcalls to one and add a protector for the board type.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/boards/freescale-mx51-pdk/board.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boards/freescale-mx51-pdk/board.c b/arch/arm/boards/freescale-mx51-pdk/board.c
index 3906e47..2e7be85 100644
--- a/arch/arm/boards/freescale-mx51-pdk/board.c
+++ b/arch/arm/boards/freescale-mx51-pdk/board.c
@@ -160,8 +160,11 @@ static void babbage_power_init(void)
 extern char flash_header_imx51_babbage_start[];
 extern char flash_header_imx51_babbage_end[];
 
-static int f3s_devices_init(void)
+static int imx51_babbage_late_init(void)
 {
+	if (!of_machine_is_compatible("fsl,imx51-babbage"))
+		return 0;
+
 	babbage_power_init();
 
 	console_flush();
@@ -175,13 +178,6 @@ static int f3s_devices_init(void)
 		BBU_HANDLER_FLAG_DEFAULT, (void *)flash_header_imx51_babbage_start,
 		flash_header_imx51_babbage_end - flash_header_imx51_babbage_start, 0);
 
-	return 0;
-}
-
-device_initcall(f3s_devices_init);
-
-static int f3s_part_init(void)
-{
 	device_detect_by_name("mmc0");
 
 	devfs_add_partition("mmc0", 0x00000, 0x40000, DEVFS_PARTITION_FIXED, "self0");
@@ -189,4 +185,4 @@ static int f3s_part_init(void)
 
 	return 0;
 }
-late_initcall(f3s_part_init);
+late_initcall(imx51_babbage_late_init);
-- 
1.8.3.1


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

  parent reply	other threads:[~2013-06-26  8:01 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-26  8:00 [PATCH] Multi board support Sascha Hauer
2013-06-26  8:00 ` [PATCH 01/11] ARM: i.MX: select SoC from board Sascha Hauer
2013-06-26  8:00 ` [PATCH 02/11] ARM: i.MX51 babbage: add board name to flash header file Sascha Hauer
2013-06-26  8:00 ` Sascha Hauer [this message]
2013-06-26  8:00 ` [PATCH 04/11] ARM: i.MX51 babbage: Move over to multiboard Sascha Hauer
2013-06-26  8:00 ` [PATCH 05/11] ARM: i.MX53 loco: add board name to flash header file Sascha Hauer
2013-06-26  8:00 ` [PATCH 06/11] ARM: i.MX53 loco: prepare multiboard support Sascha Hauer
2013-06-26  8:00 ` [PATCH 07/11] ARM: i.MX53 loco: Move over to multiboard Sascha Hauer
2013-06-26  8:00 ` [PATCH 08/11] ARM: i.MX6 realq7: prepare multiboard support Sascha Hauer
2013-06-27  7:03   ` Jean-Christophe PLAGNIOL-VILLARD
2013-06-27 18:32     ` Sascha Hauer
2013-06-28  7:40       ` Jean-Christophe PLAGNIOL-VILLARD
2013-06-26  8:00 ` [PATCH 09/11] ARM: i.MX6 realq7: switch to multiboard Sascha Hauer
2013-06-26  8:00 ` [PATCH 10/11] ARM: i.MX51 efikasb: switch to multiboard support Sascha Hauer
2013-06-26  8:00 ` [PATCH 11/11] ARM: Add a imx_v7_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=1372233657-19455-4-git-send-email-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