Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / board / omap3 / evm / evm.c

diff --git a/board/omap3/evm/evm.c b/board/omap3/evm/evm.c
index b406312e09b37a9b267e2a8fb63e8c16e7932e4a..c008c2e4aa454cde03fb9d0341542cf23a67a1a4 100644 (file)
--- a/board/omap3/evm/evm.c
+++ b/board/omap3/evm/evm.c
@@ -36,10 +36,10 @@
 #include <asm/mach-types.h>
 #include "evm.h"
 
-/******************************************************************************
+/*
  * Routine: board_init
  * Description: Early hardware init.
- *****************************************************************************/
+ */
 int board_init(void)
 {
        DECLARE_GLOBAL_DATA_PTR;
@@ -53,10 +53,10 @@ int board_init(void)
        return 0;
 }
 
-/******************************************************************************
+/*
  * Routine: misc_init_r
  * Description: Init ethernet (done here so udelay works)
- *****************************************************************************/
+ */
 int misc_init_r(void)
 {
 
@@ -68,25 +68,27 @@ int misc_init_r(void)
        setup_net_chip();
 #endif
 
+       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
  *             mode.
- *****************************************************************************/
+ */
 void set_muxconf_regs(void)
 {
        MUX_EVM();
 }
 
-/******************************************************************************
+/*
  * Routine: setup_net_chip
  * Description: Setting up the configuration GPMC registers specific to the
  *             Ethernet hardware.
- *****************************************************************************/
+ */
 static void setup_net_chip(void)
 {
        gpio_t *gpio3_base = (gpio_t *)OMAP34XX_GPIO3_BASE;