vexpress: use correct timer address on extended memory map systems

[oweals/u-boot.git] / board / pn62 / pn62.c

diff --git a/board/pn62/pn62.c b/board/pn62/pn62.c
index 1b545bfa9d5e9aed0730cf37c2006545df4fc855..81829dd75f3987143ffc2f6a9397e963243a8576 100644 (file)
--- a/board/pn62/pn62.c
+++ b/board/pn62/pn62.c
@@ -1,27 +1,12 @@
 /*
  * (C) Copyright 2002 Wolfgang Grandegger <wg@denx.de>
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <mpc824x.h>
+#include <net.h>
 #include <pci.h>
 #include <netdev.h>
 
@@ -30,7 +15,7 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 static int get_serial_number (char *string, int size);
-static int get_mac_address (int id, u8 * mac, char *string, int size);
+static void get_mac_address(int id, u8 *mac);
 
 #ifdef CONFIG_SHOW_BOOT_PROGRESS
 void show_boot_progress (int phase)
@@ -138,18 +123,16 @@ int misc_init_r (void)
        }
        show_startup_phase (9);
 
-       if (getenv ("ethaddr") == NULL &&
-               get_mac_address (0, mac, str, sizeof (str)) > 0) {
-               setenv ("ethaddr", str);
-               memcpy (gd->bd->bi_enetaddr, mac, 6);
+       if (!eth_getenv_enetaddr("ethaddr", mac)) {
+               get_mac_address(0, mac);
+               eth_setenv_enetaddr("ethaddr", mac);
        }
        show_startup_phase (10);
 
 #ifdef CONFIG_HAS_ETH1
-       if (getenv ("eth1addr") == NULL &&
-               get_mac_address (1, mac, str, sizeof (str)) > 0) {
-               setenv ("eth1addr", str);
-               memcpy (gd->bd->bi_enet1addr, mac, 6);
+       if (!eth_getenv_enetaddr("eth1addr", mac)) {
+               get_mac_address(1, mac);
+               eth_setenv_enetaddr("eth1addr", mac);
        }
 #endif /* CONFIG_HAS_ETH1 */
        show_startup_phase (11);
@@ -177,15 +160,9 @@ static int get_serial_number (char *string, int size)
        return i;
 }
 
-static int get_mac_address (int id, u8 * mac, char *string, int size)
+static void get_mac_address(int id, u8 *mac)
 {
-       if (size < 6 * 3)
-               return -1;
-
        i2155x_read_vpd (I2155X_VPD_MAC0_START + 6 * id, 6, mac);
-       return sprintf (string, "%02x:%02x:%02x:%02x:%02x:%02x",
-                               mac[0], mac[1], mac[2],
-                               mac[3], mac[4], mac[5]);
 }
 
 int board_eth_init(bd_t *bis)