Convert CONFIG_SYS_I2C_BUS_MAX to Kconfig

[people/ms/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 03544af5d7ba9bbca228d762ae9b5be5e0aec659..2b2b85d085b4d4f3b7520e410c7e6b429202ec13 100644 (file)
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -97,7 +97,6 @@
 #endif
 
 /* Network Configuration */
-#define CONFIG_PHYLIB
 #define CONFIG_PHY_MARVELL
 #define CONFIG_MII
 #define CONFIG_BOOTP_DEFAULT
@@ -161,7 +160,6 @@
 #define CONFIG_SYS_DAVINCI_I2C_SLAVE1  0x10 /* SMBus host address */
 #define CONFIG_SYS_DAVINCI_I2C_SPEED2  100000
 #define CONFIG_SYS_DAVINCI_I2C_SLAVE2  0x10 /* SMBus host address */
-#define I2C_BUS_MAX                    3
 
 /* EEPROM definitions */
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN         2
@@ -193,15 +191,11 @@
 
 /* USB Configuration */
 #define CONFIG_USB_XHCI_KEYSTONE
-#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS     2
 #define CONFIG_USB_SS_BASE                     KS2_USB_SS_BASE
 #define CONFIG_USB_HOST_XHCI_BASE              KS2_USB_HOST_XHCI_BASE
 #define CONFIG_DEV_USB_PHY_BASE                        KS2_DEV_USB_PHY_BASE
 #define CONFIG_USB_PHY_CFG_BASE                        KS2_USB_PHY_CFG_BASE
 
-/* U-Boot command configuration */
-#define CONFIG_CMD_SAVES
-
 /* U-Boot general configuration */
 #define CONFIG_MISC_INIT_R
 #define CONFIG_MX_CYCLIC
@@ -249,7 +243,11 @@
        "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"                                 \
        "run_mon=mon_install ${addr_mon}\0"                             \
+       "run_mon_hs=mon_install ${addr_non_sec_mon} "                   \
+                       "${addr_load_sec_bm}\0"                         \
        "run_kern=bootz ${loadaddr} ${rd_spec} ${fdtaddr}\0"            \
        "init_net=run args_all args_net\0"                              \
        "init_nfs=setenv autoload no; dhcp; run args_all args_net\0"    \
@@ -301,12 +299,22 @@
                "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 init_${boot} get_mon_${boot} run_mon init_fw_rd_${boot} "  \
-       "get_fdt_${boot} get_kern_${boot} run_kern"
+       "run run_mon_hs; "                                              \
+       "run init_${boot}; "                                            \
+       "run get_fit_${boot}; "                                         \
+       "bootm ${fit_loadaddr}#${name_fdt}"
+#endif
 #endif
-
-#define CONFIG_BOOTARGS                                                        \
 
 /* Now for the remaining common defines */
 #include <configs/ti_armv7_common.h>