Merge branch 'p-ti-u-boot-2016.05' of git://git.omapzoom.org/repo/u-boot into p-ti-u-boot-2016.05

* 'p-ti-u-boot-2016.05' of git://git.omapzoom.org/repo/u-boot: (26 commits)
  fastboot: qspi: fix for dual stage qspi u-boot failure
  drivers: mmc: omap_hsmmc: update phase delay value per latest TRM
  drivers: block: Fixed capacity message
  regulator: fixed: Add support to handle enable-active-high DT property
  mmc: disable the mmc clock during power off
  mmc: Enable mmc clock before sending init stream
  ti_armv7_common: env: Add NFS loading support for PMMC and MON
  defconfigs: am57xx_hs_evm: Add default OPTEE load address
  defconfigs: dra7xx_hs_evm: Add default OPTEE load address
  TI: Rework SRAM definitions and maximums
  spl: usb: dfu: adding configuration for non-FIT image
  TI: Rework SRAM definitions and maximums for dra7xx platform
  omap3: Fix SPI registers on am33xx and am43xx
  dra7: config: enable dynamic dt loading
  Revert "power: regulator: pbias: Add pbias regulator support"
  Revert "ARM: dts: dra7xx: Fix broken pbias device creation"
  Revert "mmc: power off the IO regulator during power cycle"
  Revert "drivers: mmc: omap_hsmmc: use regulator APIs to program pbias"
  Revert "configs: enable misc and pbias options on configs for dra7 based boards"
  Revert "mmc: disable the mmc clock during power off"
  ...

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

40 files changed, 135 insertions, 79 deletions

diff --git a/arch/arm/include/asm/arch-am33xx/omap.h b/arch/arm/include/asm/arch-am33xx/omap.h
index 47962dadf5..3293caaca4 100644
--- a/arch/arm/include/asm/arch-am33xx/omap.h
+++ b/arch/arm/include/asm/arch-am33xx/omap.h
@@ -15,24 +15,23 @@
 #ifndef _OMAP_H_
 #define _OMAP_H_
 
+#include <linux/sizes.h>
+
 #ifdef CONFIG_AM33XX
 #define NON_SECURE_SRAM_START   0x402F0400
 #define NON_SECURE_SRAM_END     0x40310000
-#define SRAM_SCRATCH_SPACE_ADDR 0x4030B800
+#define NON_SECURE_SRAM_IMG_END 0x4030B800
 #elif defined(CONFIG_TI81XX)
 #define NON_SECURE_SRAM_START   0x40300000
 #define NON_SECURE_SRAM_END     0x40320000
-#define SRAM_SCRATCH_SPACE_ADDR 0x4031B800
+#define NON_SECURE_SRAM_IMG_END 0x4031B800
 #elif defined(CONFIG_AM43XX)
 #define NON_SECURE_SRAM_START   0x402F0400
 #define NON_SECURE_SRAM_END     0x40340000
-#define SRAM_SCRATCH_SPACE_ADDR 0x40337C00
-#define AM4372_BOARD_NAME_START SRAM_SCRATCH_SPACE_ADDR
-#define AM4372_BOARD_NAME_END   SRAM_SCRATCH_SPACE_ADDR + 0xC
-#define AM4372_BOARD_VERSION_START      SRAM_SCRATCH_SPACE_ADDR + 0xD
-#define AM4372_BOARD_VERSION_END        SRAM_SCRATCH_SPACE_ADDR + 0x14
+#define NON_SECURE_SRAM_IMG_END 0x40337DE0
 #define QSPI_BASE              0x47900000
 #endif
+#define SRAM_SCRATCH_SPACE_ADDR (NON_SECURE_SRAM_IMG_END - SZ_1K)
 
 /* Boot parameters */
 #ifndef __ASSEMBLY__
diff --git a/arch/arm/include/asm/arch-omap3/omap.h b/arch/arm/include/asm/arch-omap3/omap.h
index 116d863667..417ff895f1 100644
--- a/arch/arm/include/asm/arch-omap3/omap.h
+++ b/arch/arm/include/asm/arch-omap3/omap.h
@@ -10,6 +10,8 @@
 #ifndef _OMAP3_H_
 #define _OMAP3_H_
 
+#include <linux/sizes.h>
+
 /* Stuff on L3 Interconnect */
 #define SMX_APE_BASE                    0x68000000
 
@@ -145,7 +147,8 @@ struct gpio {
 
 #define NON_SECURE_SRAM_START           0x40208000 /* Works for GP & EMU */
 #define NON_SECURE_SRAM_END             0x40210000
-#define SRAM_SCRATCH_SPACE_ADDR         0x4020EC00
+#define NON_SECURE_SRAM_IMG_END         0x4020F000
+#define SRAM_SCRATCH_SPACE_ADDR         (NON_SECURE_SRAM_IMG_END - SZ_1K)
 
 #define LOW_LEVEL_SRAM_STACK            0x4020FFFC
 
diff --git a/arch/arm/include/asm/arch-omap4/omap.h b/arch/arm/include/asm/arch-omap4/omap.h
index 5ccda6ee94..b86a776840 100644
--- a/arch/arm/include/asm/arch-omap4/omap.h
+++ b/arch/arm/include/asm/arch-omap4/omap.h
@@ -19,6 +19,8 @@
 #include <asm/types.h>
 #endif /* !(__KERNEL_STRICT_NAMES || __ASSEMBLY__) */
 
+#include <linux/sizes.h>
+
 /*
  * L4 Peripherals - L4 Wakeup and L4 Core now
  */
@@ -109,7 +111,8 @@ struct s32ktimer {
  */
 #define NON_SECURE_SRAM_START   0x40304000
 #define NON_SECURE_SRAM_END     0x4030E000      /* Not inclusive */
-#define SRAM_SCRATCH_SPACE_ADDR 0x4030C000
+#define NON_SECURE_SRAM_IMG_END 0x4030C000
+#define SRAM_SCRATCH_SPACE_ADDR (NON_SECURE_SRAM_IMG_END - SZ_1K)
 /* base address for indirect vectors (internal boot mode) */
 #define SRAM_ROM_VECT_BASE      0x4030D000
 
diff --git a/arch/arm/include/asm/arch-omap5/omap.h b/arch/arm/include/asm/arch-omap5/omap.h
index 3b98f6abc1..b5e5519fbd 100644
--- a/arch/arm/include/asm/arch-omap5/omap.h
+++ b/arch/arm/include/asm/arch-omap5/omap.h
@@ -16,6 +16,8 @@
 #include <asm/types.h>
 #endif /* !(__KERNEL_STRICT_NAMES || __ASSEMBLY__) */
 
+#include <linux/sizes.h>
+
 /*
  * L4 Peripherals - L4 Wakeup and L4 Core now
  */
@@ -186,11 +188,13 @@ struct s32ktimer {
 #if defined(CONFIG_DRA7XX)
 #define NON_SECURE_SRAM_START   0x40300000
 #define NON_SECURE_SRAM_END     0x40380000      /* Not inclusive */
+#define NON_SECURE_SRAM_IMG_END 0x4037E000
 #else
 #define NON_SECURE_SRAM_START   0x40300000
 #define NON_SECURE_SRAM_END     0x40320000      /* Not inclusive */
+#define NON_SECURE_SRAM_IMG_END 0x4031E000
 #endif
-#define SRAM_SCRATCH_SPACE_ADDR 0x4031E000
+#define SRAM_SCRATCH_SPACE_ADDR (NON_SECURE_SRAM_IMG_END - SZ_1K)
 
 /* base address for indirect vectors (internal boot mode) */
 #define SRAM_ROM_VECT_BASE      0x4031F000
diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig
index 8376f30da6..d9a8e51dff 100644
--- a/configs/am57xx_hs_evm_defconfig
+++ b/configs/am57xx_hs_evm_defconfig
@@ -2,8 +2,9 @@ CONFIG_ARM=y
 CONFIG_OMAP54XX=y
 CONFIG_TI_SECURE_DEVICE=y
 CONFIG_TARGET_AM57XX_EVM=y
-CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x01700000
-CONFIG_TI_SECURE_EMIF_PROTECTED_REGION_SIZE=0x01300000
+CONFIG_TI_SECURE_EMIF_REGION_START=0xbe000000
+CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
+CONFIG_TI_SECURE_EMIF_PROTECTED_REGION_SIZE=0x01c00000
 CONFIG_DM_SERIAL=y
 CONFIG_DM_GPIO=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig
index 28f0339790..827b0f5970 100644
--- a/configs/dra7xx_evm_defconfig
+++ b/configs/dra7xx_evm_defconfig
@@ -53,6 +53,7 @@ CONFIG_DM_ETH=y
 CONFIG_DM_PMIC=y
 CONFIG_PMIC_PALMAS=y
 CONFIG_PMIC_LP873X=y
+CONFIG_SPL_LOAD_FIT=y
 CONFIG_DISK=y
 CONFIG_DWC_AHCI=y
 CONFIG_DM_MMC=y
diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig
index d5b8e30b3b..810ba1e3f5 100644
--- a/configs/dra7xx_hs_evm_defconfig
+++ b/configs/dra7xx_hs_evm_defconfig
@@ -2,8 +2,9 @@ CONFIG_ARM=y
 CONFIG_OMAP54XX=y
 CONFIG_TI_SECURE_DEVICE=y
 CONFIG_TARGET_DRA7XX_EVM=y
-CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x01700000
-CONFIG_TI_SECURE_EMIF_PROTECTED_REGION_SIZE=0x01300000
+CONFIG_TI_SECURE_EMIF_REGION_START=0xbe000000
+CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
+CONFIG_TI_SECURE_EMIF_PROTECTED_REGION_SIZE=0x01c00000
 CONFIG_DM_SERIAL=y
 CONFIG_DM_SPI=y
 CONFIG_DM_SPI_FLASH=y
diff --git a/disk/part.c b/disk/part.c
index 543cab8103..d93a643067 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -241,13 +241,13 @@ void dev_print (struct blk_desc *dev_desc)
                         printf ("            Supports 48-bit addressing\n");
 #endif
 #if defined(CONFIG_SYS_64BIT_LBA)
-                printf ("            Capacity: %ld.%ld MB = %ld.%ld GB (%Ld x %ld)\n",
+                printf ("            Capacity: %lu.%lu MB = %lu.%lu GB (%llu x %lu)\n",
                         mb_quot, mb_rem,
                         gb_quot, gb_rem,
                         lba,
                         dev_desc->blksz);
 #else
-                printf ("            Capacity: %ld.%ld MB = %ld.%ld GB (%ld x %ld)\n",
+                printf ("            Capacity: %lu.%lu MB = %lu.%lu GB (%lu x %lu)\n",
                         mb_quot, mb_rem,
                         gb_quot, gb_rem,
                         (ulong)lba,
diff --git a/doc/device-tree-bindings/regulator/fixed.txt b/doc/device-tree-bindings/regulator/fixed.txt
index 4ff39b8f51..ef010eace6 100644
--- a/doc/device-tree-bindings/regulator/fixed.txt
+++ b/doc/device-tree-bindings/regulator/fixed.txt
@@ -11,6 +11,9 @@ Required properties:
 Optional properties:
 - gpio: GPIO to use for enable control
 - regulator constraints (binding info: regulator.txt)
+- enable-active-high: Polarity of GPIO is Active high. If this property
+  is missing, the default assumed is Active low.
+
 
 Other kernel-style properties, are currently not used.
 
@@ -35,4 +38,5 @@ fixed_regulator@0 {
         regulator-max-microamp = <15000>;
         regulator-always-on;
         regulator-boot-on;
+        enable-active-high;
 };
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 1255abcf78..85e231b898 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -2049,14 +2049,15 @@ static void mmc_set_initial_state(struct mmc *mmc)
 
 static void mmc_power_up(struct mmc *mmc)
 {
-        mmc_set_vdd(mmc, true);
         mmc_set_initial_state(mmc);
+        mmc_set_vdd(mmc, true);
         udelay(10000);
 }
 
 static void mmc_power_off(struct mmc *mmc)
 {
         mmc_set_vdd(mmc, false);
+        mmc_set_clock(mmc, 1, true);
 }
 
 static void mmc_power_cycle(struct mmc *mmc)
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index e3c64bb05b..2849519a58 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -633,7 +633,7 @@ static int omap_hsmmc_execute_tuning(struct mmc *mmc, uint opcode)
                 goto tuning_error;
         }
 
-        phase_delay = max_window + 4 * (max_len >> 1);
+        phase_delay = max_window + 4 * ((3 * max_len) >> 2);
         omap_hsmmc_set_dll(mmc, phase_delay);
 
         mmc_reset_controller_fsm(mmc_base, SYSCTL_SRD);
diff --git a/drivers/power/regulator/fixed.c b/drivers/power/regulator/fixed.c
index d053817fc2..dbd532d89d 100644
--- a/drivers/power/regulator/fixed.c
+++ b/drivers/power/regulator/fixed.c
@@ -26,6 +26,8 @@ static int fixed_regulator_ofdata_to_platdata(struct udevice *dev)
         struct dm_regulator_uclass_platdata *uc_pdata;
         struct fixed_regulator_platdata *dev_pdata;
         struct gpio_desc *gpio;
+        const void *blob = gd->fdt_blob;
+        int node = dev->of_offset, flags = GPIOD_IS_OUT;
         int ret;
 
         dev_pdata = dev_get_platdata(dev);
@@ -36,9 +38,12 @@ static int fixed_regulator_ofdata_to_platdata(struct udevice *dev)
         /* Set type to fixed */
         uc_pdata->type = REGULATOR_TYPE_FIXED;
 
+        if (fdtdec_get_bool(blob, node, "enable-active-high"))
+                flags |= GPIOD_IS_OUT_ACTIVE;
+
         /* Get fixed regulator gpio desc */
         gpio = &dev_pdata->gpio;
-        ret = gpio_request_by_name(dev, "gpio", 0, gpio, GPIOD_IS_OUT);
+        ret = gpio_request_by_name(dev, "gpio", 0, gpio, flags);
         if (ret)
                 debug("Fixed regulator gpio - not found! Error: %d", ret);
 
diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c
index 2fe34c9a14..60e9d6e825 100644
--- a/drivers/spi/omap3_spi.c
+++ b/drivers/spi/omap3_spi.c
@@ -35,6 +35,12 @@ DECLARE_GLOBAL_DATA_PTR;
 #define OMAP3_MCSPI4_BASE       0x480BA000
 #endif
 
+#define OMAP4_MCSPI_REG_OFFSET  0x100
+
+struct omap2_mcspi_platform_config {
+        unsigned int regs_offset;
+};
+
 /* per-register bitmasks */
 #define OMAP3_MCSPI_SYSCONFIG_SMARTIDLE (2 << 3)
 #define OMAP3_MCSPI_SYSCONFIG_ENAWAKEUP BIT(2)
@@ -623,7 +629,10 @@ static int omap3_spi_probe(struct udevice *dev)
         const void *blob = gd->fdt_blob;
         int node = dev->of_offset;
 
-        priv->regs = (struct mcspi *)dev_get_addr(dev);
+        struct omap2_mcspi_platform_config* data =
+                (struct omap2_mcspi_platform_config*)dev_get_driver_data(dev);
+
+        priv->regs = (struct mcspi *)(dev_get_addr(dev) + data->regs_offset);
         priv->pin_dir = fdtdec_get_uint(blob, node, "ti,pindir-d0-out-d1-in",
                                             MCSPI_PINDIR_D0_IN_D1_OUT);
         priv->wordlen = SPI_DEFAULT_WORDLEN;
@@ -662,9 +671,17 @@ static const struct dm_spi_ops omap3_spi_ops = {
          */
 };
 
+static struct omap2_mcspi_platform_config omap2_pdata = {
+        .regs_offset = 0,
+};
+
+static struct omap2_mcspi_platform_config omap4_pdata = {
+        .regs_offset = OMAP4_MCSPI_REG_OFFSET,
+};
+
 static const struct udevice_id omap3_spi_ids[] = {
-        { .compatible = "ti,omap2-mcspi" },
-        { .compatible = "ti,omap4-mcspi" },
+        { .compatible = "ti,omap2-mcspi", .data = (ulong)&omap2_pdata },
+        { .compatible = "ti,omap4-mcspi", .data = (ulong)&omap4_pdata },
         { }
 };
 
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index ece16005a1..c64d3173f5 100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -622,19 +622,15 @@ static void fastboot_update_bootloader(char *cmd)
         reset_fastboot_cmd();
 
         if (strncmp("xloader", cmd, 7) == 0) {
+                printf("%s:xloader\n", __func__);
                 sprintf(cmdbuf, "sf write 0x%x 0 40000",
                         (unsigned int)CONFIG_FASTBOOT_BUF_ADDR);
                 add_fastboot_cmd(0, cmdbuf);
-                sprintf(cmdbuf, "sf update 0x%x 0 40000",
-                        (unsigned int)CONFIG_FASTBOOT_BUF_ADDR);
-                add_fastboot_cmd(1, cmdbuf);
         } else if (strncmp("bootloader", cmd, 10) == 0) {
-                sprintf(cmdbuf, "sf write 0x%x 40000 80000",
+                printf("%s:bootloader\n", __func__);
+                sprintf(cmdbuf, "sf write 0x%x 40000 100000",
                         (unsigned int)CONFIG_FASTBOOT_BUF_ADDR);
                 add_fastboot_cmd(0, cmdbuf);
-                sprintf(cmdbuf, "sf update 0x%x 40000 80000",
-                        (unsigned int)CONFIG_FASTBOOT_BUF_ADDR);
-                add_fastboot_cmd(1, cmdbuf);
         }
         run_fastboot_cmd();
 }
@@ -845,7 +841,7 @@ static void cb_oem(struct usb_ep *ep, struct usb_request *req)
                 flash_spi = 1;
                 add_fastboot_cmd(0, "sf probe 0");
                 add_fastboot_cmd(1, "sf erase 0 0x40000");
-                add_fastboot_cmd(2, "sf erase 0x40000 0x80000");
+                add_fastboot_cmd(2, "sf erase 0x40000 0x100000");
         } else if (strncmp("unlock", cmd + 4, 8) == 0) {
                 fastboot_tx_write_str("FAILnot implemented");
                 return ;
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index 822e1c8edc..60e145157f 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -280,7 +280,8 @@
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_SIMPLE
 #define CONFIG_SPL_TEXT_BASE            0x40200800
-#define CONFIG_SPL_MAX_SIZE             (54 * 1024)     /* 8 KB for stack */
+#define CONFIG_SPL_MAX_SIZE             (SRAM_SCRATCH_SPACE_ADDR - \
+                                         CONFIG_SPL_TEXT_BASE)
 
 #define CONFIG_SPL_BSS_START_ADDR       0x80000000
 #define CONFIG_SPL_BSS_MAX_SIZE         0x80000         /* 512 KB */
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 6f83870868..1d553d7d63 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -338,7 +338,8 @@
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_SIMPLE
 #define CONFIG_SPL_TEXT_BASE            0x40200000
-#define CONFIG_SPL_MAX_SIZE             (64 * 1024)
+#define CONFIG_SPL_MAX_SIZE             (SRAM_SCRATCH_SPACE_ADDR - \
+                                         CONFIG_SPL_TEXT_BASE)
 
 #define CONFIG_SPL_BSS_START_ADDR       0x80000000
 #define CONFIG_SPL_BSS_MAX_SIZE         0x80000         /* 512 KB */
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index a3eefc9956..f805c21f26 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -38,9 +38,6 @@
 
 /* SPL defines. */
 #define CONFIG_SPL_TEXT_BASE            CONFIG_ISW_ENTRY_ADDR
-#define CONFIG_SPL_MAX_SIZE             (NON_SECURE_SRAM_END - \
-                                        CONFIG_PUB_ROM_DATA_SIZE - \
-                                        CONFIG_SPL_TEXT_BASE)
 #define CONFIG_SYS_SPL_ARGS_ADDR        (CONFIG_SYS_SDRAM_BASE + \
                                          (128 << 20))
 #define CONFIG_SPL_POWER_SUPPORT
diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h
index b233b9d8fd..fa84e24875 100644
--- a/include/configs/am57xx_evm.h
+++ b/include/configs/am57xx_evm.h
@@ -204,8 +204,6 @@
 #ifdef CONFIG_SPL_BUILD
 #undef CONFIG_DM_SPI
 #undef CONFIG_DM_SPI_FLASH
-#undef CONFIG_SPL_MAX_SIZE
-#define CONFIG_SPL_MAX_SIZE             (256 << 10) /* 256 KiB */
 #endif
 
 /* SPI SPL */
diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h
index a94b1e2711..a6a4f0c943 100644
--- a/include/configs/bur_am335x_common.h
+++ b/include/configs/bur_am335x_common.h
@@ -47,10 +47,12 @@
  * area between 0x402F0400 and 0x4030B800 as a download area and
  * 0x4030B800 to 0x4030CE00 as a public stack area.  The ROM also
  * supports X-MODEM loading via UART, and we leverage this and then use
- * Y-MODEM to load u-boot.img, when booted over UART.
+ * Y-MODEM to load u-boot.img, when booted over UART.  We must also include
+ * the scratch space that U-Boot uses in SRAM.
  */
 #define CONFIG_SPL_TEXT_BASE            0x402F0400
-#define CONFIG_SPL_MAX_SIZE             (0x4030B800 - CONFIG_SPL_TEXT_BASE)
+#define CONFIG_SPL_MAX_SIZE             (SRAM_SCRATCH_SPACE_ADDR - \
+                                         CONFIG_SPL_TEXT_BASE)
 
 /*
  * Since SPL did pll and ddr initialization for us,
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 5d581162cb..7deb2f83de 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -347,7 +347,8 @@
 #define CONFIG_SYS_NAND_U_BOOT_OFFS     0x80000
 
 #define CONFIG_SPL_TEXT_BASE            0x40200800
-#define CONFIG_SPL_MAX_SIZE             (54 * 1024)     /* 8 KB for stack */
+#define CONFIG_SPL_MAX_SIZE             (SRAM_SCRATCH_SPACE_ADDR - \
+                                         CONFIG_SPL_TEXT_BASE)
 
 /*
  * Use 0x80008000 as TEXT_BASE here for compatibility reasons with the
diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index ee818ede26..a7f669d1bf 100644
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -158,7 +158,6 @@
 
 /* SPL defines. */
 #define CONFIG_SPL_TEXT_BASE            0x40300350
-#define CONFIG_SPL_MAX_SIZE             (64 * 1024)
 #define CONFIG_SYS_SPL_ARGS_ADDR        (CONFIG_SYS_SDRAM_BASE + (128 << 20))
 #define CONFIG_SPL_POWER_SUPPORT
 #define CONFIG_SYS_SPI_U_BOOT_OFFS      (256 * 1024)
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 69e9a07dc8..4f647ad034 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -143,6 +143,8 @@
 #define CONFIG_SPL_LOAD_FIT_ADDRESS 0x80200000
 #define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_HASH_SUPPORT
+
+#ifdef CONFIG_SPL_LOAD_FIT
 #define DFU_ALT_INFO_RAM \
         "dfu_alt_info_ram=" \
         "kernel ram 0x80200000 0x4000000;" \
@@ -151,6 +153,16 @@
 #define DFUARGS \
         "dfu_bufsiz=0x10000\0" \
         DFU_ALT_INFO_RAM
+#else
+#define DFU_ALT_INFO_RAM \
+        "dfu_alt_info_ram=" \
+        "kernel ram 0x807fffc0 0x4000000;" \
+        "fdt ram 0x80f80000 0x80000;" \
+        "ramdisk ram 0x81000000 0x4000000\0"
+#define DFUARGS \
+        "dfu_bufsiz=0x10000\0" \
+        DFU_ALT_INFO_RAM
+#endif
 #endif
 #endif
 
@@ -204,8 +216,6 @@
 /* In SPL, use the environment and discard MMC support for space. */
 #ifdef CONFIG_SPL_BUILD
 #undef CONFIG_SPL_MMC_SUPPORT
-#undef CONFIG_SPL_MAX_SIZE
-#define CONFIG_SPL_MAX_SIZE             (256 << 10) /* 256 KiB */
 #endif
 #define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_ENV_IS_IN_SPI_FLASH
diff --git a/include/configs/kc1.h b/include/configs/kc1.h
index b08cf2161d..b30aca6047 100644
--- a/include/configs/kc1.h
+++ b/include/configs/kc1.h
@@ -120,7 +120,8 @@
 #define CONFIG_SPL_FRAMEWORK
 
 #define CONFIG_SPL_TEXT_BASE            0x40300000
-#define CONFIG_SPL_MAX_SIZE             (48 * 1024)
+#define CONFIG_SPL_MAX_SIZE             (SRAM_SCRATCH_SPACE_ADDR - \
+                                         CONFIG_SPL_TEXT_BASE)
 #define CONFIG_SPL_BSS_START_ADDR       0x80000000
 #define CONFIG_SPL_BSS_MAX_SIZE         (512 * 1024)
 #define CONFIG_SYS_SPL_MALLOC_START     0x80208000
diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h
index 01336ff4d6..4b94571c38 100644
--- a/include/configs/omap3_evm_common.h
+++ b/include/configs/omap3_evm_common.h
@@ -258,7 +258,8 @@
 /* Defines for SPL */
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE            0x40200800
-#define CONFIG_SPL_MAX_SIZE             (54 * 1024)     /* 8 KB for stack */
+#define CONFIG_SPL_MAX_SIZE             (SRAM_SCRATCH_SPACE_ADDR - \
+                                         CONFIG_SPL_TEXT_BASE)
 
 #define CONFIG_SPL_BSS_START_ADDR       0x80000000
 #define CONFIG_SPL_BSS_MAX_SIZE         0x80000         /* 512 KB */
diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index 547aa69e34..fbdaa95f9e 100644
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -19,11 +19,11 @@
 #include <configs/ti_omap3_common.h>
 #include <asm/mach-types.h>
 
-/* SRAM starts at 0x40200000 and ends at 0x4020FFFF (64KB) */
-#undef CONFIG_SPL_MAX_SIZE
+/*
+ * We are only ever GP parts and will utilize all of the "downloaded image"
+ * area in SRAM which starts at 0x40200000 and ends at 0x4020FFFF (64KB).
+ */
 #undef CONFIG_SPL_TEXT_BASE
-
-#define CONFIG_SPL_MAX_SIZE             (SRAM_SCRATCH_SPACE_ADDR - CONFIG_SPL_TEXT_BASE)
 #define CONFIG_SPL_TEXT_BASE            0x40200000
 
 #define CONFIG_MISC_INIT_R
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 282626f09c..9f850cd4f1 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -30,11 +30,13 @@
 
 #include <configs/ti_omap3_common.h>
 
-/* Override default SPL info to minimize empty space and allow BCH8 in SPL */
+/*
+ * We are only ever GP parts and will utilize all of the "downloaded image"
+ * area in SRAM which starts at 0x40200000 and ends at 0x4020FFFF (64KB) in
+ * order to allow for BCH8 to fit in.
+ */
 #undef CONFIG_SPL_TEXT_BASE
-#undef CONFIG_SPL_MAX_SIZE
-#define CONFIG_SPL_TEXT_BASE   0x40200000
-#define CONFIG_SPL_MAX_SIZE    (SRAM_SCRATCH_SPACE_ADDR - CONFIG_SPL_TEXT_BASE)
+#define CONFIG_SPL_TEXT_BASE            0x40200000
 
 #define CONFIG_BOARD_LATE_INIT
 #define CONFIG_MISC_INIT_R              /* misc_init_r dumps the die id */
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index 4d790e9b87..85e011736c 100644
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -11,10 +11,12 @@
 #define CONFIG_NAND
 
 #include <configs/ti_omap3_common.h>
-#undef CONFIG_SPL_MAX_SIZE
+/*
+ * We are only ever GP parts and will utilize all of the "downloaded image"
+ * area in SRAM which starts at 0x40200000 and ends at 0x4020FFFF (64KB).
+ */
 #undef CONFIG_SPL_TEXT_BASE
-#define CONFIG_SPL_TEXT_BASE    0x40200000
-#define CONFIG_SPL_MAX_SIZE    (SRAM_SCRATCH_SPACE_ADDR - CONFIG_SPL_TEXT_BASE)
+#define CONFIG_SPL_TEXT_BASE            0x40200000
 
 #define CONFIG_BCH
 
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index dfc928d33b..0cbfbdf7f0 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -124,7 +124,8 @@
 /* Defines for SPL */
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE            0x402F0400
-#define CONFIG_SPL_MAX_SIZE             (101 * 1024)
+#define CONFIG_SPL_MAX_SIZE             (SRAM_SCRATCH_SPACE_ADDR - \
+                                         CONFIG_SPL_TEXT_BASE)
 
 #define CONFIG_SPL_BSS_START_ADDR       0x80000000
 #define CONFIG_SPL_BSS_MAX_SIZE         0x80000         /* 512 KB */
diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index fb348a5cd2..cd303c3c20 100644
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -128,7 +128,8 @@
 #define CONFIG_SPL_FRAMEWORK
 
 #define CONFIG_SPL_TEXT_BASE            0x40200000
-#define CONFIG_SPL_MAX_SIZE             (54 * 1024)
+#define CONFIG_SPL_MAX_SIZE             (SRAM_SCRATCH_SPACE_ADDR - \
+                                         CONFIG_SPL_TEXT_BASE)
 #define CONFIG_SPL_BSS_START_ADDR       0x80000000
 #define CONFIG_SPL_BSS_MAX_SIZE         (512 * 1024)
 #define CONFIG_SYS_SPL_MALLOC_START     0x80208000
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index efdc70622f..4dfe74f06f 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -219,6 +219,8 @@
 
 #define CONFIG_SPL_TEXT_BASE            0x40200000 /*CONFIG_SYS_SRAM_START*/
 #define CONFIG_SPL_MAX_SIZE             (54 * 1024)     /* 8 KB for stack */
+#define CONFIG_SPL_MAX_SIZE             (SRAM_SCRATCH_SPACE_ADDR - \
+                                         CONFIG_SPL_TEXT_BASE)
 
 #define CONFIG_SYS_SPL_MALLOC_START     0x8f000000
 #define CONFIG_SYS_SPL_MALLOC_SIZE      0x80000
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index 4d66dd2407..68ad266d9b 100644
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -329,7 +329,8 @@
 #define CONFIG_SYS_NAND_U_BOOT_OFFS     0x80000
 
 #define CONFIG_SPL_TEXT_BASE            0x40200800
-#define CONFIG_SPL_MAX_SIZE             (54 * 1024)     /* 8 KB for stack */
+#define CONFIG_SPL_MAX_SIZE             (SRAM_SCRATCH_SPACE_ADDR - \
+                                         CONFIG_SPL_TEXT_BASE)
 
 /*
  * Use 0x80008000 as TEXT_BASE here for compatibility reasons with the
diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index 09f8e8fe5c..e61cd78939 100644
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -160,7 +160,8 @@
 /* Defines for SPL */
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE            0x40300000
-#define CONFIG_SPL_MAX_SIZE             ((128 - 18) * 1024)
+#define CONFIG_SPL_MAX_SIZE             (SRAM_SCRATCH_SPACE_ADDR - \
+                                         CONFIG_SPL_TEXT_BASE)
 
 #define CONFIG_SPL_BSS_START_ADDR       0x80000000
 #define CONFIG_SPL_BSS_MAX_SIZE         0x80000         /* 512 KB */
diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index 2e84dd27e4..85c575dd8d 100644
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -126,7 +126,8 @@
 /* Defines for SPL */
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE    0x40400000
-#define CONFIG_SPL_MAX_SIZE     ((128 - 18) * 1024)
+#define CONFIG_SPL_MAX_SIZE             (SRAM_SCRATCH_SPACE_ADDR - \
+                                         CONFIG_SPL_TEXT_BASE)
 
 #define CONFIG_SPL_BSS_START_ADDR   0x80000000
 #define CONFIG_SPL_BSS_MAX_SIZE     0x80000     /* 512 KB */
diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h
index 52f4ed66db..fb4e82fe8e 100644
--- a/include/configs/ti_am335x_common.h
+++ b/include/configs/ti_am335x_common.h
@@ -58,7 +58,6 @@
  * Y-MODEM to load u-boot.img, when booted over UART.
  */
 #define CONFIG_SPL_TEXT_BASE            CONFIG_ISW_ENTRY_ADDR
-#define CONFIG_SPL_MAX_SIZE             (0x4030B800 - CONFIG_SPL_TEXT_BASE)
 #define CONFIG_SYS_SPL_ARGS_ADDR        (CONFIG_SYS_SDRAM_BASE + \
                                          (128 << 20))
 
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 5dd519531c..bba511ab99 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -255,14 +255,14 @@
 /*
  * Place the image at the start of the ROM defined image space (per
  * CONFIG_SPL_TEXT_BASE and we limit our size to the ROM-defined
- * downloaded image area.  We initalize DRAM as soon as we can so that
- * we can place stack, malloc and BSS there.  We load U-Boot itself into
- * memory at 0x80800000 for legacy reasons (to not conflict with older
- * SPLs).  We have our BSS be placed 2MiB after this, to allow for the
- * default Linux kernel address of 0x80008000 to work with most sized
- * kernels, in the Falcon Mode case.  We have the SPL malloc pool at the
- * end of the BSS area.  We suggest that the stack be placed at 32MiB after
- * the start of DRAM to allow room for all of the above (handled in Kconfig).
+ * downloaded image area minus 1KiB for scratch space.  We initalize DRAM as
+ * soon as we can so that we can place stack, malloc and BSS there.  We load
+ * U-Boot itself into memory at 0x80800000 for legacy reasons (to not conflict
+ * with older SPLs).  We have our BSS be placed 2MiB after this, to allow for
+ * the default Linux kernel address of 0x80008000 to work with most sized
+ * kernels, in the Falcon Mode case.  We have the SPL malloc pool at the end
+ * of the BSS area.  We suggest that the stack be placed at 32MiB after the
+ * start of DRAM to allow room for all of the above (handled in Kconfig).
  */
 #ifndef CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_TEXT_BASE            0x80800000
@@ -276,6 +276,10 @@
                                          CONFIG_SPL_BSS_MAX_SIZE)
 #define CONFIG_SYS_SPL_MALLOC_SIZE      CONFIG_SYS_MALLOC_LEN
 #endif
+#ifndef CONFIG_SPL_MAX_SIZE
+#define CONFIG_SPL_MAX_SIZE             (SRAM_SCRATCH_SPACE_ADDR - \
+                                         CONFIG_SPL_TEXT_BASE)
+#endif
 
 /* RAW SD card / eMMC locations. */
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x200   /* address 0x40000 */
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 97ff26360b..5a90930f38 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -273,6 +273,8 @@
         "set_rd_spec=setenv rd_spec ${rdaddr}:${filesize}\0"            \
         "init_fw_rd_net=dhcp ${rdaddr} ${tftp_root}/${name_fw_rd}; "    \
                 "run set_rd_spec\0"                                     \
+        "init_fw_rd_nfs=nfs ${rdaddr} ${nfs_root}/boot/${name_fw_rd}; " \
+                "run set_rd_spec\0"                                     \
         "init_fw_rd_ramfs=setenv rd_spec -\0"                           \
         "init_fw_rd_ubi=ubifsload ${rdaddr} ${bootdir}/${name_fw_rd}; " \
                 "run set_rd_spec\0"                                     \
@@ -281,6 +283,7 @@
         "set_name_pmmc=setenv name_pmmc ti-sci-firmware-${soc_variant}.bin\0" \
         "dev_pmmc=0\0"                                                  \
         "get_pmmc_net=dhcp ${loadaddr} ${tftp_root}/${name_pmmc}\0"     \
+        "get_pmmc_nfs=nfs ${loadaddr} ${nfs_root}/boot/${name_pmmc}\0"  \
         "get_pmmc_ramfs=run get_pmmc_net\0"                             \
         "get_pmmc_mmc=load mmc ${bootpart} ${loadaddr} "                \
                         "${bootdir}/${name_pmmc}\0"                     \
diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h
index 32877d1964..843f87d930 100644
--- a/include/configs/ti_omap3_common.h
+++ b/include/configs/ti_omap3_common.h
@@ -70,7 +70,6 @@
 
 /* SPL */
 #define CONFIG_SPL_TEXT_BASE            0x40200800
-#define CONFIG_SPL_MAX_SIZE             (54 * 1024)
 #define CONFIG_SPL_LDSCRIPT             "$(CPUDIR)/omap-common/u-boot-spl.lds"
 #define CONFIG_SPL_POWER_SUPPORT
 #define CONFIG_SYS_SPL_ARGS_ADDR        (CONFIG_SYS_SDRAM_BASE + \
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
index fb9a0ce42f..99873e2b07 100644
--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
@@ -146,7 +146,6 @@
  * So moving TEXT_BASE down to non-HS limit.
  */
 #define CONFIG_SPL_TEXT_BASE            0x40300000
-#define CONFIG_SPL_MAX_SIZE             (0x4030C000 - CONFIG_SPL_TEXT_BASE)
 #define CONFIG_SPL_DISPLAY_PRINT
 #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
 #define CONFIG_SYS_SPL_ARGS_ADDR        (CONFIG_SYS_SDRAM_BASE + \
diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
index fed164a096..171cc9aa36 100644
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -211,12 +211,6 @@
 #endif
 
 /* DRA7xx/AM57xx have 512K of SRAM, OMAP5 only 128K */
-#if defined(CONFIG_DRA7XX)
-#define CONFIG_SPL_BOOT_END             0x4037E000
-#else
-#define CONFIG_SPL_BOOT_END             0x4031E000
-#endif
-#define CONFIG_SPL_MAX_SIZE     (CONFIG_SPL_BOOT_END - CONFIG_SPL_TEXT_BASE)
 #define CONFIG_SPL_DISPLAY_PRINT
 #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
 #define CONFIG_SYS_SPL_ARGS_ADDR        (CONFIG_SYS_SDRAM_BASE + \
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 855d789c18..289aaffef1 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -342,7 +342,8 @@
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
 
 #define CONFIG_SPL_TEXT_BASE            0x40200000 /*CONFIG_SYS_SRAM_START*/
-#define CONFIG_SPL_MAX_SIZE             (57 * 1024)     /* 7 KB for stack */
+#define CONFIG_SPL_MAX_SIZE             (SRAM_SCRATCH_SPACE_ADDR - \
+                                         CONFIG_SPL_TEXT_BASE)
 
 #define CONFIG_SPL_BSS_START_ADDR       0x80000000 /*CONFIG_SYS_SDRAM_BASE*/
 #define CONFIG_SPL_BSS_MAX_SIZE         0x80000