Merge branch 'master' of git://git.denx.de/u-boot-coldfire

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

diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h
index d90b264..05b4a3c 100644 (file)
--- a/include/configs/k2hk_evm.h
+++ b/include/configs/k2hk_evm.h
@@ -11,9 +11,6 @@
 
 #include <environment/ti/spi.h>
 
-/* Platform type */
-#define CONFIG_SOC_K2HK
-
 #ifdef CONFIG_TI_SECURE_DEVICE
 #define DEFAULT_SEC_BOOT_ENV                                           \
        DEFAULT_FIT_TI_ARGS                                             \
@@ -23,7 +20,7 @@
 #endif
 
 /* U-Boot general configuration */
-#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS                            \
+#define ENV_KS2_BOARD_SETTINGS                                         \
        DEFAULT_FW_INITRAMFS_BOOT_ENV                                   \
        DEFAULT_SEC_BOOT_ENV                                            \
        "boot=ubi\0"                                                    \
@@ -39,13 +36,7 @@
 
 #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
 
-/* NAND Configuration */
-#define CONFIG_SYS_NAND_PAGE_2K
-
 /* Network */
-#define CONFIG_KSNET_NETCP_V1_0
-#define CONFIG_KSNET_CPSW_NUM_PORTS    5
-
-#define CONFIG_DDR_SPD
+#define CFG_KSNET_CPSW_NUM_PORTS       5
 
 #endif /* __CONFIG_K2HK_EVM_H */