arm: omap3: devkit8000: inherit from ti_armv7_common.h

[u-boot] / include / configs / imx6_spl.h

diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h
index 6fdc438f951800d7f7b745bd01b6021d663ef322..1b9c2773beb8240af44ca465d249f904ac1ae1b2 100644 (file)
--- a/include/configs/imx6_spl.h
+++ b/include/configs/imx6_spl.h
@@ -24,10 +24,10 @@
  *    and some padding thus 'our' max size is really 0x00908000 - 0x00918000
  *    or 64KB
  */
+#define CONFIG_SYS_THUMB_BUILD
 #define CONFIG_SPL_LDSCRIPT    "arch/arm/cpu/armv7/omap-common/u-boot-spl.lds"
 #define CONFIG_SPL_TEXT_BASE           0x00908000
-#define CONFIG_SPL_MAX_SIZE            (64 * 1024)
-#define CONFIG_SPL_START_S_PATH                "arch/arm/cpu/armv7"
+#define CONFIG_SPL_MAX_SIZE            0x10000
 #define CONFIG_SPL_STACK               0x0091FFB8
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
 #define CONFIG_SPL_LIBGENERIC_SUPPORT
@@ -45,7 +45,7 @@
 #if defined(CONFIG_SPL_MMC_SUPPORT)
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR        138 /* offset 69KB */
 #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS     800 /* 400 KB */
-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION   1
+#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SYS_MONITOR_LEN  (CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS/2*1024)
 #endif
 
@@ -57,7 +57,7 @@
 
 /* Define the payload for FAT/EXT support */
 #if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT)
-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME  "u-boot.img"
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME  "u-boot.img"
 #define CONFIG_SPL_LIBDISK_SUPPORT
 #endif