Merge tag 'dm-pull-29oct19' of git://git.denx.de/u-boot-dm

[oweals/u-boot.git] / include / configs / ti_armv7_common.h

diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 57f27cb90e3905948a718a656148610ad6578c6e..6d15304a65cc717bce2445e6759574c5763069f9 100644 (file)
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -52,10 +52,16 @@
 
 #define DEFAULT_FIT_TI_ARGS \
        "boot_fit=0\0" \
-       "fit_loadaddr=0x87000000\0" \
-       "fit_bootfile=fitImage\0" \
-       "update_to_fit=setenv loadaddr ${fit_loadaddr}; setenv bootfile ${fit_bootfile}\0" \
-       "loadfit=run args_mmc; bootm ${loadaddr}#${fdtfile};\0" \
+       "addr_fit=0x90000000\0" \
+       "name_fit=fitImage\0" \
+       "update_to_fit=setenv loadaddr ${addr_fit}; setenv bootfile ${name_fit}\0" \
+       "get_overlaystring=" \
+               "for overlay in $overlay_files;" \
+               "do;" \
+               "setenv overlaystring ${overlaystring}'#'${overlay};" \
+               "done;\0" \
+       "run_fit=bootm ${addr_fit}#${fdtfile}${overlaystring}\0" \
+       "loadfit=run args_mmc; run run_fit;\0" \
 
 /*
  * DDR information.  If the CONFIG_NR_DRAM_BANKS is not defined,
@@ -64,9 +70,6 @@
  * initial stack pointer in our SRAM. Otherwise, we can define
  * CONFIG_NR_DRAM_BANKS before including this file.
  */
-#ifndef CONFIG_NR_DRAM_BANKS
-#define CONFIG_NR_DRAM_BANKS           1
-#endif
 #define CONFIG_SYS_SDRAM_BASE          0x80000000
 
 #ifndef CONFIG_SYS_INIT_SP_ADDR
@@ -77,24 +80,10 @@
 /* Timer information. */
 #define CONFIG_SYS_PTV                 2       /* Divisor: 2^(PTV+1) => 8 */
 
-/*
- * Disable DM_* for SPL build and can be re-enabled after adding
- * DM support in SPL
- */
-#ifdef CONFIG_SPL_BUILD
-#undef CONFIG_DM_I2C
-#endif
-
-/* I2C IP block */
+/* If DM_I2C, enable non-DM I2C support */
+#if !defined(CONFIG_DM_I2C)
 #define CONFIG_I2C
-#ifndef CONFIG_DM_I2C
 #define CONFIG_SYS_I2C
-#else
-/*
- * Enable CONFIG_DM_I2C_COMPAT temporarily until all the i2c client
- * devices are adopted to DM
- */
-#define CONFIG_DM_I2C_COMPAT
 #endif
 
 /*
@@ -168,7 +157,9 @@
 
 /* FAT sd card locations. */
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
+#ifndef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME        "u-boot.img"
+#endif
 
 #ifdef CONFIG_SPL_OS_BOOT
 /* FAT */