From a8ca5c8adb3efe892982389aae8b2a234939a588 Mon Sep 17 00:00:00 2001 From: Mario Six Date: Fri, 27 Apr 2018 14:52:21 +0200 Subject: treewide: Move CONFIG_PHY_MARVELL to Kconfig The CONFIG_PHY_MARVELL has already been migrated to Kconfig (some boards already had it in their Kconfig), but had not been moved for older boards. Move it to the defconfigs for all boards. Signed-off-by: Mario Six Acked-by: Joe Hershberger --- include/config_phylib_all_drivers.h | 1 - include/configs/10m50_devboard.h | 1 - include/configs/3c120_devboard.h | 1 - include/configs/MPC8548CDS.h | 2 -- include/configs/clearfog.h | 1 - include/configs/controlcenterdc.h | 1 - include/configs/db-88f6720.h | 1 - include/configs/db-88f6820-amc.h | 1 - include/configs/db-88f6820-gp.h | 1 - include/configs/db-mv784mp-gp.h | 1 - include/configs/ds414.h | 1 - include/configs/km/kmp204x-common.h | 1 - include/configs/maxbcm.h | 1 - include/configs/mvebu_armada-37xx.h | 1 - include/configs/socfpga_sr1500.h | 1 - include/configs/theadorable.h | 1 - include/configs/ti_armv7_keystone2.h | 1 - include/configs/turris_omnia.h | 1 - 18 files changed, 19 deletions(-) (limited to 'include') diff --git a/include/config_phylib_all_drivers.h b/include/config_phylib_all_drivers.h index 496ef58db0f..36df725b829 100644 --- a/include/config_phylib_all_drivers.h +++ b/include/config_phylib_all_drivers.h @@ -15,7 +15,6 @@ #ifdef CONFIG_PHYLIB #define CONFIG_PHY_VITESSE -#define CONFIG_PHY_MARVELL #define CONFIG_PHY_BROADCOM #define CONFIG_PHY_DAVICOM #define CONFIG_PHY_REALTEK diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h index 9479f91c571..1162663e4d8 100644 --- a/include/configs/10m50_devboard.h +++ b/include/configs/10m50_devboard.h @@ -29,7 +29,6 @@ */ #define CONFIG_SYS_RX_ETH_BUFFER 0 #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN -#define CONFIG_PHY_MARVELL /* * BOOTP options diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h index 07a44c88c73..cc8b956a090 100644 --- a/include/configs/3c120_devboard.h +++ b/include/configs/3c120_devboard.h @@ -32,7 +32,6 @@ */ #define CONFIG_SYS_RX_ETH_BUFFER 0 #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN -#define CONFIG_PHY_MARVELL /* * BOOTP options diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index c85ad5d3d87..2aa3b4df15f 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -407,8 +407,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_TSEC4_NAME "eTSEC3" #undef CONFIG_MPC85XX_FEC -#define CONFIG_PHY_MARVELL - #define TSEC1_PHY_ADDR 0 #define TSEC2_PHY_ADDR 1 #define TSEC3_PHY_ADDR 2 diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 86f2bd9fb23..f57f9b21aba 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -54,7 +54,6 @@ #define CONFIG_ENV_OFFSET 0xf0000 #define CONFIG_ENV_ADDR CONFIG_ENV_OFFSET -#define CONFIG_PHY_MARVELL /* there is a marvell phy */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ /* PCIe support */ diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index da0cc787381..b38cab11641 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -59,7 +59,6 @@ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ #define CONFIG_ENV_SECT_SIZE (256 << 10) /* 256KiB sectors */ -#define CONFIG_PHY_MARVELL /* there is a marvell phy */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ /* PCIe support */ diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h index c9d8282212a..4c30077060f 100644 --- a/include/configs/db-88f6720.h +++ b/include/configs/db-88f6720.h @@ -41,7 +41,6 @@ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ #define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64KiB sectors */ -#define CONFIG_PHY_MARVELL /* there is a marvell phy */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ /* diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index 6056cb8fed0..2f1ffa2754c 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -35,7 +35,6 @@ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ #define CONFIG_ENV_SECT_SIZE (256 << 10) /* 256KiB sectors */ -#define CONFIG_PHY_MARVELL /* there is a marvell phy */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ /* PCIe support */ diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index c37182dd307..ac810b0cbc5 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -54,7 +54,6 @@ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ #define CONFIG_ENV_SECT_SIZE (256 << 10) /* 256KiB sectors */ -#define CONFIG_PHY_MARVELL /* there is a marvell phy */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ /* PCIe support */ diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index 567a4a7b948..8ad007cc491 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -38,7 +38,6 @@ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ #define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64KiB sectors */ -#define CONFIG_PHY_MARVELL /* there is a marvell phy */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ /* SATA support */ diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 0c23657ea9f..5b444542f4e 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -37,7 +37,6 @@ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ #define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64KiB sectors */ -#define CONFIG_PHY_MARVELL /* there is a marvell phy */ #define CONFIG_SYS_NETA_INTERFACE_TYPE PHY_INTERFACE_MODE_RGMII /* PCIe support */ diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index 04371f94f83..3ae751eca52 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -324,7 +324,6 @@ int get_scl(void); #define CONFIG_FMAN_ENET #define CONFIG_PHYLIB_10G -#define CONFIG_PHY_MARVELL /* there is a marvell phy */ #define CONFIG_PCI_INDIRECT_BRIDGE diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index 565a4c18ace..d378333ab1b 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -37,7 +37,6 @@ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ #define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64KiB sectors */ -#define CONFIG_PHY_MARVELL /* there is a marvell phy */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ /* diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index 621b3722d6c..d1331096f26 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -78,7 +78,6 @@ #define CONFIG_ENV_OVERWRITE /* ethaddr can be reprogrammed */ #define CONFIG_ARP_TIMEOUT 200 #define CONFIG_NET_RETRY_COUNT 50 -#define CONFIG_PHY_MARVELL #define CONFIG_USB_MAX_CONTROLLER_COUNT (3 + 3) diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index c835d23235a..984f1183fdd 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -17,7 +17,6 @@ /* Ethernet on SoC (EMAC) */ #define CONFIG_PHY_INTERFACE_MODE PHY_INTERFACE_MODE_RGMII /* The PHY is autodetected, so no MII PHY address is needed here */ -#define CONFIG_PHY_MARVELL #define PHY_ANEG_TIMEOUT 8000 /* Environment */ diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index ac4e139ddcf..2526a000840 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -49,7 +49,6 @@ #define CONFIG_ENV_SECT_SIZE (256 << 10) /* 256KiB sectors */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_PHY_MARVELL /* there is a marvell phy */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ #define CONFIG_PREBOOT diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index b4e0b8050da..ccd466583af 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -89,7 +89,6 @@ #endif /* Network Configuration */ -#define CONFIG_PHY_MARVELL #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT #define CONFIG_BOOTP_DNS2 diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h index 3d5a1fa6b51..9d4d0dfbb29 100644 --- a/include/configs/turris_omnia.h +++ b/include/configs/turris_omnia.h @@ -64,7 +64,6 @@ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ #define CONFIG_ENV_SECT_SIZE (256 << 10) /* 256KiB sectors */ -#define CONFIG_PHY_MARVELL /* there is a marvell phy */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ /* PCIe support */ -- cgit v1.2.3