arm: Finish migration of CONFIG_MACH_TYPE

[J-u-boot.git] / board / LaCie / netspace_v2 / netspace_v2.c

diff --git a/board/LaCie/netspace_v2/netspace_v2.c b/board/LaCie/netspace_v2/netspace_v2.c
index 011cc563d19d6496e84d07f14060510eaab43197..22bb008745e1f616fa9cbbd16684bcf95714d816 100644 (file)
--- a/board/LaCie/netspace_v2/netspace_v2.c
+++ b/board/LaCie/netspace_v2/netspace_v2.c
@@ -13,6 +13,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
@@ -72,8 +73,10 @@ int board_early_init_f(void)
 
 int board_init(void)
 {
+#ifdef CONFIG_MACH_TYPE
        /* Machine number */
        gd->bd->bi_arch_number = CONFIG_MACH_TYPE;
+#endif
 
        /* Boot parameters address */
        gd->bd->bi_boot_params = mvebu_sdram_bar(0) + 0x100;
@@ -100,9 +103,9 @@ int misc_init_r(void)
 void reset_phy(void)
 {
 #if defined(CONFIG_NETSPACE_LITE_V2) || defined(CONFIG_NETSPACE_MINI_V2)
-       mv_phy_88e1318_init("egiga0", 0);
+       mv_phy_88e1318_init("ethernet-controller@72000", 0);
 #else
-       mv_phy_88e1116_init("egiga0", 8);
+       mv_phy_88e1116_init("ethernet-controller@72000", 8);
 #endif
 }
 #endif