tizen 2.3.1 release

[platform/kernel/u-boot.git] / board / cm-bf537u / cm-bf537u.c

diff --git a/board/cm-bf537u/cm-bf537u.c b/board/cm-bf537u/cm-bf537u.c
index 5941b5f..4b7e864 100644 (file)
--- a/board/cm-bf537u/cm-bf537u.c
+++ b/board/cm-bf537u/cm-bf537u.c
@@ -24,35 +24,34 @@ int checkboard(void)
        return 0;
 }
 
-static void board_init_enetaddr(char *var)
+#ifdef CONFIG_BFIN_MAC
+static void board_init_enetaddr(uchar *mac_addr)
 {
-       uchar enetaddr[6];
-
-       if (eth_getenv_enetaddr(var, enetaddr))
-               return;
-
-       printf("Warning: %s: generating 'random' MAC address\n", var);
-       bfin_gen_rand_mac(enetaddr);
-       eth_setenv_enetaddr(var, enetaddr);
+       puts("Warning: Generating 'random' MAC address\n");
+       bfin_gen_rand_mac(mac_addr);
+       eth_setenv_enetaddr("ethaddr", mac_addr);
 }
 
-#ifndef CONFIG_BFIN_MAC
-# define bfin_EMAC_initialize(x) 1
-#endif
-#ifndef CONFIG_SMC911X
-# define smc911x_initialize(n, x) 1
+int board_eth_init(bd_t *bis)
+{
+       return bfin_EMAC_initialize(bis);
+}
 #endif
+
+#ifdef CONFIG_SMC911X
 int board_eth_init(bd_t *bis)
 {
-       /* return ok if at least 1 eth device works */
-       return bfin_EMAC_initialize(bis) &
-              smc911x_initialize(0, CONFIG_SMC911X_BASE);
+       return smc911x_initialize(0, CONFIG_SMC911X_BASE);
 }
+#endif
 
 int misc_init_r(void)
 {
-       board_init_enetaddr("ethaddr");
-       board_init_enetaddr("eth1addr");
+#ifdef CONFIG_BFIN_MAC
+       uchar enetaddr[6];
+       if (!eth_getenv_enetaddr("ethaddr", enetaddr))
+               board_init_enetaddr(enetaddr);
+#endif
 
        gpio_cfi_flash_init();