env: Rename eth_setenv_enetaddr() to eth_env_set_enetaddr()

[u-boot] / board / spear / common / spr_misc.c

diff --git a/board/spear/common/spr_misc.c b/board/spear/common/spr_misc.c
index be96c1504e69a755ebd5d1e984000b20c3a56524..67de28e7ea011ac35138ee32208e74c19f82553a 100644 (file)
--- a/board/spear/common/spr_misc.c
+++ b/board/spear/common/spr_misc.c
@@ -2,29 +2,14 @@
  * (C) Copyright 2009
  * Vipin Kumar, ST Micoelectronics, vipin.kumar@st.com.
  *
- * 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 <command.h>
 #include <i2c.h>
 #include <net.h>
+#include <linux/mtd/st_smi.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_emi.h>
@@ -36,6 +21,10 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#if defined(CONFIG_CMD_NET)
+static int i2c_read_mac(uchar *buffer);
+#endif
+
 int dram_init(void)
 {
        /* Store complete RAM size and return */
@@ -44,26 +33,39 @@ int dram_init(void)
        return 0;
 }
 
-void dram_init_banksize(void)
+int dram_init_banksize(void)
 {
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = gd->ram_size;
+
+       return 0;
 }
 
+int board_early_init_f()
+{
+#if defined(CONFIG_ST_SMI)
+       smi_init();
+#endif
+       return 0;
+}
 int misc_init_r(void)
 {
 #if defined(CONFIG_CMD_NET)
        uchar mac_id[6];
 
        if (!eth_getenv_enetaddr("ethaddr", mac_id) && !i2c_read_mac(mac_id))
-               eth_setenv_enetaddr("ethaddr", mac_id);
+               eth_env_set_enetaddr("ethaddr", mac_id);
 #endif
-       setenv("verify", "n");
+       env_set("verify", "n");
 
 #if defined(CONFIG_SPEAR_USBTTY)
-       setenv("stdin", "usbtty");
-       setenv("stdout", "usbtty");
-       setenv("stderr", "usbtty");
+       env_set("stdin", "usbtty");
+       env_set("stdout", "usbtty");
+       env_set("stderr", "usbtty");
+
+#ifndef CONFIG_SYS_NO_DCACHE
+       dcache_enable();
+#endif
 #endif
        return 0;
 }
@@ -136,6 +138,7 @@ int spear_board_init(ulong mach_type)
        return 0;
 }
 
+#if defined(CONFIG_CMD_NET)
 static int i2c_read_mac(uchar *buffer)
 {
        u8 buf[2];
@@ -172,17 +175,18 @@ static int write_mac(uchar *mac)
                return 0;
        }
 
-       puts("I2C EEPROM writing failed \n");
+       puts("I2C EEPROM writing failed\n");
        return -1;
 }
+#endif
 
 int do_chip_config(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        void (*sram_setfreq) (unsigned int, unsigned int);
+       unsigned int frequency;
+#if defined(CONFIG_CMD_NET)
        unsigned char mac[6];
-       unsigned int reg, frequency;
-       char *s, *e;
-       char i2c_mac[20];
+#endif
 
        if ((argc > 3) || (argc < 2))
                return cmd_usage(cmdtp);
@@ -207,9 +211,12 @@ int do_chip_config(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                }
 
                return 0;
+
+#if defined(CONFIG_CMD_NET)
        } else if (!strcmp(argv[1], "ethaddr")) {
 
-               s = argv[2];
+               u32 reg;
+               char *e, *s = argv[2];
                for (reg = 0; reg < 6; ++reg) {
                        mac[reg] = s ? simple_strtoul(s, &e, 16) : 0;
                        if (s)
@@ -218,14 +225,15 @@ int do_chip_config(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                write_mac(mac);
 
                return 0;
+#endif
        } else if (!strcmp(argv[1], "print")) {
+#if defined(CONFIG_CMD_NET)
                if (!i2c_read_mac(mac)) {
-                       sprintf(i2c_mac, "%pM", mac);
-                       printf("Ethaddr (from i2c mem) = %s\n", i2c_mac);
+                       printf("Ethaddr (from i2c mem) = %pM\n", mac);
                } else {
                        printf("Ethaddr (from i2c mem) = Not set\n");
                }
-
+#endif
                return 0;
        }
 
@@ -235,4 +243,7 @@ int do_chip_config(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 U_BOOT_CMD(chip_config, 3, 1, do_chip_config,
           "configure chip",
           "chip_config cpufreq/ddrfreq frequency\n"
+#if defined(CONFIG_CMD_NET)
+          "chip_config ethaddr XX:XX:XX:XX:XX:XX\n"
+#endif
           "chip_config print");