]> git.sur5r.net Git - u-boot/blobdiff - board/ti/am335x/board.c
env: Rename setenv() to env_set()
[u-boot] / board / ti / am335x / board.c
index 96245a3306a5683e4a6f98e1fa7a15701d58428f..5751b814ca263f5649ad718634e7cb40c2ee8210 100644 (file)
@@ -9,13 +9,16 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <errno.h>
 #include <spl.h>
+#include <serial.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
 #include <asm/arch/ddr_defs.h>
 #include <asm/arch/clock.h>
+#include <asm/arch/clk_synthesizer.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/sys_proto.h>
@@ -23,6 +26,9 @@
 #include <asm/io.h>
 #include <asm/emif.h>
 #include <asm/gpio.h>
+#include <asm/omap_common.h>
+#include <asm/omap_sec_common.h>
+#include <asm/omap_mmc.h>
 #include <i2c.h>
 #include <miiphy.h>
 #include <cpsw.h>
 #include <environment.h>
 #include <watchdog.h>
 #include <environment.h>
+#include "../common/board_detect.h"
 #include "board.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
 /* GPIO that controls power to DDR on EVM-SK */
-#define GPIO_DDR_VTT_EN                7
+#define GPIO_TO_PIN(bank, gpio)                (32 * (bank) + (gpio))
+#define GPIO_DDR_VTT_EN                GPIO_TO_PIN(0, 7)
+#define ICE_GPIO_DDR_VTT_EN    GPIO_TO_PIN(0, 18)
+#define GPIO_PR1_MII_CTRL      GPIO_TO_PIN(3, 4)
+#define GPIO_MUX_MII_CTRL      GPIO_TO_PIN(3, 10)
+#define GPIO_FET_SWITCH_CTRL   GPIO_TO_PIN(0, 7)
+#define GPIO_PHY_RESET         GPIO_TO_PIN(2, 5)
+#define GPIO_ETH0_MODE         GPIO_TO_PIN(0, 11)
+#define GPIO_ETH1_MODE         GPIO_TO_PIN(1, 26)
 
 static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;
 
+#define GPIO0_RISINGDETECT     (AM33XX_GPIO0_BASE + OMAP_GPIO_RISINGDETECT)
+#define GPIO1_RISINGDETECT     (AM33XX_GPIO1_BASE + OMAP_GPIO_RISINGDETECT)
+
+#define GPIO0_IRQSTATUS1       (AM33XX_GPIO0_BASE + OMAP_GPIO_IRQSTATUS1)
+#define GPIO1_IRQSTATUS1       (AM33XX_GPIO1_BASE + OMAP_GPIO_IRQSTATUS1)
+
+#define GPIO0_IRQSTATUSRAW     (AM33XX_GPIO0_BASE + 0x024)
+#define GPIO1_IRQSTATUSRAW     (AM33XX_GPIO1_BASE + 0x024)
+
 /*
  * Read header information from EEPROM into global structure.
  */
-static int read_eeprom(struct am335x_baseboard_id *header)
+#ifdef CONFIG_TI_I2C_BOARD_DETECT
+void do_board_detect(void)
 {
-       /* Check if baseboard eeprom is available */
-       if (i2c_probe(CONFIG_SYS_I2C_EEPROM_ADDR)) {
-               puts("Could not probe the EEPROM; something fundamentally "
-                       "wrong on the I2C bus.\n");
-               return -ENODEV;
-       }
-
-       /* read the eeprom using i2c */
-       if (i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR, 0, 2, (uchar *)header,
-                    sizeof(struct am335x_baseboard_id))) {
-               puts("Could not read the EEPROM; something fundamentally"
-                       " wrong on the I2C bus.\n");
-               return -EIO;
-       }
-
-       if (header->magic != 0xEE3355AA) {
-               /*
-                * read the eeprom using i2c again,
-                * but use only a 1 byte address
-                */
-               if (i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR, 0, 1, (uchar *)header,
-                            sizeof(struct am335x_baseboard_id))) {
-                       puts("Could not read the EEPROM; something "
-                               "fundamentally wrong on the I2C bus.\n");
-                       return -EIO;
-               }
+       enable_i2c0_pin_mux();
+       i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 
-               if (header->magic != 0xEE3355AA) {
-                       printf("Incorrect magic number (0x%x) in EEPROM\n",
-                                       header->magic);
-                       return -EINVAL;
-               }
-       }
+       if (ti_i2c_eeprom_am_get(CONFIG_EEPROM_BUS_ADDRESS,
+                                CONFIG_EEPROM_CHIP_ADDRESS))
+               printf("ti_i2c_eeprom_init failed\n");
+}
+#endif
 
-       return 0;
+#ifndef CONFIG_DM_SERIAL
+struct serial_device *default_serial_console(void)
+{
+       if (board_is_icev2())
+               return &eserial4_device;
+       else
+               return &eserial1_device;
 }
+#endif
 
 #ifndef CONFIG_SKIP_LOWLEVEL_INIT
 static const struct ddr_data ddr2_data = {
@@ -106,6 +113,16 @@ static const struct emif_regs ddr2_emif_reg_data = {
        .emif_ddr_phy_ctlr_1 = MT47H128M16RT25E_EMIF_READ_LATENCY,
 };
 
+static const struct emif_regs ddr2_evm_emif_reg_data = {
+       .sdram_config = MT47H128M16RT25E_EMIF_SDCFG,
+       .ref_ctrl = MT47H128M16RT25E_EMIF_SDREF,
+       .sdram_tim1 = MT47H128M16RT25E_EMIF_TIM1,
+       .sdram_tim2 = MT47H128M16RT25E_EMIF_TIM2,
+       .sdram_tim3 = MT47H128M16RT25E_EMIF_TIM3,
+       .ocp_config = EMIF_OCP_CONFIG_AM335X_EVM,
+       .emif_ddr_phy_ctlr_1 = MT47H128M16RT25E_EMIF_READ_LATENCY,
+};
+
 static const struct ddr_data ddr3_data = {
        .datardsratio0 = MT41J128MJT125_RD_DQS,
        .datawdsratio0 = MT41J128MJT125_WR_DQS,
@@ -127,6 +144,13 @@ static const struct ddr_data ddr3_evm_data = {
        .datawrsratio0 = MT41J512M8RH125_PHY_WR_DATA,
 };
 
+static const struct ddr_data ddr3_icev2_data = {
+       .datardsratio0 = MT41J128MJT125_RD_DQS_400MHz,
+       .datawdsratio0 = MT41J128MJT125_WR_DQS_400MHz,
+       .datafwsratio0 = MT41J128MJT125_PHY_FIFO_WE_400MHz,
+       .datawrsratio0 = MT41J128MJT125_PHY_WR_DATA_400MHz,
+};
+
 static const struct cmd_control ddr3_cmd_ctrl_data = {
        .cmd0csratio = MT41J128MJT125_RATIO,
        .cmd0iclkout = MT41J128MJT125_INVERT_CLKOUT,
@@ -160,6 +184,17 @@ static const struct cmd_control ddr3_evm_cmd_ctrl_data = {
        .cmd2iclkout = MT41J512M8RH125_INVERT_CLKOUT,
 };
 
+static const struct cmd_control ddr3_icev2_cmd_ctrl_data = {
+       .cmd0csratio = MT41J128MJT125_RATIO_400MHz,
+       .cmd0iclkout = MT41J128MJT125_INVERT_CLKOUT_400MHz,
+
+       .cmd1csratio = MT41J128MJT125_RATIO_400MHz,
+       .cmd1iclkout = MT41J128MJT125_INVERT_CLKOUT_400MHz,
+
+       .cmd2csratio = MT41J128MJT125_RATIO_400MHz,
+       .cmd2iclkout = MT41J128MJT125_INVERT_CLKOUT_400MHz,
+};
+
 static struct emif_regs ddr3_emif_reg_data = {
        .sdram_config = MT41J128MJT125_EMIF_SDCFG,
        .ref_ctrl = MT41J128MJT125_EMIF_SDREF,
@@ -177,6 +212,7 @@ static struct emif_regs ddr3_beagleblack_emif_reg_data = {
        .sdram_tim1 = MT41K256M16HA125E_EMIF_TIM1,
        .sdram_tim2 = MT41K256M16HA125E_EMIF_TIM2,
        .sdram_tim3 = MT41K256M16HA125E_EMIF_TIM3,
+       .ocp_config = EMIF_OCP_CONFIG_BEAGLEBONE_BLACK,
        .zq_config = MT41K256M16HA125E_ZQ_CFG,
        .emif_ddr_phy_ctlr_1 = MT41K256M16HA125E_EMIF_READ_LATENCY,
 };
@@ -187,11 +223,23 @@ static struct emif_regs ddr3_evm_emif_reg_data = {
        .sdram_tim1 = MT41J512M8RH125_EMIF_TIM1,
        .sdram_tim2 = MT41J512M8RH125_EMIF_TIM2,
        .sdram_tim3 = MT41J512M8RH125_EMIF_TIM3,
+       .ocp_config = EMIF_OCP_CONFIG_AM335X_EVM,
        .zq_config = MT41J512M8RH125_ZQ_CFG,
        .emif_ddr_phy_ctlr_1 = MT41J512M8RH125_EMIF_READ_LATENCY |
                                PHY_EN_DYN_PWRDN,
 };
 
+static struct emif_regs ddr3_icev2_emif_reg_data = {
+       .sdram_config = MT41J128MJT125_EMIF_SDCFG_400MHz,
+       .ref_ctrl = MT41J128MJT125_EMIF_SDREF_400MHz,
+       .sdram_tim1 = MT41J128MJT125_EMIF_TIM1_400MHz,
+       .sdram_tim2 = MT41J128MJT125_EMIF_TIM2_400MHz,
+       .sdram_tim3 = MT41J128MJT125_EMIF_TIM3_400MHz,
+       .zq_config = MT41J128MJT125_ZQ_CFG_400MHz,
+       .emif_ddr_phy_ctlr_1 = MT41J128MJT125_EMIF_READ_LATENCY_400MHz |
+                               PHY_EN_DYN_PWRDN,
+};
+
 #ifdef CONFIG_SPL_OS_BOOT
 int spl_start_uboot(void)
 {
@@ -201,7 +249,7 @@ int spl_start_uboot(void)
 
 #ifdef CONFIG_SPL_ENV_SUPPORT
        env_init();
-       env_relocate_spec();
+       env_load();
        if (getenv_yesno("boot_os") != 1)
                return 1;
 #endif
@@ -210,175 +258,215 @@ int spl_start_uboot(void)
 }
 #endif
 
-#define OSC    (V_OSCK/1000000)
-const struct dpll_params dpll_ddr = {
-               266, OSC-1, 1, -1, -1, -1, -1};
-const struct dpll_params dpll_ddr_evm_sk = {
-               303, OSC-1, 1, -1, -1, -1, -1};
-const struct dpll_params dpll_ddr_bone_black = {
-               400, OSC-1, 1, -1, -1, -1, -1};
-
-void am33xx_spl_board_init(void)
+const struct dpll_params *get_dpll_ddr_params(void)
 {
-       struct am335x_baseboard_id header;
-       int mpu_vdd;
-
-       if (read_eeprom(&header) < 0)
-               puts("Could not get board ID.\n");
-
-       /* Get the frequency */
-       dpll_mpu_opp100.m = am335x_get_efuse_mpu_max_freq(cdev);
-
-       if (board_is_bone(&header) || board_is_bone_lt(&header)) {
-               /* BeagleBone PMIC Code */
-               int usb_cur_lim;
+       int ind = get_sys_clk_index();
+
+       if (board_is_evm_sk())
+               return &dpll_ddr3_303MHz[ind];
+       else if (board_is_bone_lt() || board_is_icev2())
+               return &dpll_ddr3_400MHz[ind];
+       else if (board_is_evm_15_or_later())
+               return &dpll_ddr3_303MHz[ind];
+       else
+               return &dpll_ddr2_266MHz[ind];
+}
 
-               /*
-                * Only perform PMIC configurations if board rev > A1
-                * on Beaglebone White
-                */
-               if (board_is_bone(&header) && !strncmp(header.version,
-                                                      "00A1", 4))
-                       return;
+static u8 bone_not_connected_to_ac_power(void)
+{
+       if (board_is_bone()) {
+               uchar pmic_status_reg;
+               if (tps65217_reg_read(TPS65217_STATUS,
+                                     &pmic_status_reg))
+                       return 1;
+               if (!(pmic_status_reg & TPS65217_PWR_SRC_AC_BITMASK)) {
+                       puts("No AC power, switching to default OPP\n");
+                       return 1;
+               }
+       }
+       return 0;
+}
 
-               if (i2c_probe(TPS65217_CHIP_PM))
-                       return;
+const struct dpll_params *get_dpll_mpu_params(void)
+{
+       int ind = get_sys_clk_index();
+       int freq = am335x_get_efuse_mpu_max_freq(cdev);
+
+       if (bone_not_connected_to_ac_power())
+               freq = MPUPLL_M_600;
+
+       if (board_is_bone_lt())
+               freq = MPUPLL_M_1000;
+
+       switch (freq) {
+       case MPUPLL_M_1000:
+               return &dpll_mpu_opp[ind][5];
+       case MPUPLL_M_800:
+               return &dpll_mpu_opp[ind][4];
+       case MPUPLL_M_720:
+               return &dpll_mpu_opp[ind][3];
+       case MPUPLL_M_600:
+               return &dpll_mpu_opp[ind][2];
+       case MPUPLL_M_500:
+               return &dpll_mpu_opp100;
+       case MPUPLL_M_300:
+               return &dpll_mpu_opp[ind][0];
+       }
 
-               /*
-                * On Beaglebone White we need to ensure we have AC power
-                * before increasing the frequency.
-                */
-               if (board_is_bone(&header)) {
-                       uchar pmic_status_reg;
-                       if (tps65217_reg_read(TPS65217_STATUS,
-                                             &pmic_status_reg))
-                               return;
-                       if (!(pmic_status_reg & TPS65217_PWR_SRC_AC_BITMASK)) {
-                               puts("No AC power, disabling frequency switch\n");
-                               return;
-                       }
-               }
+       return &dpll_mpu_opp[ind][0];
+}
 
-               /*
-                * Override what we have detected since we know if we have
-                * a Beaglebone Black it supports 1GHz.
-                */
-               if (board_is_bone_lt(&header))
-                       dpll_mpu_opp100.m = MPUPLL_M_1000;
+static void scale_vcores_bone(int freq)
+{
+       int usb_cur_lim, mpu_vdd;
 
-               /*
-                * Increase USB current limit to 1300mA or 1800mA and set
-                * the MPU voltage controller as needed.
-                */
-               if (dpll_mpu_opp100.m == MPUPLL_M_1000) {
-                       usb_cur_lim = TPS65217_USB_INPUT_CUR_LIMIT_1800MA;
-                       mpu_vdd = TPS65217_DCDC_VOLT_SEL_1325MV;
-               } else {
-                       usb_cur_lim = TPS65217_USB_INPUT_CUR_LIMIT_1300MA;
-                       mpu_vdd = TPS65217_DCDC_VOLT_SEL_1275MV;
-               }
+       /*
+        * Only perform PMIC configurations if board rev > A1
+        * on Beaglebone White
+        */
+       if (board_is_bone() && !strncmp(board_ti_get_rev(), "00A1", 4))
+               return;
 
-               if (tps65217_reg_write(TPS65217_PROT_LEVEL_NONE,
-                                      TPS65217_POWER_PATH,
-                                      usb_cur_lim,
-                                      TPS65217_USB_INPUT_CUR_LIMIT_MASK))
-                       puts("tps65217_reg_write failure\n");
+       if (i2c_probe(TPS65217_CHIP_PM))
+               return;
 
-               /* Set DCDC3 (CORE) voltage to 1.125V */
-               if (tps65217_voltage_update(TPS65217_DEFDCDC3,
-                                           TPS65217_DCDC_VOLT_SEL_1125MV)) {
-                       puts("tps65217_voltage_update failure\n");
-                       return;
-               }
+       /*
+        * On Beaglebone White we need to ensure we have AC power
+        * before increasing the frequency.
+        */
+       if (bone_not_connected_to_ac_power())
+               freq = MPUPLL_M_600;
 
-               /* Set CORE Frequencies to OPP100 */
-               do_setup_dpll(&dpll_core_regs, &dpll_core_opp100);
+       /*
+        * Override what we have detected since we know if we have
+        * a Beaglebone Black it supports 1GHz.
+        */
+       if (board_is_bone_lt())
+               freq = MPUPLL_M_1000;
+
+       switch (freq) {
+       case MPUPLL_M_1000:
+               mpu_vdd = TPS65217_DCDC_VOLT_SEL_1325MV;
+               usb_cur_lim = TPS65217_USB_INPUT_CUR_LIMIT_1800MA;
+               break;
+       case MPUPLL_M_800:
+               mpu_vdd = TPS65217_DCDC_VOLT_SEL_1275MV;
+               usb_cur_lim = TPS65217_USB_INPUT_CUR_LIMIT_1300MA;
+               break;
+       case MPUPLL_M_720:
+               mpu_vdd = TPS65217_DCDC_VOLT_SEL_1200MV;
+               usb_cur_lim = TPS65217_USB_INPUT_CUR_LIMIT_1300MA;
+               break;
+       case MPUPLL_M_600:
+       case MPUPLL_M_500:
+       case MPUPLL_M_300:
+       default:
+               mpu_vdd = TPS65217_DCDC_VOLT_SEL_1100MV;
+               usb_cur_lim = TPS65217_USB_INPUT_CUR_LIMIT_1300MA;
+               break;
+       }
 
-               /* Set DCDC2 (MPU) voltage */
-               if (tps65217_voltage_update(TPS65217_DEFDCDC2, mpu_vdd)) {
-                       puts("tps65217_voltage_update failure\n");
-                       return;
-               }
+       if (tps65217_reg_write(TPS65217_PROT_LEVEL_NONE,
+                              TPS65217_POWER_PATH,
+                              usb_cur_lim,
+                              TPS65217_USB_INPUT_CUR_LIMIT_MASK))
+               puts("tps65217_reg_write failure\n");
+
+       /* Set DCDC3 (CORE) voltage to 1.10V */
+       if (tps65217_voltage_update(TPS65217_DEFDCDC3,
+                                   TPS65217_DCDC_VOLT_SEL_1100MV)) {
+               puts("tps65217_voltage_update failure\n");
+               return;
+       }
 
-               /*
-                * Set LDO3, LDO4 output voltage to 3.3V for Beaglebone.
-                * Set LDO3 to 1.8V and LDO4 to 3.3V for Beaglebone Black.
-                */
-               if (board_is_bone(&header)) {
-                       if (tps65217_reg_write(TPS65217_PROT_LEVEL_2,
-                                              TPS65217_DEFLS1,
-                                              TPS65217_LDO_VOLTAGE_OUT_3_3,
-                                              TPS65217_LDO_MASK))
-                               puts("tps65217_reg_write failure\n");
-               } else {
-                       if (tps65217_reg_write(TPS65217_PROT_LEVEL_2,
-                                              TPS65217_DEFLS1,
-                                              TPS65217_LDO_VOLTAGE_OUT_1_8,
-                                              TPS65217_LDO_MASK))
-                               puts("tps65217_reg_write failure\n");
-               }
+       /* Set DCDC2 (MPU) voltage */
+       if (tps65217_voltage_update(TPS65217_DEFDCDC2, mpu_vdd)) {
+               puts("tps65217_voltage_update failure\n");
+               return;
+       }
 
+       /*
+        * Set LDO3, LDO4 output voltage to 3.3V for Beaglebone.
+        * Set LDO3 to 1.8V and LDO4 to 3.3V for Beaglebone Black.
+        */
+       if (board_is_bone()) {
                if (tps65217_reg_write(TPS65217_PROT_LEVEL_2,
-                                      TPS65217_DEFLS2,
+                                      TPS65217_DEFLS1,
                                       TPS65217_LDO_VOLTAGE_OUT_3_3,
                                       TPS65217_LDO_MASK))
                        puts("tps65217_reg_write failure\n");
        } else {
-               int sil_rev;
+               if (tps65217_reg_write(TPS65217_PROT_LEVEL_2,
+                                      TPS65217_DEFLS1,
+                                      TPS65217_LDO_VOLTAGE_OUT_1_8,
+                                      TPS65217_LDO_MASK))
+                       puts("tps65217_reg_write failure\n");
+       }
 
-               /*
-                * The GP EVM, IDK and EVM SK use a TPS65910 PMIC.  For all
-                * MPU frequencies we support we use a CORE voltage of
-                * 1.1375V.  For MPU voltage we need to switch based on
-                * the frequency we are running at.
-                */
-               if (i2c_probe(TPS65910_CTRL_I2C_ADDR))
-                       return;
+       if (tps65217_reg_write(TPS65217_PROT_LEVEL_2,
+                              TPS65217_DEFLS2,
+                              TPS65217_LDO_VOLTAGE_OUT_3_3,
+                              TPS65217_LDO_MASK))
+               puts("tps65217_reg_write failure\n");
+}
 
-               /*
-                * Depending on MPU clock and PG we will need a different
-                * VDD to drive at that speed.
-                */
-               sil_rev = readl(&cdev->deviceid) >> 28;
-               mpu_vdd = am335x_get_tps65910_mpu_vdd(sil_rev,
-                                                     dpll_mpu_opp100.m);
+void scale_vcores_generic(int freq)
+{
+       int sil_rev, mpu_vdd;
 
-               /* Tell the TPS65910 to use i2c */
-               tps65910_set_i2c_control();
+       /*
+        * The GP EVM, IDK and EVM SK use a TPS65910 PMIC.  For all
+        * MPU frequencies we support we use a CORE voltage of
+        * 1.10V.  For MPU voltage we need to switch based on
+        * the frequency we are running at.
+        */
+       if (i2c_probe(TPS65910_CTRL_I2C_ADDR))
+               return;
 
-               /* First update MPU voltage. */
-               if (tps65910_voltage_update(MPU, mpu_vdd))
-                       return;
+       /*
+        * Depending on MPU clock and PG we will need a different
+        * VDD to drive at that speed.
+        */
+       sil_rev = readl(&cdev->deviceid) >> 28;
+       mpu_vdd = am335x_get_tps65910_mpu_vdd(sil_rev, freq);
 
-               /* Second, update the CORE voltage. */
-               if (tps65910_voltage_update(CORE, TPS65910_OP_REG_SEL_1_1_3))
-                       return;
+       /* Tell the TPS65910 to use i2c */
+       tps65910_set_i2c_control();
 
-               /* Set CORE Frequencies to OPP100 */
-               do_setup_dpll(&dpll_core_regs, &dpll_core_opp100);
-       }
+       /* First update MPU voltage. */
+       if (tps65910_voltage_update(MPU, mpu_vdd))
+               return;
+
+       /* Second, update the CORE voltage. */
+       if (tps65910_voltage_update(CORE, TPS65910_OP_REG_SEL_1_1_0))
+               return;
 
-       /* Set MPU Frequency to what we detected now that voltages are set */
-       do_setup_dpll(&dpll_mpu_regs, &dpll_mpu_opp100);
 }
 
-const struct dpll_params *get_dpll_ddr_params(void)
+void gpi2c_init(void)
 {
-       struct am335x_baseboard_id header;
+       /* When needed to be invoked prior to BSS initialization */
+       static bool first_time = true;
+
+       if (first_time) {
+               enable_i2c0_pin_mux();
+               i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED,
+                        CONFIG_SYS_OMAP24_I2C_SLAVE);
+               first_time = false;
+       }
+}
 
-       enable_i2c0_pin_mux();
-       i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
-       if (read_eeprom(&header) < 0)
-               puts("Could not get board ID.\n");
-
-       if (board_is_evm_sk(&header))
-               return &dpll_ddr_evm_sk;
-       else if (board_is_bone_lt(&header))
-               return &dpll_ddr_bone_black;
-       else if (board_is_evm_15_or_later(&header))
-               return &dpll_ddr_evm_sk;
+void scale_vcores(void)
+{
+       int freq;
+
+       gpi2c_init();
+       freq = am335x_get_efuse_mpu_max_freq(cdev);
+
+       if (board_is_beaglebonex())
+               scale_vcores_bone(freq);
        else
-               return &dpll_ddr;
+               scale_vcores_generic(freq);
 }
 
 void set_uart_mux_conf(void)
@@ -400,12 +488,7 @@ void set_uart_mux_conf(void)
 
 void set_mux_conf_regs(void)
 {
-       __maybe_unused struct am335x_baseboard_id header;
-
-       if (read_eeprom(&header) < 0)
-               puts("Could not get board ID.\n");
-
-       enable_board_pin_mux(&header);
+       enable_board_pin_mux();
 }
 
 const struct ctrl_ioregs ioregs_evmsk = {
@@ -442,12 +525,7 @@ const struct ctrl_ioregs ioregs = {
 
 void sdram_init(void)
 {
-       __maybe_unused struct am335x_baseboard_id header;
-
-       if (read_eeprom(&header) < 0)
-               puts("Could not get board ID.\n");
-
-       if (board_is_evm_sk(&header)) {
+       if (board_is_evm_sk()) {
                /*
                 * EVM SK 1.2A and later use gpio0_7 to enable DDR3.
                 * This is safe enough to do on older revs.
@@ -456,23 +534,79 @@ void sdram_init(void)
                gpio_direction_output(GPIO_DDR_VTT_EN, 1);
        }
 
-       if (board_is_evm_sk(&header))
+       if (board_is_icev2()) {
+               gpio_request(ICE_GPIO_DDR_VTT_EN, "ddr_vtt_en");
+               gpio_direction_output(ICE_GPIO_DDR_VTT_EN, 1);
+       }
+
+       if (board_is_evm_sk())
                config_ddr(303, &ioregs_evmsk, &ddr3_data,
                           &ddr3_cmd_ctrl_data, &ddr3_emif_reg_data, 0);
-       else if (board_is_bone_lt(&header))
+       else if (board_is_bone_lt())
                config_ddr(400, &ioregs_bonelt,
                           &ddr3_beagleblack_data,
                           &ddr3_beagleblack_cmd_ctrl_data,
                           &ddr3_beagleblack_emif_reg_data, 0);
-       else if (board_is_evm_15_or_later(&header))
+       else if (board_is_evm_15_or_later())
                config_ddr(303, &ioregs_evm15, &ddr3_evm_data,
                           &ddr3_evm_cmd_ctrl_data, &ddr3_evm_emif_reg_data, 0);
+       else if (board_is_icev2())
+               config_ddr(400, &ioregs_evmsk, &ddr3_icev2_data,
+                          &ddr3_icev2_cmd_ctrl_data, &ddr3_icev2_emif_reg_data,
+                          0);
+       else if (board_is_gp_evm())
+               config_ddr(266, &ioregs, &ddr2_data,
+                          &ddr2_cmd_ctrl_data, &ddr2_evm_emif_reg_data, 0);
        else
                config_ddr(266, &ioregs, &ddr2_data,
                           &ddr2_cmd_ctrl_data, &ddr2_emif_reg_data, 0);
 }
 #endif
 
+#if !defined(CONFIG_SPL_BUILD) || \
+       (defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))
+static void request_and_set_gpio(int gpio, char *name, int val)
+{
+       int ret;
+
+       ret = gpio_request(gpio, name);
+       if (ret < 0) {
+               printf("%s: Unable to request %s\n", __func__, name);
+               return;
+       }
+
+       ret = gpio_direction_output(gpio, 0);
+       if (ret < 0) {
+               printf("%s: Unable to set %s  as output\n", __func__, name);
+               goto err_free_gpio;
+       }
+
+       gpio_set_value(gpio, val);
+
+       return;
+
+err_free_gpio:
+       gpio_free(gpio);
+}
+
+#define REQUEST_AND_SET_GPIO(N)        request_and_set_gpio(N, #N, 1);
+#define REQUEST_AND_CLR_GPIO(N)        request_and_set_gpio(N, #N, 0);
+
+/**
+ * RMII mode on ICEv2 board needs 50MHz clock. Given the clock
+ * synthesizer With a capacitor of 18pF, and 25MHz input clock cycle
+ * PLL1 gives an output of 100MHz. So, configuring the div2/3 as 2 to
+ * give 50MHz output for Eth0 and 1.
+ */
+static struct clk_synth cdce913_data = {
+       .id = 0x81,
+       .capacitor = 0x90,
+       .mux = 0x6d,
+       .pdiv2 = 0x2,
+       .pdiv3 = 0x2,
+};
+#endif
+
 /*
  * Basic board specific setup.  Pinmux has been handled already.
  */
@@ -486,33 +620,159 @@ int board_init(void)
 #if defined(CONFIG_NOR) || defined(CONFIG_NAND)
        gpmc_init();
 #endif
+
+#if !defined(CONFIG_SPL_BUILD) || \
+       (defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))
+       if (board_is_icev2()) {
+               int rv;
+               u32 reg;
+
+               REQUEST_AND_SET_GPIO(GPIO_PR1_MII_CTRL);
+               /* Make J19 status available on GPIO1_26 */
+               REQUEST_AND_CLR_GPIO(GPIO_MUX_MII_CTRL);
+
+               REQUEST_AND_SET_GPIO(GPIO_FET_SWITCH_CTRL);
+               /*
+                * Both ports can be set as RMII-CPSW or MII-PRU-ETH using
+                * jumpers near the port. Read the jumper value and set
+                * the pinmux, external mux and PHY clock accordingly.
+                * As jumper line is overridden by PHY RX_DV pin immediately
+                * after bootstrap (power-up/reset), we need to sample
+                * it during PHY reset using GPIO rising edge detection.
+                */
+               REQUEST_AND_SET_GPIO(GPIO_PHY_RESET);
+               /* Enable rising edge IRQ on GPIO0_11 and GPIO 1_26 */
+               reg = readl(GPIO0_RISINGDETECT) | BIT(11);
+               writel(reg, GPIO0_RISINGDETECT);
+               reg = readl(GPIO1_RISINGDETECT) | BIT(26);
+               writel(reg, GPIO1_RISINGDETECT);
+               /* Reset PHYs to capture the Jumper setting */
+               gpio_set_value(GPIO_PHY_RESET, 0);
+               udelay(2);      /* PHY datasheet states 1uS min. */
+               gpio_set_value(GPIO_PHY_RESET, 1);
+
+               reg = readl(GPIO0_IRQSTATUSRAW) & BIT(11);
+               if (reg) {
+                       writel(reg, GPIO0_IRQSTATUS1); /* clear irq */
+                       /* RMII mode */
+                       printf("ETH0, CPSW\n");
+               } else {
+                       /* MII mode */
+                       printf("ETH0, PRU\n");
+                       cdce913_data.pdiv3 = 4; /* 25MHz PHY clk */
+               }
+
+               reg = readl(GPIO1_IRQSTATUSRAW) & BIT(26);
+               if (reg) {
+                       writel(reg, GPIO1_IRQSTATUS1); /* clear irq */
+                       /* RMII mode */
+                       printf("ETH1, CPSW\n");
+                       gpio_set_value(GPIO_MUX_MII_CTRL, 1);
+               } else {
+                       /* MII mode */
+                       printf("ETH1, PRU\n");
+                       cdce913_data.pdiv2 = 4; /* 25MHz PHY clk */
+               }
+
+               /* disable rising edge IRQs */
+               reg = readl(GPIO0_RISINGDETECT) & ~BIT(11);
+               writel(reg, GPIO0_RISINGDETECT);
+               reg = readl(GPIO1_RISINGDETECT) & ~BIT(26);
+               writel(reg, GPIO1_RISINGDETECT);
+
+               rv = setup_clock_synthesizer(&cdce913_data);
+               if (rv) {
+                       printf("Clock synthesizer setup failed %d\n", rv);
+                       return rv;
+               }
+
+               /* reset PHYs */
+               gpio_set_value(GPIO_PHY_RESET, 0);
+               udelay(2);      /* PHY datasheet states 1uS min. */
+               gpio_set_value(GPIO_PHY_RESET, 1);
+       }
+#endif
+
        return 0;
 }
 
 #ifdef CONFIG_BOARD_LATE_INIT
 int board_late_init(void)
 {
+#if !defined(CONFIG_SPL_BUILD)
+       uint8_t mac_addr[6];
+       uint32_t mac_hi, mac_lo;
+#endif
+
 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-       char safe_string[HDR_NAME_LEN + 1];
-       struct am335x_baseboard_id header;
+       char *name = NULL;
 
-       if (read_eeprom(&header) < 0)
-               puts("Could not get board ID.\n");
+       if (board_is_bone_lt()) {
+               /* BeagleBoard.org BeagleBone Black Wireless: */
+               if (!strncmp(board_ti_get_rev(), "BWA", 3)) {
+                       name = "BBBW";
+               }
+               /* SeeedStudio BeagleBone Green Wireless */
+               if (!strncmp(board_ti_get_rev(), "GW1", 3)) {
+                       name = "BBGW";
+               }
+               /* BeagleBoard.org BeagleBone Blue */
+               if (!strncmp(board_ti_get_rev(), "BLA", 3)) {
+                       name = "BBBL";
+               }
+       }
 
-       /* Now set variables based on the header. */
-       strncpy(safe_string, (char *)header.name, sizeof(header.name));
-       safe_string[sizeof(header.name)] = 0;
-       setenv("board_name", safe_string);
+       if (board_is_bbg1())
+               name = "BBG1";
+       set_board_info_env(name);
 
-       strncpy(safe_string, (char *)header.version, sizeof(header.version));
-       safe_string[sizeof(header.version)] = 0;
-       setenv("board_rev", safe_string);
+       /*
+        * Default FIT boot on HS devices. Non FIT images are not allowed
+        * on HS devices.
+        */
+       if (get_device_type() == HS_DEVICE)
+               env_set("boot_fit", "1");
+#endif
+
+#if !defined(CONFIG_SPL_BUILD)
+       /* try reading mac address from efuse */
+       mac_lo = readl(&cdev->macid0l);
+       mac_hi = readl(&cdev->macid0h);
+       mac_addr[0] = mac_hi & 0xFF;
+       mac_addr[1] = (mac_hi & 0xFF00) >> 8;
+       mac_addr[2] = (mac_hi & 0xFF0000) >> 16;
+       mac_addr[3] = (mac_hi & 0xFF000000) >> 24;
+       mac_addr[4] = mac_lo & 0xFF;
+       mac_addr[5] = (mac_lo & 0xFF00) >> 8;
+
+       if (!getenv("ethaddr")) {
+               printf("<ethaddr> not set. Validating first E-fuse MAC\n");
+
+               if (is_valid_ethaddr(mac_addr))
+                       eth_setenv_enetaddr("ethaddr", mac_addr);
+       }
+
+       mac_lo = readl(&cdev->macid1l);
+       mac_hi = readl(&cdev->macid1h);
+       mac_addr[0] = mac_hi & 0xFF;
+       mac_addr[1] = (mac_hi & 0xFF00) >> 8;
+       mac_addr[2] = (mac_hi & 0xFF0000) >> 16;
+       mac_addr[3] = (mac_hi & 0xFF000000) >> 24;
+       mac_addr[4] = mac_lo & 0xFF;
+       mac_addr[5] = (mac_lo & 0xFF00) >> 8;
+
+       if (!getenv("eth1addr")) {
+               if (is_valid_ethaddr(mac_addr))
+                       eth_setenv_enetaddr("eth1addr", mac_addr);
+       }
 #endif
 
        return 0;
 }
 #endif
 
+#ifndef CONFIG_DM_ETH
+
 #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
        (defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))
 static void cpsw_control(int enabled)
@@ -555,6 +815,12 @@ static struct cpsw_platform_data cpsw_data = {
 };
 #endif
 
+#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) &&\
+       defined(CONFIG_SPL_BUILD)) || \
+       ((defined(CONFIG_DRIVER_TI_CPSW) || \
+         defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET)) && \
+        !defined(CONFIG_SPL_BUILD))
+
 /*
  * This function will:
  * Read the eFuse for MAC addresses, and set ethaddr/eth1addr/usbnet_devaddr
@@ -566,19 +832,18 @@ static struct cpsw_platform_data cpsw_data = {
  * Build in only these cases to avoid warnings about unused variables
  * when we build an SPL that has neither option but full U-Boot will.
  */
-#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) \
-               && defined(CONFIG_SPL_BUILD)) || \
-       ((defined(CONFIG_DRIVER_TI_CPSW) || \
-         defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET)) && \
-        !defined(CONFIG_SPL_BUILD))
 int board_eth_init(bd_t *bis)
 {
        int rv, n = 0;
+#if defined(CONFIG_USB_ETHER) && \
+       (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USBETH_SUPPORT))
        uint8_t mac_addr[6];
        uint32_t mac_hi, mac_lo;
-       __maybe_unused struct am335x_baseboard_id header;
 
-       /* try reading mac address from efuse */
+       /*
+        * use efuse mac address for USB ethernet as we know that
+        * both CPSW and USB ethernet will never be active at the same time
+        */
        mac_lo = readl(&cdev->macid0l);
        mac_hi = readl(&cdev->macid0h);
        mac_addr[0] = mac_hi & 0xFF;
@@ -587,40 +852,24 @@ int board_eth_init(bd_t *bis)
        mac_addr[3] = (mac_hi & 0xFF000000) >> 24;
        mac_addr[4] = mac_lo & 0xFF;
        mac_addr[5] = (mac_lo & 0xFF00) >> 8;
+#endif
+
 
 #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
        (defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))
-       if (!getenv("ethaddr")) {
-               printf("<ethaddr> not set. Validating first E-fuse MAC\n");
-
-               if (is_valid_ethaddr(mac_addr))
-                       eth_setenv_enetaddr("ethaddr", mac_addr);
-       }
 
 #ifdef CONFIG_DRIVER_TI_CPSW
-
-       mac_lo = readl(&cdev->macid1l);
-       mac_hi = readl(&cdev->macid1h);
-       mac_addr[0] = mac_hi & 0xFF;
-       mac_addr[1] = (mac_hi & 0xFF00) >> 8;
-       mac_addr[2] = (mac_hi & 0xFF0000) >> 16;
-       mac_addr[3] = (mac_hi & 0xFF000000) >> 24;
-       mac_addr[4] = mac_lo & 0xFF;
-       mac_addr[5] = (mac_lo & 0xFF00) >> 8;
-
-       if (!getenv("eth1addr")) {
-               if (is_valid_ethaddr(mac_addr))
-                       eth_setenv_enetaddr("eth1addr", mac_addr);
-       }
-
-       if (read_eeprom(&header) < 0)
-               puts("Could not get board ID.\n");
-
-       if (board_is_bone(&header) || board_is_bone_lt(&header) ||
-           board_is_idk(&header)) {
+       if (board_is_bone() || board_is_bone_lt() ||
+           board_is_idk()) {
                writel(MII_MODE_ENABLE, &cdev->miisel);
                cpsw_slaves[0].phy_if = cpsw_slaves[1].phy_if =
                                PHY_INTERFACE_MODE_MII;
+       } else if (board_is_icev2()) {
+               writel(RMII_MODE_ENABLE | RMII_CHIPCKL_ENABLE, &cdev->miisel);
+               cpsw_slaves[0].phy_if = PHY_INTERFACE_MODE_RMII;
+               cpsw_slaves[1].phy_if = PHY_INTERFACE_MODE_RMII;
+               cpsw_slaves[0].phy_addr = 1;
+               cpsw_slaves[1].phy_addr = 3;
        } else {
                writel((RGMII_MODE_ENABLE | RGMII_INT_DELAY), &cdev->miisel);
                cpsw_slaves[0].phy_if = cpsw_slaves[1].phy_if =
@@ -646,7 +895,7 @@ int board_eth_init(bd_t *bis)
 #define AR8051_DEBUG_RGMII_CLK_DLY_REG 0x5
 #define AR8051_RGMII_TX_CLK_DLY                0x100
 
-       if (board_is_evm_sk(&header) || board_is_gp_evm(&header)) {
+       if (board_is_evm_sk() || board_is_gp_evm()) {
                const char *devname;
                devname = miiphy_get_current_dev();
 
@@ -670,3 +919,62 @@ int board_eth_init(bd_t *bis)
        return n;
 }
 #endif
+
+#endif /* CONFIG_DM_ETH */
+
+#ifdef CONFIG_SPL_LOAD_FIT
+int board_fit_config_name_match(const char *name)
+{
+       if (board_is_gp_evm() && !strcmp(name, "am335x-evm"))
+               return 0;
+       else if (board_is_bone() && !strcmp(name, "am335x-bone"))
+               return 0;
+       else if (board_is_bone_lt() && !strcmp(name, "am335x-boneblack"))
+               return 0;
+       else if (board_is_evm_sk() && !strcmp(name, "am335x-evmsk"))
+               return 0;
+       else if (board_is_bbg1() && !strcmp(name, "am335x-bonegreen"))
+               return 0;
+       else if (board_is_icev2() && !strcmp(name, "am335x-icev2"))
+               return 0;
+       else
+               return -1;
+}
+#endif
+
+#ifdef CONFIG_TI_SECURE_DEVICE
+void board_fit_image_post_process(void **p_image, size_t *p_size)
+{
+       secure_boot_verify_image(p_image, p_size);
+}
+#endif
+
+#if !CONFIG_IS_ENABLED(OF_CONTROL)
+static const struct omap_hsmmc_plat am335x_mmc0_platdata = {
+       .base_addr = (struct hsmmc *)OMAP_HSMMC1_BASE,
+       .cfg.host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_4BIT,
+       .cfg.f_min = 400000,
+       .cfg.f_max = 52000000,
+       .cfg.voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195,
+       .cfg.b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT,
+};
+
+U_BOOT_DEVICE(am335x_mmc0) = {
+       .name = "omap_hsmmc",
+       .platdata = &am335x_mmc0_platdata,
+};
+
+static const struct omap_hsmmc_plat am335x_mmc1_platdata = {
+       .base_addr = (struct hsmmc *)OMAP_HSMMC2_BASE,
+       .cfg.host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_8BIT,
+       .cfg.f_min = 400000,
+       .cfg.f_max = 52000000,
+       .cfg.voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195,
+       .cfg.b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT,
+};
+
+U_BOOT_DEVICE(am335x_mmc1) = {
+       .name = "omap_hsmmc",
+       .platdata = &am335x_mmc1_platdata,
+};
+#endif