[U-Boot] [PATCH 24/27] tqm8xx: rename load_sernum_ethaddr() to tqc_load_sernum_ethaddr()

Mike Frysinger
2009-02-14T07:23:07Z

Rename load_sernum_ethaddr() to tqc_load_sernum_ethaddr() and have board
init code call it rather than the common ppc board code.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
CC: Ben Warren <biggerbadderben@gmail.com>
---
board/tqc/tqm8xx/load_sernum_ethaddr.c | 6 +++++-
board/tqc/tqm8xx/tqm8xx.c | 3 +++
2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/board/tqc/tqm8xx/load_sernum_ethaddr.c b/board/tqc/tqm8xx/load_sernum_ethaddr.c
index d269902..ea534f7 100644
--- a/board/tqc/tqm8xx/load_sernum_ethaddr.c
+++ b/board/tqc/tqm8xx/load_sernum_ethaddr.c
@@ -49,7 +49,7 @@
* 4) Number of additional MAC addresses
*/

-void load_sernum_ethaddr (void)
+void tqc_load_sernum_ethaddr (void)
{
unsigned char *hwi;
unsigned char serial [CONFIG_SYS_HWINFO_SIZE];
@@ -103,3 +103,7 @@ void load_sernum_ethaddr (void)
setenv ((char *)"ethaddr", (char *)ethaddr);
}
}
+
+void load_sernum_ethaddr (void)
+{
+}
diff --git a/board/tqc/tqm8xx/tqm8xx.c b/board/tqc/tqm8xx/tqm8xx.c
index e065d69..ca91554 100644
--- a/board/tqc/tqm8xx/tqm8xx.c
+++ b/board/tqc/tqm8xx/tqm8xx.c
@@ -449,11 +449,14 @@ int board_early_init_r (void)

#ifdef CONFIG_MISC_INIT_R
+extern void tqc_load_sernum_ethaddr(void);
int misc_init_r (void)
{
volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
volatile memctl8xx_t *memctl = &immap->im_memctl;

+ tqc_load_sernum_ethaddr();
+
#ifdef CONFIG_SYS_OR_TIMING_FLASH_AT_50MHZ
int scy, trlx, flash_or_timing, clk_diff;

--
1.6.1.3