net: Move enetaddr env access code to env config instead of net config

[u-boot] / board / ti / am43xx / board.c

diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c
index 2c417e75459c7741123bddc6d4f493bb4990f776..0431cd46067004738c6b0aac96473ebcc3ffb796 100644 (file)
--- a/board/ti/am43xx/board.c
+++ b/board/ti/am43xx/board.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <environment.h>
 #include <i2c.h>
 #include <linux/errno.h>
 #include <spl.h>
@@ -520,6 +521,62 @@ static void enable_vtt_regulator(void)
        writel(temp, AM33XX_GPIO5_BASE + OMAP_GPIO_OE);
 }
 
+enum {
+       RTC_BOARD_EPOS = 1,
+       RTC_BOARD_EVM14,
+       RTC_BOARD_EVM12,
+       RTC_BOARD_GPEVM,
+       RTC_BOARD_SK,
+};
+
+/*
+ * In the rtc_only+DRR in self-refresh boot path we have the board type info
+ * in the rtc scratch pad register hence we bypass the costly i2c reads to
+ * eeprom and directly programthe board name string
+ */
+void rtc_only_update_board_type(u32 btype)
+{
+       const char *name = "";
+       const char *rev = "1.0";
+
+       switch (btype) {
+       case RTC_BOARD_EPOS:
+               name = "AM43EPOS";
+               break;
+       case RTC_BOARD_EVM14:
+               name = "AM43__GP";
+               rev = "1.4";
+               break;
+       case RTC_BOARD_EVM12:
+               name = "AM43__GP";
+               rev = "1.2";
+               break;
+       case RTC_BOARD_GPEVM:
+               name = "AM43__GP";
+               break;
+       case RTC_BOARD_SK:
+               name = "AM43__SK";
+               break;
+       }
+       ti_i2c_eeprom_am_set(name, rev);
+}
+
+u32 rtc_only_get_board_type(void)
+{
+       if (board_is_eposevm())
+               return RTC_BOARD_EPOS;
+       else if (board_is_evm_14_or_later())
+               return RTC_BOARD_EVM14;
+       else if (board_is_evm_12_or_later())
+               return RTC_BOARD_EVM12;
+       else if (board_is_gpevm())
+               return RTC_BOARD_GPEVM;
+       else if (board_is_sk())
+               return RTC_BOARD_SK;
+
+       return 0;
+}
+
 void sdram_init(void)
 {
        /*
@@ -580,6 +637,11 @@ int board_init(void)
        gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
        gpmc_init();
 
+       /*
+        * Call this to initialize *ctrl again
+        */
+       hw_data_init();
+
        /* Clear all important bits for DSS errata that may need to be tweaked*/
        mreqprio_0 = readl(&cdev->mreqprio_0) & MREQPRIO_0_SAB_INIT1_MASK &
                           MREQPRIO_0_SAB_INIT0_MASK;
@@ -682,7 +744,7 @@ int usb_gadget_handle_interrupts(int index)
 #endif /* CONFIG_USB_DWC3 */
 
 #if defined(CONFIG_USB_DWC3) || defined(CONFIG_USB_XHCI_OMAP)
-int omap_xhci_board_usb_init(int index, enum usb_init_type init)
+int board_usb_init(int index, enum usb_init_type init)
 {
        enable_usb_clocks(index);
 #ifdef CONFIG_USB_DWC3
@@ -713,7 +775,7 @@ int omap_xhci_board_usb_init(int index, enum usb_init_type init)
        return 0;
 }
 
-int omap_xhci_board_usb_cleanup(int index, enum usb_init_type init)
+int board_usb_cleanup(int index, enum usb_init_type init)
 {
 #ifdef CONFIG_USB_DWC3
        switch (index) {
@@ -847,10 +909,14 @@ int ft_board_setup(void *blob, bd_t *bd)
 }
 #endif
 
-#ifdef CONFIG_SPL_LOAD_FIT
+#if defined(CONFIG_SPL_LOAD_FIT) || defined(CONFIG_DTB_RESELECT)
 int board_fit_config_name_match(const char *name)
 {
-       if (board_is_evm() && !strcmp(name, "am437x-gp-evm"))
+       bool eeprom_read = board_ti_was_eeprom_read();
+
+       if (!strcmp(name, "am4372-generic") && !eeprom_read)
+               return 0;
+       else if (board_is_evm() && !strcmp(name, "am437x-gp-evm"))
                return 0;
        else if (board_is_sk() && !strcmp(name, "am437x-sk-evm"))
                return 0;
@@ -863,6 +929,16 @@ int board_fit_config_name_match(const char *name)
 }
 #endif
 
+#ifdef CONFIG_DTB_RESELECT
+int embedded_dtb_select(void)
+{
+       do_board_detect();
+       fdtdec_setup();
+
+       return 0;
+}
+#endif
+
 #ifdef CONFIG_TI_SECURE_DEVICE
 void board_fit_image_post_process(void **p_image, size_t *p_size)
 {