Merge tag 'xilinx-for-v2020.07-rc2' of https://gitlab.denx.de/u-boot/custodians/u...

[platform/kernel/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 3b0dc77..1b014c1 100644 (file)
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -43,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
@@ -153,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
@@ -215,12 +213,13 @@
        "tftp_root=/\0"                                                 \
        "nfs_root=/export\0"                                            \
        "mem_lpae=1\0"                                                  \
+       "uinitrd_fixup=1\0"                                             \
        "addr_ubi=0x82000000\0"                                         \
        "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"                         \