Convert CONFIG_PCI_GT64120 to Kconfig

[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 8b0dd49..bf76afa 100644 (file)
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -12,13 +12,10 @@
 /* U-Boot Build Configuration */
 
 /* SoC Configuration */
-#define CONFIG_SPL_TARGET              "u-boot-spi.gph"
 
 /* Memory Configuration */
 #define CONFIG_SYS_LPAE_SDRAM_BASE     0x800000000
 #define CONFIG_MAX_RAM_BANK_SIZE       (2 << 30)       /* 2GB */
-#define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_ISW_ENTRY_ADDR - \
-                                       GENERATED_GBL_DATA_SIZE)
 
 #ifdef CONFIG_SYS_MALLOC_F_LEN
 #define SPL_MALLOC_F_SIZE      CONFIG_SYS_MALLOC_F_LEN
@@ -27,22 +24,10 @@
 #endif
 
 /* SPL SPI Loader Configuration */
-#define CONFIG_SPL_PAD_TO              65536
-#define CONFIG_SPL_MAX_SIZE            (CONFIG_SPL_PAD_TO - 8)
-#define CONFIG_SPL_BSS_START_ADDR      (CONFIG_ISW_ENTRY_ADDR + \
-                                       CONFIG_SPL_MAX_SIZE)
-#define CONFIG_SPL_BSS_MAX_SIZE                (32 * 1024)
-#define CONFIG_SYS_SPL_MALLOC_START    (CONFIG_SPL_BSS_START_ADDR + \
-                                       CONFIG_SPL_BSS_MAX_SIZE)
-#define CONFIG_SYS_SPL_MALLOC_SIZE     (32 * 1024)
 #define KEYSTONE_SPL_STACK_SIZE                (8 * 1024)
-#define CONFIG_SPL_STACK               (CONFIG_SYS_SPL_MALLOC_START + \
-                                       CONFIG_SYS_SPL_MALLOC_SIZE + \
-                                       SPL_MALLOC_F_SIZE + \
-                                       KEYSTONE_SPL_STACK_SIZE - 4)
 
 /* SRAM scratch space entries  */
-#define SRAM_SCRATCH_SPACE_ADDR        CONFIG_SPL_STACK + 0x8
+#define SRAM_SCRATCH_SPACE_ADDR                0xc0c23fc
 
 #define TI_SRAM_SCRATCH_BOARD_EEPROM_START     (SRAM_SCRATCH_SPACE_ADDR)
 #define TI_SRAM_SCRATCH_BOARD_EEPROM_END       (SRAM_SCRATCH_SPACE_ADDR + 0x200)
@@ -63,7 +48,6 @@
 #define CONFIG_SYS_SPI_CLK             ks_clk_get_rate(KS2_CLK1_6)
 
 /* Network Configuration */
-#define CONFIG_NET_RETRY_COUNT         32
 #define CONFIG_SYS_SGMII_REFCLK_MHZ    312
 #define CONFIG_SYS_SGMII_LINERATE_MHZ  1250
 #define CONFIG_SYS_SGMII_RATESCALE     2
@@ -108,7 +92,6 @@
        DFU_ALT_INFO_MMC \
 
 /* U-Boot general configuration */
-#define CONFIG_TIMESTAMP
 
 /* EDMA3 */
 
@@ -182,7 +165,7 @@
                "sf write ${loadaddr} 0 ${filesize}\0"          \
        "burn_uboot_nand=nand erase 0 0x100000; "                       \
                "nand write ${loadaddr} 0 ${filesize}\0"                \
-       "args_all=setenv bootargs console=ttyS0,115200n8 rootwait=1 "   \
+       "args_all=setenv bootargs console=ttyS0,115200n8 rootwait "     \
                KERNEL_MTD_PARTS                                        \
        "args_net=setenv bootargs ${bootargs} rootfstype=nfs "          \
                "root=/dev/nfs rw nfsroot=${serverip}:${nfs_root},"     \
@@ -201,27 +184,7 @@
        "args_ramfs=setenv bootargs ${bootargs} "                       \
                "rdinit=/sbin/init rw root=/dev/ram0 "                  \
                "initrd=0x808080000,80M\0"                              \
-       "no_post=1\0"                                                   \
-       "mtdparts=mtdparts=davinci_nand.0:"                             \
-               "1024k(bootloader)ro,512k(params)ro,-(ubifs)\0"
-
-#ifndef CONFIG_BOOTCOMMAND
-#ifndef CONFIG_TI_SECURE_DEVICE
-#define CONFIG_BOOTCOMMAND                                             \
-       "run init_${boot}; "                                            \
-       "run get_mon_${boot} run_mon; "                                 \
-       "run get_kern_${boot}; "                                        \
-       "run init_fw_rd_${boot}; "                                      \
-       "run get_fdt_${boot}; "                                         \
-       "run run_kern"
-#else
-#define CONFIG_BOOTCOMMAND                                             \
-       "run run_mon_hs; "                                              \
-       "run init_${boot}; "                                            \
-       "run get_fit_${boot}; "                                         \
-       "bootm ${addr_fit}#${name_fdt}"
-#endif
-#endif
+       "no_post=1\0"
 
 /* Now for the remaining common defines */
 #include <configs/ti_armv7_common.h>