Convert CONFIG_SF_DEFAULT_* to Kconfig

[platform/kernel/u-boot.git] / board / Arcturus / ucp1020 / cmd_arc.c

diff --git a/board/Arcturus/ucp1020/cmd_arc.c b/board/Arcturus/ucp1020/cmd_arc.c
index c32f7df..9579d52 100644 (file)
--- a/board/Arcturus/ucp1020/cmd_arc.c
+++ b/board/Arcturus/ucp1020/cmd_arc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
 /*
  * Command for accessing Arcturus factory environment.
  *
@@ -5,8 +6,6 @@
  *           http://www.arcturusnetworks.com/products/ucp1020/
  *           by Oleksandr G Zhadan et al.
  *
- * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
- *
  */
 
 #include <common.h>
@@ -16,19 +15,6 @@
 
 #include <asm/io.h>
 
-#ifndef CONFIG_SF_DEFAULT_SPEED
-#   define CONFIG_SF_DEFAULT_SPEED     1000000
-#endif
-#ifndef CONFIG_SF_DEFAULT_MODE
-#   define CONFIG_SF_DEFAULT_MODE      SPI_MODE0
-#endif
-#ifndef CONFIG_SF_DEFAULT_CS
-#   define CONFIG_SF_DEFAULT_CS                0
-#endif
-#ifndef CONFIG_SF_DEFAULT_BUS
-#   define CONFIG_SF_DEFAULT_BUS       0
-#endif
-
 #define MAX_SERIAL_SIZE 15
 #define MAX_HWADDR_SIZE 17
 
@@ -149,7 +135,7 @@ int get_arc_info(void)
        if (smac[2][0] == 0xFF) {
                printf("\t<not found>\n");
        } else {
-               char *ret = getenv("ethaddr");
+               char *ret = env_get("ethaddr");
 
                if (strcmp(ret, __stringify(CONFIG_ETHADDR)) == 0) {
                        env_set("ethaddr", smac[2]);
@@ -169,7 +155,7 @@ int get_arc_info(void)
        if (smac[1][0] == 0xFF) {
                printf("\t<not found>\n");
        } else {
-               char *ret = getenv("eth1addr");
+               char *ret = env_get("eth1addr");
 
                if (strcmp(ret, __stringify(CONFIG_ETH1ADDR)) == 0) {
                        env_set("eth1addr", smac[1]);
@@ -188,7 +174,7 @@ int get_arc_info(void)
        if (smac[0][0] == 0xFF) {
                printf("\t<not found>\n");
        } else {
-               char *ret = getenv("eth2addr");
+               char *ret = env_get("eth2addr");
 
                if (strcmp(ret, __stringify(CONFIG_ETH2ADDR)) == 0) {
                        env_set("eth2addr", smac[0]);