diff options
Diffstat (limited to 'include')
123 files changed, 10 insertions, 207 deletions
diff --git a/include/config_phylib_all_drivers.h b/include/config_phylib_all_drivers.h index 12828c6..496ef58 100644 --- a/include/config_phylib_all_drivers.h +++ b/include/config_phylib_all_drivers.h @@ -16,7 +16,6 @@ #define CONFIG_PHY_VITESSE #define CONFIG_PHY_MARVELL -#define CONFIG_PHY_MICREL #define CONFIG_PHY_BROADCOM #define CONFIG_PHY_DAVICOM #define CONFIG_PHY_REALTEK diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 6fd3fa4..c8af398 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -479,10 +479,7 @@ #if defined(CONFIG_TSEC_ENET) -#if defined(CONFIG_UCP1020_REV_1_2) -#define CONFIG_PHY_MICREL_KSZ9021 -#elif defined(CONFIG_UCP1020_REV_1_3) -#define CONFIG_PHY_MICREL_KSZ9031 +#if defined(CONFIG_UCP1020_REV_1_2) || defined(CONFIG_UCP1020_REV_1_3) #else #error "UCP1020 module revision is not defined !!!" #endif diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index 22a4e69..6d40eb4 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -71,7 +71,6 @@ #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 4 -#define CONFIG_PHYLIB #define CONFIG_PHY_ATHEROS /* Serial Flash */ diff --git a/include/configs/alt.h b/include/configs/alt.h index a61814e..35518da 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -51,8 +51,6 @@ #define CONFIG_SH_ETHER_CACHE_WRITEBACK #define CONFIG_SH_ETHER_CACHE_INVALIDATE #define CONFIG_SH_ETHER_ALIGNE_SIZE 64 -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 2a2e2ba..0d05360 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -358,7 +358,6 @@ /* Network. */ #define CONFIG_PHY_GIGE -#define CONFIG_PHYLIB #define CONFIG_PHY_SMSC /* Enable Atheros phy driver */ #define CONFIG_PHY_ATHEROS diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h index 4721b42..3d3d5e7 100644 --- a/include/configs/am335x_igep003x.h +++ b/include/configs/am335x_igep003x.h @@ -111,7 +111,6 @@ #define CONFIG_CONS_INDEX 1 /* Ethernet support */ -#define CONFIG_PHYLIB #define CONFIG_PHY_SMSC /* NAND support */ diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index f3b7767..4ad2582 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -276,7 +276,6 @@ #define CONFIG_NET_RETRY_COUNT 10 #define CONFIG_NET_MULTI #define CONFIG_PHY_GIGE -#define CONFIG_PHYLIB #define CONFIG_PHY_ADDR 0 #define CONFIG_PHY_SMSC diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index 75f9bef..df1674b 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -101,7 +101,6 @@ /* Network. */ #define CONFIG_PHY_GIGE -#define CONFIG_PHYLIB #define CONFIG_PHY_SMSC #endif /* ! __CONFIG_AM335X_SL50_H */ diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 4469167..0c01733 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -246,7 +246,6 @@ #endif #define CONFIG_DRIVER_TI_CPSW -#define CONFIG_PHYLIB #define PHY_ANEG_TIMEOUT 8000 /* PHY needs longer aneg time at 1G */ #define CONFIG_SYS_RX_ETH_BUFFER 64 diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index 9976686..3f0cc49 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -85,7 +85,6 @@ #define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */ #define CONFIG_MII /* Required in net/eth.c */ #define CONFIG_PHY_GIGE /* per-board part of CPSW */ -#define CONFIG_PHYLIB #define PHY_ANEG_TIMEOUT 8000 /* PHY needs longer aneg time at 1G */ #define CONFIG_SUPPORT_EMMC_BOOT diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h index adc7d1f..cbf7782 100644 --- a/include/configs/ap_sh4a_4a.h +++ b/include/configs/ap_sh4a_4a.h @@ -29,8 +29,6 @@ #define CONFIG_SH_ETHER_PHY_ADDR (0x0) #define CONFIG_SH_ETHER_PHY_MODE (PHY_INTERFACE_MODE_GMII) #define CONFIG_SH_ETHER_SH7734_MII (0x02) /* GMII */ -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL 1 #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 4a12ac8..16af141 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -86,9 +86,6 @@ #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 6 -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL -#define CONFIG_PHY_MICREL_KSZ9031 #define CONFIG_IP_DEFRAG #define CONFIG_TFTP_BLOCKSIZE 4096 #define CONFIG_TFTP_TSIZE diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index 6ad956f..1c28fcf 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -32,9 +32,6 @@ #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 0 -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL - #define CONFIG_SPI_FLASH_MTD #define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_SPEED 20000000 diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h index 30abafc..9cd40a7 100644 --- a/include/configs/aristainetos2.h +++ b/include/configs/aristainetos2.h @@ -20,7 +20,6 @@ #define CONSOLE_DEV "ttymxc1" #define CONFIG_FEC_XCV_TYPE RGMII -#define CONFIG_PHY_MICREL_KSZ9031 #define CONFIG_SF_DEFAULT_BUS 3 #define CONFIG_SF_DEFAULT_CS 1 diff --git a/include/configs/aristainetos2b.h b/include/configs/aristainetos2b.h index 7a47514..a680e76 100644 --- a/include/configs/aristainetos2b.h +++ b/include/configs/aristainetos2b.h @@ -20,7 +20,6 @@ #define CONSOLE_DEV "ttymxc1" #define CONFIG_FEC_XCV_TYPE RGMII -#define CONFIG_PHY_MICREL_KSZ9031 #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 643b26b..3b8a250 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -101,7 +101,6 @@ #define CONFIG_SH_ETHER_BASE_ADDR 0xe9a00000 #define CONFIG_SH_ETHER_SH7734_MII (0x01) #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII -#define CONFIG_PHYLIB #define CONFIG_PHY_SMSC #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI diff --git a/include/configs/baltos.h b/include/configs/baltos.h index aba7208..258e8bd 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -303,7 +303,6 @@ /* Network. */ #define CONFIG_PHY_GIGE -#define CONFIG_PHYLIB #define CONFIG_PHY_ADDR 0 #define CONFIG_PHY_SMSC #define CONFIG_MII diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index fafab8e..6dfdbaf 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -522,7 +522,6 @@ DEFAULT_LINUX_BOOT_ENV \ /* Network. */ #define CONFIG_PHY_GIGE -#define CONFIG_PHYLIB #define CONFIG_PHY_SMSC /* diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index 8d0e0ea..b8c531e 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -31,7 +31,6 @@ /* Network defines */ #define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */ #define CONFIG_MII /* Required in net/eth.c */ -#define CONFIG_PHYLIB #define CONFIG_PHY_NATSEMI /* diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index b36cbb9..4996a89 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -109,7 +109,6 @@ #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 6 -#define CONFIG_PHYLIB #define CONFIG_PHY_ATHEROS /* Command definition */ diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h index 82be3a1..581ab7c 100644 --- a/include/configs/chiliboard.h +++ b/include/configs/chiliboard.h @@ -206,7 +206,6 @@ #endif /* Network. */ -#define CONFIG_PHYLIB #define CONFIG_PHY_SMSC #endif /* ! __CONFIG_CHILIBOARD_H */ diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index 120ac02..813e33a 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -102,7 +102,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_PHY_GIGE #define CONFIG_PHY_ATHEROS -#define CONFIG_PHYLIB #define CONFIG_SYS_RX_ETH_BUFFER 64 #define PHY_ANEG_TIMEOUT 8000 diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index e2c43b1..4f45be1 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -192,7 +192,6 @@ #define CONFIG_FEC_MXC_PHYADDR 0 #define CONFIG_FEC_XCV_TYPE RGMII #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_PHYLIB #define CONFIG_PHY_ATHEROS #define CONFIG_MII #define CONFIG_ETHPRIME "FEC0" diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index ed7bb1d..270ea3e 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -103,7 +103,6 @@ /* Network. */ #define CONFIG_PHY_GIGE -#define CONFIG_PHYLIB #define CONFIG_PHY_ATHEROS /* NAND support */ diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 7a61107..ca0078b 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -55,7 +55,6 @@ #define CONFIG_NET_MULTI #define CONFIG_PHY_GIGE #define CONFIG_PHY_ATHEROS -#define CONFIG_PHYLIB #define CONFIG_SYS_RX_ETH_BUFFER 64 /* USB support */ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 5f73867..fca72f4 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -72,8 +72,6 @@ #define CONFIG_FEC_XCV_TYPE RMII #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 1 -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL #define CONFIG_IP_DEFRAG #define CONFIG_TFTP_BLOCKSIZE 16352 #define CONFIG_TFTP_TSIZE diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 4baa038..30a2d12 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -32,8 +32,6 @@ #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 0 -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL #define CONFIG_IP_DEFRAG #define CONFIG_TFTP_BLOCKSIZE 16352 #define CONFIG_TFTP_TSIZE diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 15a0638..cc1f919 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -66,8 +66,6 @@ #define IMX_FEC_BASE ENET1_BASE_ADDR #define CONFIG_FEC_XCV_TYPE RMII #define CONFIG_FEC_MXC_PHYADDR 0 -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL #define CONFIG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 diff --git a/include/configs/corvus.h b/include/configs/corvus.h index e255a8b..88196020 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -84,7 +84,6 @@ /* Ethernet */ #define CONFIG_MACB -#define CONFIG_PHYLIB #define CONFIG_RMII #define CONFIG_NET_RETRY_COUNT 20 #define CONFIG_AT91_WANTS_COMMON_PHY diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index ddbaf32..4734c3d 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -366,8 +366,6 @@ #ifdef CONFIG_SYS_DPAA_FMAN #define CONFIG_FMAN_ENET -#define CONFIG_PHY_MICREL -#define CONFIG_PHY_MICREL_KSZ9021 #endif #ifdef CONFIG_PCI diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index f1a5c6c..6124867 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -73,7 +73,6 @@ #define CONFIG_RMII #define CONFIG_PHY_SMSC #define CONFIG_LPC32XX_ETH -#define CONFIG_PHYLIB #define CONFIG_PHY_ADDR 0x1F #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index b509151..486653b 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -113,7 +113,6 @@ #define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */ #define CONFIG_MII /* Required in net/eth.c */ #define CONFIG_PHY_GIGE /* per-board part of CPSW */ -#define CONFIG_PHYLIB #define CONFIG_PHY_TI /* SPI */ diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h index 2471277..fe56c8f 100644 --- a/include/configs/ecovec.h +++ b/include/configs/ecovec.h @@ -53,7 +53,6 @@ #define CONFIG_SH_ETHER_USE_PORT (0) #define CONFIG_SH_ETHER_PHY_ADDR (0x1f) #define CONFIG_PHY_SMSC 1 -#define CONFIG_PHYLIB #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 61f0c95..d1dec80 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -51,7 +51,6 @@ #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 4 -#define CONFIG_PHYLIB #define CONFIG_PHY_ATHEROS #ifdef CONFIG_CMD_SF diff --git a/include/configs/espt.h b/include/configs/espt.h index 07f3275..b9538f3 100644 --- a/include/configs/espt.h +++ b/include/configs/espt.h @@ -91,7 +91,6 @@ #define CONFIG_SH_ETHER 1 #define CONFIG_SH_ETHER_USE_PORT (1) #define CONFIG_SH_ETHER_PHY_ADDR (0x00) -#define CONFIG_PHYLIB #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 584a2b4..5e5d044 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -77,8 +77,6 @@ */ #define CONFIG_FEC_MXC #define IMX_FEC_BASE FEC_BASE_ADDR -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL #define CONFIG_FEC_MXC_PHYADDR 0x1 #define CONFIG_MII diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 5e04dd2..cc2b786 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -94,7 +94,6 @@ #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 4 -#define CONFIG_PHYLIB #define CONFIG_PHY_ATHEROS #endif diff --git a/include/configs/gose.h b/include/configs/gose.h index 067e86d..610ba1a 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -50,8 +50,6 @@ #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CONFIG_SH_ETHER_CACHE_WRITEBACK #define CONFIG_SH_ETHER_CACHE_INVALIDATE -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI #define CONFIG_SH_ETHER_ALIGNE_SIZE 64 diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index f56618a..c1e9f5d 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -30,7 +30,6 @@ #define CONFIG_FEC_XCV_TYPE RMII #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 0 -#define CONFIG_PHYLIB #define CONFIG_PHY_SMSC #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index 7a201b0..6341609 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -84,7 +84,6 @@ #define CONFIG_KSNET_NETCP_V1_5 #define CONFIG_KSNET_CPSW_NUM_PORTS 2 #define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE -#define CONFIG_PHY_MICREL #define PHY_ANEG_TIMEOUT 10000 /* PHY needs longer aneg time */ #define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */ diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index 3c66f8a..a1c83b7 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -346,7 +346,6 @@ int get_scl(void); /* RGMII (FM1@DTESC5) is used as debug itf, it's the only one configured */ #define CONFIG_SYS_FM1_DTSEC5_PHY_ADDR 0x11 #define CONFIG_SYS_TBIPA_VALUE 8 -#define CONFIG_PHYLIB /* recommended PHY management */ #define CONFIG_ETHPRIME "FM1@DTSEC5" #define CONFIG_PHY_GIGE /* Include GbE speed/duplex detection */ diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index 988b747..b9214d2 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -50,8 +50,6 @@ #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CONFIG_SH_ETHER_CACHE_WRITEBACK #define CONFIG_SH_ETHER_CACHE_INVALIDATE -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI #define CONFIG_SH_ETHER_ALIGNE_SIZE 64 diff --git a/include/configs/lager.h b/include/configs/lager.h index 73ea9ac..291b03c 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -51,8 +51,6 @@ #define CONFIG_SH_ETHER_ALIGNE_SIZE 64 #define CONFIG_SH_ETHER_CACHE_WRITEBACK #define CONFIG_SH_ETHER_CACHE_INVALIDATE -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index 76ee910..2cad644 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -153,7 +153,6 @@ #define CONFIG_FEC_XCV_TYPE RMII #define CONFIG_ETHPRIME "FEC" -#define CONFIG_PHYLIB #define CONFIG_PHY_SMSC #endif diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 58f893f..2742cfc 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -200,7 +200,6 @@ #define CONFIG_ETHPRIME "eTSEC2" #define CONFIG_PHY_GIGE -#define CONFIG_PHYLIB #define CONFIG_PHY_ATHEROS #define CONFIG_HAS_ETH0 diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index bd05b45..f3f6abe 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -457,7 +457,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_ETHPRIME "eTSEC1" #define CONFIG_PHY_GIGE -#define CONFIG_PHYLIB #define CONFIG_PHY_REALTEK #define CONFIG_HAS_ETH0 diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 98e902e..d22df27 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -336,7 +336,6 @@ #define CONFIG_ETHPRIME "eTSEC1" #define CONFIG_PHY_GIGE -#define CONFIG_PHYLIB #define CONFIG_PHY_ATHEROS #define CONFIG_HAS_ETH0 diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 2d58b3b..af58e61 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -50,7 +50,6 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_SYS_DPAA_FMAN #define CONFIG_FMAN_ENET -#define CONFIG_PHYLIB #define CONFIG_PHY_VITESSE #define CONFIG_PHY_REALTEK #define CONFIG_PHYLIB_10G diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 937fd93..6e13ada 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -249,7 +249,6 @@ #define AQR105_IRQ_MASK 0x40000000 #ifdef CONFIG_NET -#define CONFIG_PHYLIB #define CONFIG_PHY_GIGE /* Include GbE speed/duplex detection */ #define CONFIG_PHY_VITESSE #define CONFIG_PHY_REALTEK diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 9dc74b4..ef2f47c 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -70,7 +70,6 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_SYS_DPAA_FMAN #define CONFIG_FMAN_ENET -#define CONFIG_PHYLIB #define CONFIG_PHY_VITESSE #define CONFIG_PHY_REALTEK #define CONFIG_PHYLIB_10G diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index 3d3dfb1..6790996 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -180,7 +180,6 @@ #ifndef SPL_NO_FMAN #ifdef CONFIG_NET -#define CONFIG_PHYLIB #define CONFIG_PHY_GIGE /* Include GbE speed/duplex detection */ #define CONFIG_PHY_REALTEK #endif diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index 6b943cd..7b7765c 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -406,7 +406,6 @@ unsigned long get_board_ddr_clk(void); #if defined(CONFIG_FSL_MC_ENET) && !defined(CONFIG_SPL_BUILD) #define CONFIG_FSL_MEMAC -#define CONFIG_PHYLIB #define CONFIG_PHYLIB_10G #define CONFIG_PHY_VITESSE #define CONFIG_PHY_REALTEK diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index b86726f..c19f9ef 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -468,7 +468,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_PHYLIB_10G #define CONFIG_PHY_AQUANTIA #define CONFIG_PHY_CORTINA -#define CONFIG_PHYLIB #define CONFIG_SYS_CORTINA_FW_IN_NOR #ifdef CONFIG_QSPI_BOOT #define CONFIG_CORTINA_FW_ADDR 0x20980000 diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index 138525b..2f7efc7 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -116,8 +116,6 @@ #define CONFIG_MII #define CONFIG_DISCOVER_PHY #define CONFIG_FEC_XCV_TYPE RMII -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL #define CONFIG_ETHPRIME "FEC0" #endif diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index a4c1035..7ea9839 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -108,9 +108,6 @@ #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 1 -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL -#define CONFIG_PHY_MICREL_KSZ9031 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index aa007e2..24cf4b2 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -245,8 +245,6 @@ # define CONFIG_PHY_DAVICOM 1 # define CONFIG_PHY_LXT 1 # define CONFIG_PHY_MARVELL 1 -# define CONFIG_PHY_MICREL 1 -# define CONFIG_PHY_MICREL_KSZ9021 # define CONFIG_PHY_NATSEMI 1 # define CONFIG_PHY_REALTEK 1 # define CONFIG_PHY_VITESSE 1 diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 32e898e..5930f59 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -37,7 +37,6 @@ #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_FEC_MXC_PHYADDR 0 -#define CONFIG_PHYLIB #define CONFIG_PHY_ATHEROS /* Framebuffer */ diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index b3638d5..b849eea 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -28,7 +28,6 @@ #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 1 -#define CONFIG_PHYLIB #define CONFIG_PHY_ATHEROS #ifdef CONFIG_CMD_SF diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 98797b0..cd9f0b0 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -39,7 +39,6 @@ #define CONFIG_FEC_XCV_TYPE RMII #define CONFIG_FEC_MXC_PHYADDR 0 -#define CONFIG_PHYLIB #define CONFIG_PHY_SMSC #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 060ebd7..e377c0f 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -141,7 +141,6 @@ #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_ETHPRIME "FEC" -#define CONFIG_PHYLIB #define CONFIG_PHY_ATHEROS #ifdef CONFIG_CMD_USB diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 319fed4..2c0a799 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -163,7 +163,6 @@ #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_ETHPRIME "FEC" -#define CONFIG_PHYLIB #define CONFIG_PHY_ATHEROS #ifdef CONFIG_CMD_USB diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index c9b7e7b..47379ca 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -206,9 +206,6 @@ #define CONFIG_FEC_XCV_TYPE RMII #endif #define CONFIG_ETHPRIME "FEC" - -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL #endif #define CONFIG_IMX_THERMAL diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index d4dd0b3..fec7e81 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -26,7 +26,6 @@ #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 0 -#define CONFIG_PHYLIB #define CONFIG_PHY_BROADCOM /* ENET1 */ #define IMX_FEC_BASE ENET_IPS_BASE_ADDR diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index a1a0cda..bc17b51 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -65,9 +65,6 @@ #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 6 -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL -#define CONFIG_PHY_MICREL_KSZ9021 /* USB Configs */ #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/novena.h b/include/configs/novena.h index 2bba741..c3005e7 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -72,9 +72,6 @@ #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 0x7 -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL -#define CONFIG_PHY_MICREL_KSZ9021 #define CONFIG_ARP_TIMEOUT 200UL #endif diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 373c2d5..8ca6f62 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -82,7 +82,6 @@ #define CONFIG_FEC_XCV_TYPE MII100 #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 0x5 -#define CONFIG_PHYLIB #define CONFIG_PHY_SMSC #ifndef CONFIG_SPL diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index ce80e7e..64670c4 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -141,7 +141,6 @@ #endif /* CONFIG_USB_MUSB_GADGET */ #define CONFIG_PHY_GIGE -#define CONFIG_PHYLIB #define CONFIG_PHY_SMSC #endif /* ! __CONFIG_PCM051_H */ diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 71c5078..b4b60ac 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -61,8 +61,6 @@ #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_XCV_TYPE RMII #define CONFIG_FEC_MXC_PHYADDR 0 -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL /* QSPI Configs*/ diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index e3a84ed..2c1221d 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -43,10 +43,6 @@ #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 3 -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL -#define CONFIG_PHY_KSZ9031 - /* SPI Flash */ #define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index dbe0ddd..a76bbce 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -191,7 +191,6 @@ #define CONFIG_NET_MULTI /* Network */ -#define CONFIG_PHYLIB #define CONFIG_PHY_RESET 1 #define CONFIG_PHY_NATSEMI #define CONFIG_PHY_REALTEK diff --git a/include/configs/pepper.h b/include/configs/pepper.h index ff3cd74..cd34b4f 100644 --- a/include/configs/pepper.h +++ b/include/configs/pepper.h @@ -78,10 +78,7 @@ /* Ethernet support */ #define CONFIG_PHY_GIGE -#define CONFIG_PHYLIB #define CONFIG_PHY_ADDR 0 -#define CONFIG_PHY_MICREL -#define CONFIG_PHY_MICREL_KSZ9021 #define CONFIG_PHY_RESET_DELAY 1000 /* SPL */ diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 7b44752..5cb507f 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -21,8 +21,6 @@ #define IMX_FEC_BASE ENET2_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x1 #define CONFIG_FEC_XCV_TYPE RMII -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (35 * SZ_1M) /* Increase due to DFU */ diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index e623f48..793ba78 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -25,7 +25,6 @@ #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 1 -#define CONFIG_PHYLIB #define CONFIG_PHY_ATHEROS /* ENET1 */ diff --git a/include/configs/platinum.h b/include/configs/platinum.h index 1cdab00..4801cb2 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -40,8 +40,6 @@ #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_PHYLIB - /* USB config */ #define CONFIG_MXC_USB_PORT 1 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/platinum_titanium.h b/include/configs/platinum_titanium.h index ccb6441..69406a4 100644 --- a/include/configs/platinum_titanium.h +++ b/include/configs/platinum_titanium.h @@ -20,8 +20,6 @@ #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_FEC_MXC_PHYADDR 4 -#define CONFIG_PHY_MICREL -#define CONFIG_PHY_MICREL_KSZ9021 #define CONFIG_PHY_RESET_DELAY 1000 #define CONFIG_HOSTNAME titanium diff --git a/include/configs/porter.h b/include/configs/porter.h index fa1fff9..451d9dd 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -52,8 +52,6 @@ #define CONFIG_SH_ETHER_CACHE_WRITEBACK #define CONFIG_SH_ETHER_CACHE_INVALIDATE #define CONFIG_SH_ETHER_ALIGNE_SIZE 64 -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h index d79aa21..2b04521 100644 --- a/include/configs/r0p7734.h +++ b/include/configs/r0p7734.h @@ -27,7 +27,6 @@ #define CONFIG_SH_ETHER 1 #define CONFIG_SH_ETHER_USE_PORT (0) #define CONFIG_SH_ETHER_PHY_ADDR (0x0) -#define CONFIG_PHYLIB #define CONFIG_PHY_SMSC 1 #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index c887771..381082c 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -93,8 +93,6 @@ #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_XCV_TYPE RMII #define CONFIG_FEC_MXC_PHYADDR 0 -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL #endif #if 0 /* Disable until the FLASH will be implemented */ diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h index f8bfe96..5bf5731 100644 --- a/include/configs/salvator-x.h +++ b/include/configs/salvator-x.h @@ -26,7 +26,6 @@ /* Ethernet RAVB */ #define CONFIG_NET_MULTI -#define CONFIG_PHY_MICREL #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index 83b527c..d10dc3e 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -85,8 +85,6 @@ #define CONFIG_PMECC_CAP 4 #define CONFIG_PMECC_SECTOR_SIZE 512 -#define CONFIG_PHY_MICREL_KSZ9021 - /* USB */ #ifdef CONFIG_CMD_USB diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h index f7aeb64..efed670 100644 --- a/include/configs/sc_sps_1.h +++ b/include/configs/sc_sps_1.h @@ -33,7 +33,6 @@ /* FEC Ethernet on SoC */ #ifdef CONFIG_CMD_NET #define CONFIG_FEC_MXC -#define CONFIG_PHYLIB #define CONFIG_PHY_SMSC #endif diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h index c90626f..c3a4961 100644 --- a/include/configs/secomx6quq7.h +++ b/include/configs/secomx6quq7.h @@ -33,8 +33,6 @@ #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 6 -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index 39e8244..dd3a5fb 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -60,7 +60,6 @@ #define CONFIG_SH_ETHER_PHY_ADDR 18 #define CONFIG_SH_ETHER_CACHE_WRITEBACK 1 #define CONFIG_SH_ETHER_USE_GETHER 1 -#define CONFIG_PHYLIB #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RGMII diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h index 24ec076..c53cd17 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -60,7 +60,6 @@ #define CONFIG_SH_ETHER_PHY_ADDR 18 #define CONFIG_SH_ETHER_CACHE_WRITEBACK 1 #define CONFIG_SH_ETHER_USE_GETHER 1 -#define CONFIG_PHYLIB #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RGMII diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index e5084ad..8ec4cd4 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -60,7 +60,6 @@ #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 1 #define CONFIG_SH_ETHER_CACHE_WRITEBACK 1 -#define CONFIG_PHYLIB #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h index 74bd9fc..3876e07 100644 --- a/include/configs/sh7763rdp.h +++ b/include/configs/sh7763rdp.h @@ -91,7 +91,6 @@ #define CONFIG_SH_ETHER 1 #define CONFIG_SH_ETHER_USE_PORT (1) #define CONFIG_SH_ETHER_PHY_ADDR (0x01) -#define CONFIG_PHYLIB #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 5a5bf7a..b3e9093 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -223,7 +223,6 @@ #define CONFIG_DRIVER_TI_CPSW #define CONFIG_MII #define CONFIG_PHY_GIGE -#define CONFIG_PHYLIB #define CONFIG_BOOTP_DEFAULT #define CONFIG_BOOTP_DNS #define CONFIG_BOOTP_DNS2 diff --git a/include/configs/silk.h b/include/configs/silk.h index 238783b..0384325 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -52,8 +52,6 @@ #define CONFIG_SH_ETHER_CACHE_WRITEBACK #define CONFIG_SH_ETHER_CACHE_INVALIDATE #define CONFIG_SH_ETHER_ALIGNE_SIZE 64 -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index cc83b98..a80d290 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -117,7 +117,6 @@ * */ #define CONFIG_MACB -#define CONFIG_PHYLIB #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX #define CONFIG_USB_ETHER_MCS7830 diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index 13977cb..91a681a 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -52,7 +52,6 @@ /* Ethernet */ #define CONFIG_MACB -#define CONFIG_PHYLIB #define CONFIG_RMII #define CONFIG_NET_RETRY_COUNT 20 #define CONFIG_RESET_PHY_R diff --git a/include/configs/socfpga_arria10_socdk.h b/include/configs/socfpga_arria10_socdk.h index 55850bd..b30b44d 100644 --- a/include/configs/socfpga_arria10_socdk.h +++ b/include/configs/socfpga_arria10_socdk.h @@ -25,10 +25,6 @@ #define PHYS_SDRAM_1_SIZE 0x40000000 /* Ethernet on SoC (EMAC) */ -#if defined(CONFIG_CMD_NET) -#define CONFIG_PHY_MICREL -#define CONFIG_PHY_MICREL_KSZ9031 -#endif /* * U-Boot environment configurations diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h index 9f83858..6b6d54b 100644 --- a/include/configs/socfpga_arria5_socdk.h +++ b/include/configs/socfpga_arria5_socdk.h @@ -18,10 +18,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Ethernet on SoC (EMAC) */ -#if defined(CONFIG_CMD_NET) -#define CONFIG_PHY_MICREL -#define CONFIG_PHY_MICREL_KSZ9021 -#endif /* The rest of the configuration is shared */ #include <configs/socfpga_common.h> diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h index 86b4a9d..018a0c3 100644 --- a/include/configs/socfpga_cyclone5_socdk.h +++ b/include/configs/socfpga_cyclone5_socdk.h @@ -18,10 +18,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Ethernet on SoC (EMAC) */ -#if defined(CONFIG_CMD_NET) -#define CONFIG_PHY_MICREL -#define CONFIG_PHY_MICREL_KSZ9021 -#endif /* The rest of the configuration is shared */ #include <configs/socfpga_common.h> diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h index 6516c45..275ed7f 100644 --- a/include/configs/socfpga_de0_nano_soc.h +++ b/include/configs/socfpga_de0_nano_soc.h @@ -18,10 +18,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Ethernet on SoC (EMAC) */ -#if defined(CONFIG_CMD_NET) -#define CONFIG_PHY_MICREL -#define CONFIG_PHY_MICREL_KSZ9031 -#endif /* The rest of the configuration is shared */ #include <configs/socfpga_common.h> diff --git a/include/configs/socfpga_de10_nano.h b/include/configs/socfpga_de10_nano.h index 04be2b1..bb50fcf 100644 --- a/include/configs/socfpga_de10_nano.h +++ b/include/configs/socfpga_de10_nano.h @@ -18,10 +18,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Ethernet on SoC (EMAC) */ -#if defined(CONFIG_CMD_NET) -#define CONFIG_PHY_MICREL -#define CONFIG_PHY_MICREL_KSZ9031 -#endif /* The rest of the configuration is shared */ #include <configs/socfpga_common.h> diff --git a/include/configs/socfpga_de1_soc.h b/include/configs/socfpga_de1_soc.h index 9405083..05975c9 100644 --- a/include/configs/socfpga_de1_soc.h +++ b/include/configs/socfpga_de1_soc.h @@ -18,10 +18,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Ethernet on SoC (EMAC) */ -#if defined(CONFIG_CMD_NET) -#define CONFIG_PHY_MICREL -#define CONFIG_PHY_MICREL_KSZ9021 -#endif /* The rest of the configuration is shared */ #include <configs/socfpga_common.h> diff --git a/include/configs/socfpga_is1.h b/include/configs/socfpga_is1.h index febb8f7..6d12aed 100644 --- a/include/configs/socfpga_is1.h +++ b/include/configs/socfpga_is1.h @@ -25,8 +25,6 @@ #define CONFIG_ARP_TIMEOUT 500UL /* PHY */ -#define CONFIG_PHY_MICREL -#define CONFIG_PHY_MICREL_KSZ9021 #endif /* The rest of the configuration is shared */ diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h index 57de60e..b4f31c4 100644 --- a/include/configs/socfpga_sockit.h +++ b/include/configs/socfpga_sockit.h @@ -18,10 +18,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Ethernet on SoC (EMAC) */ -#if defined(CONFIG_CMD_NET) -#define CONFIG_PHY_MICREL -#define CONFIG_PHY_MICREL_KSZ9021 -#endif /* The rest of the configuration is shared */ #include <configs/socfpga_common.h> diff --git a/include/configs/socfpga_socrates.h b/include/configs/socfpga_socrates.h index 6b6cb6a..ebb9ac5 100644 --- a/include/configs/socfpga_socrates.h +++ b/include/configs/socfpga_socrates.h @@ -18,10 +18,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Ethernet on SoC (EMAC) */ -#if defined(CONFIG_CMD_NET) -#define CONFIG_PHY_MICREL -#define CONFIG_PHY_MICREL_KSZ9021 -#endif /* The rest of the configuration is shared */ #include <configs/socfpga_common.h> diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h index a86043f..b54097c 100644 --- a/include/configs/socfpga_vining_fpga.h +++ b/include/configs/socfpga_vining_fpga.h @@ -41,8 +41,6 @@ #if defined(CONFIG_CMD_NET) #define CONFIG_BOOTP_SEND_HOSTNAME /* PHY */ -#define CONFIG_PHY_MICREL -#define CONFIG_PHY_MICREL_KSZ9021 #endif /* Extra Environment */ diff --git a/include/configs/stout.h b/include/configs/stout.h index 3b8806d..9422c04 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -55,8 +55,6 @@ #define CONFIG_SH_ETHER_ALIGNE_SIZE 64 #define CONFIG_SH_ETHER_CACHE_WRITEBACK #define CONFIG_SH_ETHER_CACHE_INVALIDATE -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h index 0ac262e..3b5831d 100644 --- a/include/configs/stv0991.h +++ b/include/configs/stv0991.h @@ -49,7 +49,6 @@ #define CONFIG_MII #define CONFIG_DW_ALTDESCRIPTOR -#define CONFIG_PHY_MICREL /* Command support defines */ #define CONFIG_PHY_RESET_DELAY 10000 /* in usec */ diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 681c91c..170d2ab 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -296,7 +296,6 @@ extern int soft_i2c_gpio_scl; #ifdef CONFIG_SUNXI_EMAC #define CONFIG_PHY_ADDR 1 #define CONFIG_MII /* MII PHY management */ -#define CONFIG_PHYLIB #endif #ifdef CONFIG_SUNXI_GMAC diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 7e1c58f..5a7ef75 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -87,7 +87,6 @@ /* Ethernet */ #define CONFIG_MACB -#define CONFIG_PHYLIB #define CONFIG_RMII #define CONFIG_AT91_WANTS_COMMON_PHY diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 4baccdc..5271b5c 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -59,7 +59,6 @@ #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 4 -#define CONFIG_PHYLIB #define CONFIG_PHY_ATHEROS /* Framebuffer */ diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index b5f8177..99650de 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -179,7 +179,6 @@ #define CONFIG_BOOTP_SUBNETMASK #define CONFIG_NET_RETRY_COUNT 10 #define CONFIG_PHY_GIGE -#define CONFIG_PHYLIB #define CONFIG_PHY_ET1011C #define CONFIG_PHY_ET1011C_TX_CLK_FIX diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 26290ef..03e28fc 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -97,7 +97,6 @@ #endif /* Network Configuration */ -#define CONFIG_PHYLIB #define CONFIG_PHY_MARVELL #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 606da4a..3fb63f3 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -45,9 +45,6 @@ #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_FEC_MXC_PHYADDR 4 -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL -#define CONFIG_PHY_MICREL_KSZ9021 /* USB Configs */ #define CONFIG_MXC_USB_PORT 1 diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index b5b7157..8cc0018 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -81,7 +81,6 @@ #define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_PHYLIB #define CONFIG_MII #define CONFIG_ARP_TIMEOUT 200UL diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h index 69e9079..9c7e5a4 100644 --- a/include/configs/tqma6_mba6.h +++ b/include/configs/tqma6_mba6.h @@ -14,8 +14,6 @@ #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 0x03 -#define CONFIG_PHY_MICREL -#define CONFIG_PHY_KSZ9031 #define CONFIG_MXC_UART_BASE UART2_BASE #define CONSOLE_DEV "ttymxc1" diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h index 959db5f..0219376 100644 --- a/include/configs/ts4800.h +++ b/include/configs/ts4800.h @@ -61,7 +61,6 @@ * Eth Configs */ #define CONFIG_MII -#define CONFIG_PHYLIB #define CONFIG_PHY_SMSC #define CONFIG_FEC_MXC diff --git a/include/configs/udoo.h b/include/configs/udoo.h index d3fa5d7..26a1a6f 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -41,9 +41,6 @@ #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 6 -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL -#define CONFIG_PHY_MICREL_KSZ9031 #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h index 60b76ed..9b0a20d 100644 --- a/include/configs/udoo_neo.h +++ b/include/configs/udoo_neo.h @@ -112,7 +112,4 @@ #define CONFIG_FEC_XCV_TYPE RMII #define CONFIG_ETHPRIME "FEC0" -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL - #endif /* __CONFIG_H */ diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 04abe1e..6aaa4d1 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -59,8 +59,6 @@ #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_XCV_TYPE RMII #define CONFIG_FEC_MXC_PHYADDR 0 -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL /* QSPI Configs*/ diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h index 0fed7f3..77da9e5 100644 --- a/include/configs/vining_2000.h +++ b/include/configs/vining_2000.h @@ -72,7 +72,6 @@ #define CONFIG_FEC_XCV_TYPE RMII #define CONFIG_ETHPRIME "FEC" -#define CONFIG_PHYLIB #define CONFIG_PHY_ATHEROS #ifdef CONFIG_CMD_USB diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index a8a48a5..ed25f42 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -60,7 +60,6 @@ #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 1 -#define CONFIG_PHYLIB #define CONFIG_PHY_ATHEROS /* Framebuffer */ diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index dc8008c..f3eba9c 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -88,8 +88,6 @@ */ #define CONFIG_FEC_MXC #define IMX_FEC_BASE FEC_BASE_ADDR -#define CONFIG_PHYLIB -#define CONFIG_PHY_MICREL #define CONFIG_FEC_MXC_PHYADDR 0x1 #define CONFIG_MII diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 0ac7b85..f7a3df1 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -57,7 +57,6 @@ #define CONFIG_PHY_SMSC #define CONFIG_LPC32XX_ETH -#define CONFIG_PHYLIB #define CONFIG_PHY_ADDR 0 #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN /* FIXME: remove "Waiting for PHY auto negotiation to complete..." message */ diff --git a/include/configs/x600.h b/include/configs/x600.h index a8435d8..e3e95b9 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -75,8 +75,6 @@ #define CONFIG_PHY_RESET_DELAY 10000 /* in usec */ #define CONFIG_PHY_ADDR 0 /* PHY address */ #define CONFIG_PHY_GIGE /* Include GbE speed/duplex detection */ -#define CONFIG_PHY_MICREL -#define CONFIG_PHY_MICREL_KSZ9031 #define CONFIG_SPEAR_GPIO diff --git a/include/configs/xpress.h b/include/configs/xpress.h index 629e3df..fdb504d 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -75,7 +75,6 @@ #define CONFIG_FEC_MXC_PHYADDR 0x0 #define CONFIG_FEC_XCV_TYPE RMII #define CONFIG_ETHPRIME "FEC" -#define CONFIG_PHYLIB #define CONFIG_PHY_SMSC #define CONFIG_IMX_THERMAL diff --git a/include/configs/zc5601.h b/include/configs/zc5601.h index 61c6a60..f71cdfb 100644 --- a/include/configs/zc5601.h +++ b/include/configs/zc5601.h @@ -25,7 +25,6 @@ #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 0x10 -#define CONFIG_PHYLIB #define CONFIG_FEC_FIXED_SPEED 1000 /* No autoneg, fix Gb */ #endif /*__EL6Q_CONFIG_H */ diff --git a/include/net.h b/include/net.h index 2eaa882..e126948 100644 --- a/include/net.h +++ b/include/net.h @@ -308,7 +308,7 @@ struct ethernet_hdr { u8 et_dest[ARP_HLEN]; /* Destination node */ u8 et_src[ARP_HLEN]; /* Source node */ u16 et_protlen; /* Protocol or length */ -}; +} __attribute__((packed)); /* Ethernet header size */ #define ETHER_HDR_SIZE (sizeof(struct ethernet_hdr)) @@ -326,7 +326,7 @@ struct e802_hdr { u8 et_snap2; u8 et_snap3; u16 et_prot; /* 802 protocol */ -}; +} __attribute__((packed)); /* 802 + SNAP + ethernet header size */ #define E802_HDR_SIZE (sizeof(struct e802_hdr)) @@ -340,7 +340,7 @@ struct vlan_ethernet_hdr { u16 vet_vlan_type; /* PROT_VLAN */ u16 vet_tag; /* TAG of VLAN */ u16 vet_type; /* protocol type */ -}; +} __attribute__((packed)); /* VLAN Ethernet header size */ #define VLAN_ETHER_HDR_SIZE (sizeof(struct vlan_ethernet_hdr)) @@ -369,7 +369,7 @@ struct ip_hdr { u16 ip_sum; /* checksum */ struct in_addr ip_src; /* Source IP address */ struct in_addr ip_dst; /* Destination IP address */ -}; +} __attribute__((packed)); #define IP_OFFS 0x1fff /* ip offset *= 8 */ #define IP_FLAGS 0xe000 /* first 3 bits */ @@ -397,7 +397,7 @@ struct ip_udp_hdr { u16 udp_dst; /* UDP destination port */ u16 udp_len; /* Length of UDP packet */ u16 udp_xsum; /* Checksum */ -}; +} __attribute__((packed)); #define IP_UDP_HDR_SIZE (sizeof(struct ip_udp_hdr)) #define UDP_HDR_SIZE (IP_UDP_HDR_SIZE - IP_HDR_SIZE) @@ -435,7 +435,7 @@ struct arp_hdr { u8 ar_tha[]; /* Target hardware address */ u8 ar_tpa[]; /* Target protocol address */ #endif /* 0 */ -}; +} __attribute__((packed)); #define ARP_HDR_SIZE (8+20) /* Size assuming ethernet */ @@ -470,7 +470,7 @@ struct icmp_hdr { } frag; u8 data[0]; } un; -}; +} __attribute__((packed)); #define ICMP_HDR_SIZE (sizeof(struct icmp_hdr)) #define IP_ICMP_HDR_SIZE (IP_HDR_SIZE + ICMP_HDR_SIZE) diff --git a/include/phy.h b/include/phy.h index 4f2094b..a0b1f12 100644 --- a/include/phy.h +++ b/include/phy.h @@ -266,7 +266,8 @@ int phy_davicom_init(void); int phy_et1011c_init(void); int phy_lxt_init(void); int phy_marvell_init(void); -int phy_micrel_init(void); +int phy_micrel_ksz8xxx_init(void); +int phy_micrel_ksz90x1_init(void); int phy_natsemi_init(void); int phy_realtek_init(void); int phy_smsc_init(void); |