Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/include/asm/ti-common/keystone_net.h | 8 ++++---- drivers/net/ti/keystone_net.c | 2 +- include/configs/k2e_evm.h | 2 +- include/configs/k2g_evm.h | 2 +- include/configs/k2l_evm.h | 2 +- scripts/config_whitelist.txt | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h index 1576a0473850..3f3c580328bf 100644 --- a/arch/arm/include/asm/ti-common/keystone_net.h +++ b/arch/arm/include/asm/ti-common/keystone_net.h @@ -30,7 +30,7 @@ #define CPGMACSL_REG_RESET 0x0c #define CPGMACSL_REG_MAXLEN 0x10
-#elif defined CONFIG_KSNET_NETCP_V1_5 +#elif defined CFG_KSNET_NETCP_V1_5
#define GBETH_BASE (CFG_KSNET_NETCP_BASE + 0x00200000) #define CPGMACSL_REG_RX_PRI_MAP 0x020 @@ -130,7 +130,7 @@ struct mac_sl_cfg { #define CPSW_REG_ALE_PORTCTL(x) (0x640 + (x) * 4) #define CPSW_REG_VAL_STAT_ENABLE_ALL 0xf
-#elif defined CONFIG_KSNET_NETCP_V1_5 +#elif defined CFG_KSNET_NETCP_V1_5
#define DEVICE_CPSW_BASE (GBETH_BASE + 0x20000) #define CPSW_REG_CTL 0x00004 @@ -168,7 +168,7 @@ struct mac_sl_cfg {
#ifdef CFG_KSNET_NETCP_V1_0 #define SGMII_OFFSET(x) ((x <= 1) ? (x * 0x100) : ((x * 0x100) + 0x100)) -#elif defined CONFIG_KSNET_NETCP_V1_5 +#elif defined CFG_KSNET_NETCP_V1_5 #define SGMII_OFFSET(x) ((x) * 0x100) #endif
@@ -195,7 +195,7 @@ struct mac_sl_cfg { #define hw_config_streaming_switch()\ writel(DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI, DEVICE_PSTREAM_CFG_REG_ADDR);
-#elif defined CONFIG_KSNET_NETCP_V1_5 +#elif defined CFG_KSNET_NETCP_V1_5
#define DEVICE_PSTREAM_CFG_REG_ADDR (CFG_KSNET_NETCP_BASE + 0x500) #define DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI 0x0 diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c index 513c7b32521f..db942811db76 100644 --- a/drivers/net/ti/keystone_net.c +++ b/drivers/net/ti/keystone_net.c @@ -70,7 +70,7 @@ enum link_type { #define DEVICE_EMACSW_BASE(base, x) ((base) + EMAC_EMACSW_PORT_BASE_OFS + \ (x) * 0x30)
-#elif defined(CONFIG_KSNET_NETCP_V1_5) +#elif defined(CFG_KSNET_NETCP_V1_5)
#define EMAC_EMACSW_PORT_BASE_OFS 0x222000
diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h index eabd06ff9b7a..024563b5dd68 100644 --- a/include/configs/k2e_evm.h +++ b/include/configs/k2e_evm.h @@ -37,7 +37,7 @@ #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
/* Network */ -#define CONFIG_KSNET_NETCP_V1_5 +#define CFG_KSNET_NETCP_V1_5 #define CFG_KSNET_CPSW_NUM_PORTS 9 #define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index e3f4f5ed4743..a6022cba68ad 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -51,7 +51,7 @@ "name_fs=arago-base-tisdk-image-k2g-evm.cpio\0"
/* Network */ -#define CONFIG_KSNET_NETCP_V1_5 +#define CFG_KSNET_NETCP_V1_5 #define CFG_KSNET_CPSW_NUM_PORTS 2 #define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE #define PHY_ANEG_TIMEOUT 10000 /* PHY needs longer aneg time */ diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h index aa9075cfd8ef..5ebc108d098c 100644 --- a/include/configs/k2l_evm.h +++ b/include/configs/k2l_evm.h @@ -37,7 +37,7 @@ #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
/* Network */ -#define CONFIG_KSNET_NETCP_V1_5 +#define CFG_KSNET_NETCP_V1_5 #define CFG_KSNET_CPSW_NUM_PORTS 5 #define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 3861edb19315..262995ea1f6a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -92,7 +92,7 @@ CFG_KSNET_MAC_ID_BASE CFG_KSNET_MDIO_PHY_CONFIG_ENABLE CFG_KSNET_NETCP_BASE CFG_KSNET_NETCP_V1_0 -CONFIG_KSNET_NETCP_V1_5 +CFG_KSNET_NETCP_V1_5 CONFIG_KSNET_SERDES_LANES_PER_SGMII CONFIG_KSNET_SERDES_SGMII2_BASE CONFIG_KSNET_SERDES_SGMII_BASE