spi: davinci: Drop non-dm code

[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 7e1d2eb7acbf8706bad2b976daba4531b80a0234..b632ae010d81905694dfc9a4315505195b8fb435 100644 (file)
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -43,9 +43,6 @@
                                        CONFIG_SYS_SPL_MALLOC_SIZE + \
                                        SPL_MALLOC_F_SIZE + \
                                        KEYSTONE_SPL_STACK_SIZE - 4)
-#ifdef CONFIG_SPL_SPI_LOAD
-#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x10000
-#endif
 
 /* SRAM scratch space entries  */
 #define SRAM_SCRATCH_SPACE_ADDR        CONFIG_SPL_STACK + 0x8
@@ -56,10 +53,6 @@
 
 /* UART Configuration */
 #define CONFIG_SYS_NS16550_MEM32
-#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL)
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE    -4
-#endif
 #define CONFIG_SYS_NS16550_COM1                KS2_UART0_BASE
 #define CONFIG_SYS_NS16550_COM2                KS2_UART1_BASE
 
@@ -71,19 +64,6 @@
 
 /* SPI Configuration */
 #define CONFIG_SYS_SPI_CLK             ks_clk_get_rate(KS2_CLK1_6)
-#define CONFIG_SYS_SPI0
-#define CONFIG_SYS_SPI_BASE            KS2_SPI0_BASE
-#define CONFIG_SYS_SPI0_NUM_CS         4
-#define CONFIG_SYS_SPI1
-#define CONFIG_SYS_SPI1_BASE           KS2_SPI1_BASE
-#define CONFIG_SYS_SPI1_NUM_CS         4
-#define CONFIG_SYS_SPI2
-#define CONFIG_SYS_SPI2_BASE           KS2_SPI2_BASE
-#define CONFIG_SYS_SPI2_NUM_CS         4
-#ifdef CONFIG_SPL_BUILD
-#undef CONFIG_DM_SPI
-#undef CONFIG_DM_SPI_FLASH
-#endif
 
 /* Network Configuration */
 #define CONFIG_BOOTP_DEFAULT
@@ -216,12 +196,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"                         \