Merge git://www.denx.de/git/u-boot-imx

[u-boot] / board / renesas / alt / alt.c

diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c
index f0010db814a83aced0566223a88147076c7ac6b1..0bf8160f1fa2bcb8725de9e3a651ff2c42a694b8 100644 (file)
--- a/board/renesas/alt/alt.c
+++ b/board/renesas/alt/alt.c
@@ -1,7 +1,7 @@
 /*
  * board/renesas/alt/alt.c
  *
- * Copyright (C) 2014 Renesas Electronics Corporation
+ * Copyright (C) 2014, 2015 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: GPL-2.0
  */
@@ -13,7 +13,7 @@
 #include <asm/processor.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
 #include <asm/arch/rmobile.h>
@@ -94,6 +94,20 @@ int board_init(void)
        r8a7794_pinmux_init();
 
        /* Ether Enable */
+#if defined(CONFIG_R8A7794_ETHERNET_B)
+       gpio_request(GPIO_FN_ETH_CRS_DV_B, NULL);
+       gpio_request(GPIO_FN_ETH_RX_ER_B, NULL);
+       gpio_request(GPIO_FN_ETH_RXD0_B, NULL);
+       gpio_request(GPIO_FN_ETH_RXD1_B, NULL);
+       gpio_request(GPIO_FN_ETH_LINK_B, NULL);
+       gpio_request(GPIO_FN_ETH_REFCLK_B, NULL);
+       gpio_request(GPIO_FN_ETH_MDIO_B, NULL);
+       gpio_request(GPIO_FN_ETH_TXD1_B, NULL);
+       gpio_request(GPIO_FN_ETH_TX_EN_B, NULL);
+       gpio_request(GPIO_FN_ETH_MAGIC_B, NULL);
+       gpio_request(GPIO_FN_ETH_TXD0_B, NULL);
+       gpio_request(GPIO_FN_ETH_MDC_B, NULL);
+#else
        gpio_request(GPIO_FN_ETH_CRS_DV, NULL);
        gpio_request(GPIO_FN_ETH_RX_ER, NULL);
        gpio_request(GPIO_FN_ETH_RXD0, NULL);
@@ -106,6 +120,7 @@ int board_init(void)
        gpio_request(GPIO_FN_ETH_MAGIC, NULL);
        gpio_request(GPIO_FN_ETH_TXD0, NULL);
        gpio_request(GPIO_FN_ETH_MDC, NULL);
+#endif
        gpio_request(GPIO_FN_IRQ8, NULL);
 
        /* PHY reset */
@@ -128,7 +143,7 @@ int board_eth_init(bd_t *bis)
        unsigned char enetaddr[6];
 
        ret = sh_eth_initialize(bis);
-       if (!eth_getenv_enetaddr("ethaddr", enetaddr))
+       if (!eth_env_get_enetaddr("ethaddr", enetaddr))
                return ret;
 
        /* Set Mac address */
@@ -202,7 +217,7 @@ int dram_init(void)
 }
 
 const struct rmobile_sysinfo sysinfo = {
-       CONFIG_RMOBILE_BOARD_STRING
+       CONFIG_ARCH_RMOBILE_BOARD_STRING
 };
 
 void reset_cpu(ulong addr)