Rename CONFIG_EHCI_IS_TDI to CONFIG_USB_EHCI_IS_TDI

[platform/kernel/u-boot.git] / include / configs / k2g_evm.h

diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h
index 3ec5a5a..56dd9c7 100644 (file)
--- a/include/configs/k2g_evm.h
+++ b/include/configs/k2g_evm.h
@@ -12,11 +12,8 @@
 #include <environment/ti/mmc.h>
 #include <environment/ti/spi.h>
 
-/* Platform type */
-#define CONFIG_SOC_K2G
-
 /* U-Boot general configuration */
-#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS                            \
+#define ENV_KS2_BOARD_SETTINGS                                         \
        DEFAULT_MMC_TI_ARGS                                             \
        DEFAULT_PMMC_BOOT_ENV                                           \
        DEFAULT_FW_INITRAMFS_BOOT_ENV                                   \
@@ -35,6 +32,8 @@
                        "setenv name_fdt keystone-k2g-evm.dtb; " \
                "else if test $board_name = 66AK2GIC; then " \
                         "setenv name_fdt keystone-k2g-ice.dtb; " \
+               "else if test $board_name = 66AK2GI1; then " \
+                        "setenv name_fdt keystone-k2g-ice.dtb; " \
                "else if test $name_fdt = undefined; then " \
                        "echo WARNING: Could not determine device tree to use;"\
                "fi;fi;fi;fi; setenv fdtfile ${name_fdt}\0" \
@@ -69,7 +68,7 @@
        "run run_mon_hs; "                                              \
        "run init_${boot}; "                                            \
        "run get_fit_${boot}; "                                         \
-       "bootm ${fit_loadaddr}#${name_fdt}"
+       "bootm ${addr_fit}#${name_fdt}"
 #endif
 
 /* NAND Configuration */
@@ -81,10 +80,7 @@
 #define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
 #define PHY_ANEG_TIMEOUT       10000 /* PHY needs longer aneg time */
 
-#define CONFIG_ENV_SIZE                        (256 << 10)  /* 256 KiB */
-
 #ifndef CONFIG_SPL_BUILD
-#define CONFIG_CADENCE_QSPI
 #define CONFIG_CQSPI_REF_CLK 384000000
 #endif