All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tom Rini <trini@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 05/08] omap3: Introduce weak misc_init_r
Date: Fri, 13 Apr 2012 15:20:03 -0700	[thread overview]
Message-ID: <1334355606-16491-6-git-send-email-trini@ti.com> (raw)
In-Reply-To: <1334355606-16491-1-git-send-email-trini@ti.com>

Introduce a __weak misc_init_r function that just runs dieid_num_r().
Remove misc_init_r from cm_t35, mcx, omap3_logic and mt_ventoux as this was
all they did for misc_init_r.

Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Ilya Yanok <yanok@emcraft.com>
Cc: Peter Barada <peter.barada@logicpd.com>
Cc: Stefano Babic <sbabic@denx.de>
Signed-off-by: Tom Rini <trini@ti.com>
---
 arch/arm/cpu/armv7/omap3/board.c     |   12 ++++++++++++
 board/cm_t35/cm_t35.c                |   11 -----------
 board/htkw/mcx/mcx.c                 |   11 -----------
 board/logicpd/omap3som/omap3logic.c  |   11 -----------
 board/teejet/mt_ventoux/mt_ventoux.c |    7 -------
 5 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c
index 1fee574..f2e52e9 100644
--- a/arch/arm/cpu/armv7/omap3/board.c
+++ b/arch/arm/cpu/armv7/omap3/board.c
@@ -41,6 +41,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/omap_common.h>
 #include <i2c.h>
+#include <linux/compiler.h>
 
 /* Declarations */
 extern omap3_sysinfo sysinfo;
@@ -244,6 +245,17 @@ void s_init(void)
 		mem_init();
 }
 
+/*
+ * Routine: misc_init_r
+ * Description: A basic misc_init_r that just displays the die ID
+ */
+int __weak misc_init_r(void)
+{
+	dieid_num_r();
+
+	return 0;
+}
+
 /******************************************************************************
  * Routine: wait_for_command_complete
  * Description: Wait for posting to finish on watchdog
diff --git a/board/cm_t35/cm_t35.c b/board/cm_t35/cm_t35.c
index 7a2fed7..b5d2800 100644
--- a/board/cm_t35/cm_t35.c
+++ b/board/cm_t35/cm_t35.c
@@ -100,17 +100,6 @@ int board_init(void)
 }
 
 /*
- * Routine: misc_init_r
- * Description: display die ID
- */
-int misc_init_r(void)
-{
-	dieid_num_r();
-
-	return 0;
-}
-
-/*
  * Routine: set_muxconf_regs
  * Description: Setting up the configuration Mux registers specific to the
  *		hardware. Many pins need to be moved from protect to primary
diff --git a/board/htkw/mcx/mcx.c b/board/htkw/mcx/mcx.c
index 8f0b527..8f75af1 100644
--- a/board/htkw/mcx/mcx.c
+++ b/board/htkw/mcx/mcx.c
@@ -69,17 +69,6 @@ int board_init(void)
 }
 
 /*
- * Routine: misc_init_r
- * Description: late init.
- */
-int misc_init_r(void)
-{
-	dieid_num_r();
-
-	return 0;
-}
-
-/*
  * Routine: set_muxconf_regs
  * Description: Setting up the configuration Mux registers specific to the
  *		hardware. Many pins need to be moved from protect to primary
diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c
index 89b114b..12bcfcb 100644
--- a/board/logicpd/omap3som/omap3logic.c
+++ b/board/logicpd/omap3som/omap3logic.c
@@ -144,17 +144,6 @@ int board_mmc_init(bd_t *bis)
 }
 #endif
 
-/*
- * Routine: misc_init_r
- * Description: display die ID register
- */
-int misc_init_r(void)
-{
-	dieid_num_r();
-
-	return 0;
-}
-
 #ifdef CONFIG_SMC911X
 /* GPMC CS1 settings for Logic SOM LV/Torpedo LAN92xx Ethernet chip */
 static const u32 gpmc_lan92xx_config[] = {
diff --git a/board/teejet/mt_ventoux/mt_ventoux.c b/board/teejet/mt_ventoux/mt_ventoux.c
index c7aedc9..9fbaedd 100644
--- a/board/teejet/mt_ventoux/mt_ventoux.c
+++ b/board/teejet/mt_ventoux/mt_ventoux.c
@@ -196,13 +196,6 @@ int board_init(void)
 	return 0;
 }
 
-int misc_init_r(void)
-{
-	dieid_num_r();
-
-	return 0;
-}
-
 /*
  * Routine: set_muxconf_regs
  * Description: Setting up the configuration Mux registers specific to the
-- 
1.7.0.4

  parent reply	other threads:[~2012-04-13 22:20 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-13 22:19 [U-Boot] [PATCH 00/08]: Config cleanups Tom Rini
2012-04-13 22:19 ` [U-Boot] [PATCH 01/08] omap4: Remove CONFIG_SYS_MMC_SET_DEV Tom Rini
2012-04-13 22:20 ` [U-Boot] [PATCH 02/08] omap4+: Remove CONFIG_ARCH_CPU_INIT Tom Rini
2012-04-13 22:20 ` [U-Boot] [PATCH 03/08] omap5912osk: Remove empty misc_init_r Tom Rini
2012-04-13 22:20 ` [U-Boot] [PATCH 04/08] omap730p2: " Tom Rini
2012-04-13 22:20 ` Tom Rini [this message]
2012-04-15  7:32   ` [U-Boot] [PATCH 05/08] omap3: Introduce weak misc_init_r Igor Grinberg
2012-04-15  8:48   ` stefano babic
2012-04-13 22:20 ` [U-Boot] [PATCH 06/08] include/configs: Remove CONFIG_SYS_64BIT_VSPRINTF Tom Rini
2012-04-13 22:20 ` [U-Boot] [PATCH 07/08] include/configs: Remove CONFIG_SYS_64BIT_STRTOUL Tom Rini
2012-04-13 22:20 ` [U-Boot] [PATCH 08/08] include/configs: Better utilize CONFIG_SYS_NO_FLASH Tom Rini
2012-04-14  6:22   ` Wolfgang Denk
2012-04-16 15:09     ` Tom Rini
2012-04-16 20:56       ` Wolfgang Denk
2012-04-16 23:52         ` Tom Rini

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=1334355606-16491-6-git-send-email-trini@ti.com \
    --to=trini@ti.com \
    --cc=u-boot@lists.denx.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.