Merge branch 'master_sh/gen4/mmcfix' of https://source.denx.de/u-boot/custodians...

[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 ea45bba..a47f090 100644 (file)
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -15,7 +15,7 @@
 
 /* Memory Configuration */
 #define CFG_SYS_LPAE_SDRAM_BASE        0x800000000
-#define CONFIG_MAX_RAM_BANK_SIZE       (2 << 30)       /* 2GB */
+#define CFG_MAX_RAM_BANK_SIZE  (2 << 30)       /* 2GB */
 
 #ifdef CONFIG_SYS_MALLOC_F_LEN
 #define SPL_MALLOC_F_SIZE      CONFIG_SYS_MALLOC_F_LEN
@@ -47,11 +47,11 @@
 #define CFG_SYS_SPI_CLK                ks_clk_get_rate(KS2_CLK1_6)
 
 /* Keystone net */
-#define CONFIG_KSNET_MAC_ID_BASE               KS2_MAC_ID_BASE_ADDR
-#define CONFIG_KSNET_NETCP_BASE                        KS2_NETCP_BASE
-#define CONFIG_KSNET_SERDES_SGMII_BASE         KS2_SGMII_SERDES_BASE
-#define CONFIG_KSNET_SERDES_SGMII2_BASE                KS2_SGMII_SERDES2_BASE
-#define CONFIG_KSNET_SERDES_LANES_PER_SGMII    KS2_LANES_PER_SGMII_SERDES
+#define CFG_KSNET_MAC_ID_BASE          KS2_MAC_ID_BASE_ADDR
+#define CFG_KSNET_NETCP_BASE                   KS2_NETCP_BASE
+#define CFG_KSNET_SERDES_SGMII_BASE            KS2_SGMII_SERDES_BASE
+#define CFG_KSNET_SERDES_SGMII2_BASE           KS2_SGMII_SERDES2_BASE
+#define CFG_KSNET_SERDES_LANES_PER_SGMII       KS2_LANES_PER_SGMII_SERDES
 
 /* EEPROM definitions */
 
@@ -106,7 +106,7 @@
                "rproc load ${dev_pmmc} ${loadaddr} 0x${filesize}; "    \
                "rproc start ${dev_pmmc}\0"                             \
 
-#define CONFIG_EXTRA_ENV_SETTINGS                                      \
+#define CFG_EXTRA_ENV_SETTINGS                                 \
        DEFAULT_LINUX_BOOT_ENV                                          \
        ENV_KS2_BOARD_SETTINGS                                          \
        DFUARGS                                                         \