Merge branch 'master' of git://git.denx.de/u-boot-mmc

- Add #undef CONFIG_DM_MMC_OPS to omap3_logic in the SPL build case, to
  match other TI platforms in the same situation.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --combined board/compulab/cm_t54/cm_t54.c
index 757af9f,456ff24..6437718
--- 1/board/compulab/cm_t54/cm_t54.c
--- 2/board/compulab/cm_t54/cm_t54.c
+++ b/board/compulab/cm_t54/cm_t54.c
@@@ -96,7 -96,7 +96,7 @@@ uint mmc_get_env_part(struct mmc *mmc
  }
  #endif
  
- #if defined(CONFIG_GENERIC_MMC)
+ #if defined(CONFIG_MMC)
  #define SB_T54_CD_GPIO 228
  #define SB_T54_WP_GPIO 229
  
@@@ -181,7 -181,7 +181,7 @@@ int board_eth_init(bd_t *bis
  }
  #endif
  
 -#ifdef CONFIG_USB_EHCI
 +#ifdef CONFIG_USB_EHCI_HCD
  static struct omap_usbhs_board_data usbhs_bdata = {
        .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED,
        .port_mode[1] = OMAP_EHCI_PORT_MODE_HSIC,

diff --combined board/gumstix/duovero/duovero.c
index 09b0c53,ea32f4a..fefcde8
--- 1/board/gumstix/duovero/duovero.c
--- 2/board/gumstix/duovero/duovero.c
+++ b/board/gumstix/duovero/duovero.c
@@@ -24,7 -24,7 +24,7 @@@
  static void setup_net_chip(void);
  #endif
  
 -#ifdef CONFIG_USB_EHCI
 +#ifdef CONFIG_USB_EHCI_HCD
  #include <usb.h>
  #include <asm/arch/ehci.h>
  #include <asm/ehci-omap.h>
@@@ -110,7 -110,7 +110,7 @@@ void set_muxconf_regs(void
                   sizeof(struct pad_conf_entry));
  }
  
- #if defined(CONFIG_GENERIC_MMC)
+ #if defined(CONFIG_MMC)
  int board_mmc_init(bd_t *bis)
  {
        return omap_mmc_init(0, 0, 0, -1, -1);
@@@ -206,7 -206,7 +206,7 @@@ int board_eth_init(bd_t *bis
        return rc;
  }
  
 -#ifdef CONFIG_USB_EHCI
 +#ifdef CONFIG_USB_EHCI_HCD
  
  static struct omap_usbhs_board_data usbhs_bdata = {
        .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,

diff --combined board/overo/overo.c
index fd441d4,f1a3d73..adf33cf
--- 1/board/overo/overo.c
--- 2/board/overo/overo.c
+++ b/board/overo/overo.c
@@@ -27,7 -27,7 +27,7 @@@
  #include <asm/mach-types.h>
  #include "overo.h"
  
 -#ifdef CONFIG_USB_EHCI
 +#ifdef CONFIG_USB_EHCI_HCD
  #include <usb.h>
  #include <asm/ehci-omap.h>
  #endif
@@@ -379,21 -379,21 +379,21 @@@ int board_eth_init(bd_t *bis
  }
  #endif
  
- #if defined(CONFIG_GENERIC_MMC)
+ #if defined(CONFIG_MMC)
  int board_mmc_init(bd_t *bis)
  {
        return omap_mmc_init(0, 0, 0, -1, -1);
  }
  #endif
  
- #if defined(CONFIG_GENERIC_MMC)
+ #if defined(CONFIG_MMC)
  void board_mmc_power_init(void)
  {
        twl4030_power_mmc_init(0);
  }
  #endif
  
 -#if defined(CONFIG_USB_EHCI)
 +#if defined(CONFIG_USB_EHCI_HCD)
  static struct omap_usbhs_board_data usbhs_bdata = {
        .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED,
        .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,
@@@ -420,4 -420,4 +420,4 @@@ int ehci_hcd_stop(void
        return omap_ehci_hcd_stop();
  }
  
 -#endif /* CONFIG_USB_EHCI */
 +#endif /* CONFIG_USB_EHCI_HCD */

diff --combined board/quipos/cairo/cairo.c
index 5e2f486,5fce45e..6cf5409
--- 1/board/quipos/cairo/cairo.c
--- 2/board/quipos/cairo/cairo.c
+++ b/board/quipos/cairo/cairo.c
@@@ -26,6 -26,18 +26,6 @@@
  DECLARE_GLOBAL_DATA_PTR;
  
  /*
 - * MUSB port on OMAP3EVM Rev >= E requires extvbus programming.
 - */
 -u8 omap3_evm_need_extvbus(void)
 -{
 -      u8 retval = 0;
 -
 -      /* TODO: verify if cairo handheld platform needs extvbus programming */
 -
 -      return retval;
 -}
 -
 -/*
   * Routine: board_init
   * Description: Early hardware init.
   */
@@@ -50,7 -62,7 +50,7 @@@ void set_muxconf_regs(void
        MUX_CAIRO();
  }
  
- #if defined(CONFIG_GENERIC_MMC)
+ #if defined(CONFIG_MMC)
  int board_mmc_init(bd_t *bis)
  {
        return omap_mmc_init(0, 0, 0, -1, -1);

diff --combined board/technexion/tao3530/tao3530.c
index 4b61973,21944c7..c5966e3
--- 1/board/technexion/tao3530/tao3530.c
--- 2/board/technexion/tao3530/tao3530.c
+++ b/board/technexion/tao3530/tao3530.c
@@@ -179,7 -179,7 +179,7 @@@ void set_muxconf_regs(void
  #endif
  }
  
- #if defined(CONFIG_GENERIC_MMC)
+ #if defined(CONFIG_MMC)
  int board_mmc_init(bd_t *bis)
  {
        omap_mmc_init(0, 0, 0, -1, -1);
@@@ -188,14 -188,14 +188,14 @@@
  }
  #endif
  
- #if defined(CONFIG_GENERIC_MMC)
+ #if defined(CONFIG_MMC)
  void board_mmc_power_init(void)
  {
        twl4030_power_mmc_init(0);
  }
  #endif
  
 -#if defined(CONFIG_USB_EHCI) && !defined(CONFIG_SPL_BUILD)
 +#if defined(CONFIG_USB_EHCI_HCD) && !defined(CONFIG_SPL_BUILD)
  /* Call usb_stop() before starting the kernel */
  void show_boot_progress(int val)
  {
@@@ -219,4 -219,4 +219,4 @@@ int ehci_hcd_stop(int index
  {
        return omap_ehci_hcd_stop();
  }
 -#endif /* CONFIG_USB_EHCI */
 +#endif /* CONFIG_USB_EHCI_HCD */

diff --combined board/ti/beagle/beagle.c
index c1365e2,dc38a80..00d127e
--- 1/board/ti/beagle/beagle.c
--- 2/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@@ -36,7 -36,7 +36,7 @@@
  #include "beagle.h"
  #include <command.h>
  
 -#ifdef CONFIG_USB_EHCI
 +#ifdef CONFIG_USB_EHCI_HCD
  #include <usb.h>
  #include <asm/ehci-omap.h>
  #endif
@@@ -524,21 -524,21 +524,21 @@@ void set_muxconf_regs(void
        MUX_BEAGLE();
  }
  
- #if defined(CONFIG_GENERIC_MMC)
+ #if defined(CONFIG_MMC)
  int board_mmc_init(bd_t *bis)
  {
        return omap_mmc_init(0, 0, 0, -1, -1);
  }
  #endif
  
- #if defined(CONFIG_GENERIC_MMC)
+ #if defined(CONFIG_MMC)
  void board_mmc_power_init(void)
  {
        twl4030_power_mmc_init(0);
  }
  #endif
  
 -#if defined(CONFIG_USB_EHCI) && !defined(CONFIG_SPL_BUILD)
 +#if defined(CONFIG_USB_EHCI_HCD) && !defined(CONFIG_SPL_BUILD)
  /* Call usb_stop() before starting the kernel */
  void show_boot_progress(int val)
  {
@@@ -563,7 -563,7 +563,7 @@@ int ehci_hcd_stop(int index
        return omap_ehci_hcd_stop();
  }
  
 -#endif /* CONFIG_USB_EHCI */
 +#endif /* CONFIG_USB_EHCI_HCD */
  
  #if defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)
  int board_eth_init(bd_t *bis)

diff --combined board/ti/omap5_uevm/evm.c
index 7eaffe3,447f82c..b6cc417
--- 1/board/ti/omap5_uevm/evm.c
--- 2/board/ti/omap5_uevm/evm.c
+++ b/board/ti/omap5_uevm/evm.c
@@@ -20,7 -20,7 +20,7 @@@
  
  #include "mux_data.h"
  
 -#if defined(CONFIG_USB_EHCI) || defined(CONFIG_USB_XHCI_OMAP)
 +#if defined(CONFIG_USB_EHCI_HCD) || defined(CONFIG_USB_XHCI_OMAP)
  #include <sata.h>
  #include <usb.h>
  #include <asm/gpio.h>
@@@ -151,7 -151,7 +151,7 @@@ int board_eth_init(bd_t *bis
        return 0;
  }
  
 -#if defined(CONFIG_USB_EHCI) || defined(CONFIG_USB_XHCI_OMAP)
 +#if defined(CONFIG_USB_EHCI_HCD) || defined(CONFIG_USB_XHCI_OMAP)
  static void enable_host_clocks(void)
  {
        int auxclk;
@@@ -211,7 -211,7 +211,7 @@@ void set_muxconf_regs(void
                   sizeof(struct pad_conf_entry));
  }
  
- #if defined(CONFIG_GENERIC_MMC)
+ #if defined(CONFIG_MMC)
  int board_mmc_init(bd_t *bis)
  {
        omap_mmc_init(0, 0, 0, -1, -1);
@@@ -220,7 -220,7 +220,7 @@@
  }
  #endif
  
 -#ifdef CONFIG_USB_EHCI
 +#ifdef CONFIG_USB_EHCI_HCD
  static struct omap_usbhs_board_data usbhs_bdata = {
        .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED,
        .port_mode[1] = OMAP_EHCI_PORT_MODE_HSIC,

diff --combined board/ti/panda/panda.c
index 5822366,4db8f82..72aabb2
--- 1/board/ti/panda/panda.c
--- 2/board/ti/panda/panda.c
+++ b/board/ti/panda/panda.c
@@@ -15,7 -15,7 +15,7 @@@
  
  #include "panda_mux_data.h"
  
 -#ifdef CONFIG_USB_EHCI
 +#ifdef CONFIG_USB_EHCI_HCD
  #include <usb.h>
  #include <asm/arch/ehci.h>
  #include <asm/ehci-omap.h>
@@@ -287,7 -287,7 +287,7 @@@ void set_muxconf_regs(void
                           sizeof(struct pad_conf_entry));
  }
  
- #if defined(CONFIG_GENERIC_MMC)
+ #if defined(CONFIG_MMC)
  int board_mmc_init(bd_t *bis)
  {
        return omap_mmc_init(0, 0, 0, -1, -1);
@@@ -301,7 -301,7 +301,7 @@@ void board_mmc_power_init(void
  #endif
  #endif
  
 -#ifdef CONFIG_USB_EHCI
 +#ifdef CONFIG_USB_EHCI_HCD
  
  static struct omap_usbhs_board_data usbhs_bdata = {
        .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,

diff --combined common/board_r.c
index dba2102,9f34b85..28f32c3
--- 1/common/board_r.c
--- 2/common/board_r.c
+++ b/common/board_r.c
@@@ -432,7 -432,7 +432,7 @@@ static int initr_onenand(void
  }
  #endif
  
- #ifdef CONFIG_GENERIC_MMC
+ #ifdef CONFIG_MMC
  static int initr_mmc(void)
  {
        puts("MMC:   ");
@@@ -485,7 -485,24 +485,7 @@@ static int initr_env(void
  
        /* Initialize from environment */
        load_addr = getenv_ulong("loadaddr", 16, load_addr);
 -#if defined(CONFIG_SYS_EXTBDINFO)
 -#if defined(CONFIG_405GP) || defined(CONFIG_405EP)
 -#if defined(CONFIG_I2CFAST)
 -      /*
 -       * set bi_iic_fast for linux taking environment variable
 -       * "i2cfast" into account
 -       */
 -      {
 -              char *s = getenv("i2cfast");
  
 -              if (s && ((*s == 'y') || (*s == 'Y'))) {
 -                      gd->bd->bi_iic_fast[0] = 1;
 -                      gd->bd->bi_iic_fast[1] = 1;
 -              }
 -      }
 -#endif /* CONFIG_I2CFAST */
 -#endif /* CONFIG_405GP, CONFIG_405EP */
 -#endif /* CONFIG_SYS_EXTBDINFO */
        return 0;
  }
  
@@@ -798,7 -815,7 +798,7 @@@ static init_fnc_t init_sequence_r[] = 
  #ifdef CONFIG_CMD_ONENAND
        initr_onenand,
  #endif
- #ifdef CONFIG_GENERIC_MMC
+ #ifdef CONFIG_MMC
        initr_mmc,
  #endif
  #ifdef CONFIG_HAS_DATAFLASH

diff --combined common/spl/Kconfig
index e324e24,e82a879..5ed3f19
--- 1/common/spl/Kconfig
--- 2/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@@ -374,7 -374,7 +374,7 @@@ config SPL_LIBGENERIC_SUPPOR
  
  config SPL_MMC_SUPPORT
        bool "Support MMC"
-       depends on SPL && GENERIC_MMC
+       depends on SPL && MMC
        help
          Enable support for MMC (Multimedia Card) within SPL. This enables
          the MMC protocol implementation and allows any enabled drivers to
@@@ -693,20 -693,6 +693,20 @@@ config SPL_YMODEM_SUPPOR
          means of transmitting U-Boot over a serial line for using in SPL,
          with a checksum to ensure correctness.
  
 +config SPL_ATF_SUPPORT
 +      bool "Support ARM Trusted Firmware"
 +      depends on SPL && ARM64
 +      help
 +        ATF(ARM Trusted Firmware) is a component for ARM arch64 which which
 +        is loaded by SPL(which is considered as BL2 in ATF terminology).
 +        More detail at: https://github.com/ARM-software/arm-trusted-firmware
 +
 +config SPL_ATF_TEXT_BASE
 +      depends on SPL_ATF_SUPPORT
 +      hex "ATF BL31 base address"
 +      help
 +        This is the base address in memory for ATF BL31 text and entry point.
 +
  config TPL_ENV_SUPPORT
        bool "Support an environment"
        depends on TPL
@@@ -743,7 -729,7 +743,7 @@@ config TPL_MPC8XXX_INIT_DDR_SUPPOR
  
  config TPL_MMC_SUPPORT
        bool "Support MMC"
-       depends on TPL
+       depends on TPL && MMC
        help
          Enable support for MMC within TPL. See SPL_MMC_SUPPORT for details.
  

diff --combined include/configs/omap3_logic.h
index 735c9ef,772fc60..f897803
--- 1/include/configs/omap3_logic.h
--- 2/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@@ -23,6 -23,6 +23,7 @@@
   * DM support in SPL
   */
  #undef CONFIG_DM_MMC
++#undef CONFIG_DM_MMC_OPS
  #undef OMAP_HSMMC_USE_GPIO
  
  /* select serial console configuration for SPL */
@@@ -49,6 -49,10 +50,6 @@@
  
  /* Hardware drivers */
  
 -/* GPIO banks */
 -#define CONFIG_OMAP3_GPIO_4           /* GPIO 96..128 is in GPIO bank 4 */
 -#define CONFIG_OMAP3_GPIO_6           /* GPIO160..191 is in GPIO bank 6 */
 -
  #define CONFIG_USB_OMAP3
  
  /* commands to include */