colibri_vf: add update_uboot wrapper

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

diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 03753c5b524bfa6b7e98d2136e619705911a6c17..ba12428dbe6b19631fa6a609ec3316dd7da2d3a4 100644 (file)
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -15,7 +15,6 @@
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* U-Boot is a 2nd stage loader */
 
 /* SoC Configuration */
-#define CONFIG_ARCH_CPU_INIT
 #define CONFIG_SPL_TARGET              "u-boot-spi.gph"
 
 /* Memory Configuration */
@@ -44,7 +43,6 @@
                                        CONFIG_SYS_SPL_MALLOC_SIZE + \
                                        SPL_MALLOC_F_SIZE + \
                                        KEYSTONE_SPL_STACK_SIZE - 4)
-#define CONFIG_SYS_SPI_U_BOOT_OFFS     CONFIG_SPL_PAD_TO
 
 /* SRAM scratch space entries  */
 #define SRAM_SCRATCH_SPACE_ADDR        CONFIG_SPL_STACK + 0x8
@@ -154,7 +152,6 @@
 #define CONFIG_SYS_NAND_MASK_CLE               0x4000
 #define CONFIG_SYS_NAND_MASK_ALE               0x2000
 #define CONFIG_SYS_NAND_CS                     2
-#define CONFIG_SYS_NAND_USE_FLASH_BBT
 #define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST
 
 #define CONFIG_SYS_NAND_LARGEPAGE
@@ -175,7 +172,6 @@
        DFU_ALT_INFO_MMC \
 
 /* U-Boot general configuration */
-#define CONFIG_MX_CYCLIC
 #define CONFIG_TIMESTAMP
 
 /* EDMA3 */
@@ -221,8 +217,8 @@
        "addr_secdb_key=0xc000000\0"                                    \
        "name_kern=zImage\0"                                            \
        "addr_mon=0x87000000\0"                                         \
-       "addr_non_sec_mon=0x0c087fc0\0"                                 \
-       "addr_load_sec_bm=0x0c08c000\0"                                 \
+       "addr_non_sec_mon=0x0c097fc0\0"                                 \
+       "addr_load_sec_bm=0x0c09c000\0"                                 \
        "run_mon=mon_install ${addr_mon}\0"                             \
        "run_mon_hs=mon_install ${addr_non_sec_mon} "                   \
                        "${addr_load_sec_bm}\0"                         \