Merge branch '2022-08-04-Kconfig-migrations'

[platform/kernel/u-boot.git] / common / board_r.c

diff --git a/common/board_r.c b/common/board_r.c
index 4e3cf1f..e702f02 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -14,7 +14,9 @@
 #include <bootstage.h>
 #include <cpu_func.h>
 #include <exports.h>
+#ifdef CONFIG_MTD_NOR_FLASH
 #include <flash.h>
+#endif
 #include <hang.h>
 #include <image.h>
 #include <irq_func.h>
@@ -469,18 +471,6 @@ static int initr_malloc_bootparams(void)
 }
 #endif
 
-#ifdef CONFIG_CMD_NET
-static int initr_ethaddr(void)
-{
-       struct bd_info *bd = gd->bd;
-
-       /* kept around for legacy kernels only ... ignore the next section */
-       eth_env_get_enetaddr("ethaddr", bd->bi_enetaddr);
-
-       return 0;
-}
-#endif /* CONFIG_CMD_NET */
-
 #if defined(CONFIG_LED_STATUS)
 static int initr_status_led(void)
 {
@@ -759,9 +749,6 @@ static init_fnc_t init_sequence_r[] = {
        initr_status_led,
 #endif
        /* PPC has a udelay(20) here dating from 2002. Why? */
-#ifdef CONFIG_CMD_NET
-       initr_ethaddr,
-#endif
 #if defined(CONFIG_GPIO_HOG)
        gpio_hog_probe_all,
 #endif