From: Nobuhiro Iwamatsu Date: Fri, 1 Dec 2017 07:08:03 +0000 (+0900) Subject: net: sh-eth: Add to Kconfig and convert X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=dcd18eaf6147c0c69d510883ee08ed1971c5b979;p=u-boot.git net: sh-eth: Add to Kconfig and convert This adds SH_ETHER to drivers/net/Kconfig and convert to Kconfig. Signed-off-by: Nobuhiro Iwamatsu Acked-by: Joe Hershberger --- diff --git a/configs/alt_defconfig b/configs/alt_defconfig index bf51e5388c..157d830ff1 100644 --- a/configs/alt_defconfig +++ b/configs/alt_defconfig @@ -24,7 +24,8 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHYLIB=y +CONFIG_NETDEVICES=y +CONFIG_SH_ETHER=y CONFIG_PHY_MICREL=y CONFIG_BAUDRATE=38400 CONFIG_SCIF_CONSOLE=y diff --git a/configs/ap_sh4a_4a_defconfig b/configs/ap_sh4a_4a_defconfig index ef14121273..976680aa51 100644 --- a/configs/ap_sh4a_4a_defconfig +++ b/configs/ap_sh4a_4a_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_PING=y # CONFIG_CMD_MISC is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y -CONFIG_PHYLIB=y +CONFIG_NETDEVICES=y +CONFIG_SH_ETHER=y CONFIG_SCIF_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/armadillo-800eva_defconfig b/configs/armadillo-800eva_defconfig index d9a5169905..14d6c843ae 100644 --- a/configs/armadillo-800eva_defconfig +++ b/configs/armadillo-800eva_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_PING=y # CONFIG_CMD_MISC is not set CONFIG_ENV_IS_IN_FLASH=y # CONFIG_MMC is not set -CONFIG_PHYLIB=y +CONFIG_NETDEVICES=y +CONFIG_SH_ETHER=y CONFIG_SCIF_CONSOLE=y CONFIG_OF_LIBFDT=y diff --git a/configs/ecovec_defconfig b/configs/ecovec_defconfig index 5d65e9dc30..5c6c55fdb8 100644 --- a/configs/ecovec_defconfig +++ b/configs/ecovec_defconfig @@ -29,7 +29,8 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y -CONFIG_PHYLIB=y +CONFIG_NETDEVICES=y +CONFIG_SH_ETHER=y CONFIG_SCIF_CONSOLE=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/espt_defconfig b/configs/espt_defconfig index 520bc9fa53..32ba9d0f6e 100644 --- a/configs/espt_defconfig +++ b/configs/espt_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_PING=y # CONFIG_CMD_MISC is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y -CONFIG_PHYLIB=y +CONFIG_NETDEVICES=y +CONFIG_SH_ETHER=y CONFIG_SCIF_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/gose_defconfig b/configs/gose_defconfig index bc3299033a..5f10d9a304 100644 --- a/configs/gose_defconfig +++ b/configs/gose_defconfig @@ -24,8 +24,9 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_NETDEVICES=y +CONFIG_SH_ETHER=y CONFIG_BAUDRATE=38400 CONFIG_SCIF_CONSOLE=y CONFIG_USB=y diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig index 5def33bac3..acc7289139 100644 --- a/configs/koelsch_defconfig +++ b/configs/koelsch_defconfig @@ -24,8 +24,9 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_NETDEVICES=y +CONFIG_SH_ETHER=y CONFIG_BAUDRATE=38400 CONFIG_SCIF_CONSOLE=y CONFIG_USB=y diff --git a/configs/lager_defconfig b/configs/lager_defconfig index 5072045e89..c0778ee824 100644 --- a/configs/lager_defconfig +++ b/configs/lager_defconfig @@ -24,8 +24,9 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_NETDEVICES=y +CONFIG_SH_ETHER=y CONFIG_BAUDRATE=38400 CONFIG_SCIF_CONSOLE=y CONFIG_USB=y diff --git a/configs/porter_defconfig b/configs/porter_defconfig index ac36dca972..7374a30ed2 100644 --- a/configs/porter_defconfig +++ b/configs/porter_defconfig @@ -24,8 +24,9 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_NETDEVICES=y +CONFIG_SH_ETHER=y CONFIG_BAUDRATE=38400 CONFIG_SCIF_CONSOLE=y CONFIG_USB=y diff --git a/configs/r0p7734_defconfig b/configs/r0p7734_defconfig index e0b19bbb7f..342365d8c5 100644 --- a/configs/r0p7734_defconfig +++ b/configs/r0p7734_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_PING=y # CONFIG_CMD_MISC is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y -CONFIG_PHYLIB=y +CONFIG_NETDEVICES=y +CONFIG_SH_ETHER=y CONFIG_SCIF_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/sh7752evb_defconfig b/configs/sh7752evb_defconfig index 3152859071..9e4f5aac32 100644 --- a/configs/sh7752evb_defconfig +++ b/configs/sh7752evb_defconfig @@ -34,6 +34,7 @@ CONFIG_MMC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_STMICRO=y -CONFIG_PHYLIB=y +CONFIG_NETDEVICES=y +CONFIG_SH_ETHER=y CONFIG_SCIF_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/sh7753evb_defconfig b/configs/sh7753evb_defconfig index 259d6a7e3d..631f241af0 100644 --- a/configs/sh7753evb_defconfig +++ b/configs/sh7753evb_defconfig @@ -33,6 +33,7 @@ CONFIG_MMC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_STMICRO=y -CONFIG_PHYLIB=y +CONFIG_NETDEVICES=y +CONFIG_SH_ETHER=y CONFIG_SCIF_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/sh7757lcr_defconfig b/configs/sh7757lcr_defconfig index b2e7362e2f..c7e30af0bd 100644 --- a/configs/sh7757lcr_defconfig +++ b/configs/sh7757lcr_defconfig @@ -33,6 +33,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_MMC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y -CONFIG_PHYLIB=y +CONFIG_NETDEVICES=y +CONFIG_SH_ETHER=y CONFIG_SCIF_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/sh7763rdp_defconfig b/configs/sh7763rdp_defconfig index 693a873ddd..a211e4c897 100644 --- a/configs/sh7763rdp_defconfig +++ b/configs/sh7763rdp_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_JFFS2=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y -CONFIG_PHYLIB=y +CONFIG_NETDEVICES=y +CONFIG_SH_ETHER=y CONFIG_SCIF_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/silk_defconfig b/configs/silk_defconfig index 8af1e19d13..ffe1d8b784 100644 --- a/configs/silk_defconfig +++ b/configs/silk_defconfig @@ -24,8 +24,9 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_NETDEVICES=y +CONFIG_SH_ETHER=y CONFIG_BAUDRATE=38400 CONFIG_SCIF_CONSOLE=y CONFIG_USB=y diff --git a/configs/stout_defconfig b/configs/stout_defconfig index b6e71e7186..6750dcdd79 100644 --- a/configs/stout_defconfig +++ b/configs/stout_defconfig @@ -24,8 +24,9 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_NETDEVICES=y +CONFIG_SH_ETHER=y CONFIG_BAUDRATE=38400 CONFIG_SCIF_CONSOLE=y CONFIG_USB=y diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index c47d59c249..de1947ccc1 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -276,6 +276,12 @@ config SUN8I_EMAC It can be found in H3/A64/A83T based SoCs and compatible with both External and Internal PHYs. +config SH_ETHER + bool "Renesas SH Ethernet MAC" + select PHYLIB + help + This driver supports the Ethernet for Renesas SH and ARM SoCs. + config XILINX_AXIEMAC depends on DM_ETH && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP) select PHYLIB diff --git a/include/configs/alt.h b/include/configs/alt.h index 35518da625..e35ddc8ed8 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -44,7 +44,6 @@ #define CONFIG_SPI_FLASH_QUAD /* SH Ether */ -#define CONFIG_SH_ETHER #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 0x1 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h index 37aaec30c5..2a01000803 100644 --- a/include/configs/ap_sh4a_4a.h +++ b/include/configs/ap_sh4a_4a.h @@ -18,7 +18,6 @@ #undef CONFIG_SHOW_BOOT_PROGRESS /* Ether */ -#define CONFIG_SH_ETHER 1 #define CONFIG_SH_ETHER_USE_PORT (0) #define CONFIG_SH_ETHER_PHY_ADDR (0x0) #define CONFIG_SH_ETHER_PHY_MODE (PHY_INTERFACE_MODE_GMII) diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 66ae76b2d2..94aecb7de1 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -88,7 +88,6 @@ #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE) /* SH Ether */ -#define CONFIG_SH_ETHER #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 0x0 #define CONFIG_SH_ETHER_BASE_ADDR 0xe9a00000 diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h index c6fb59f753..32d679d019 100644 --- a/include/configs/ecovec.h +++ b/include/configs/ecovec.h @@ -44,7 +44,6 @@ #define CONFIG_SH_I2C_CLOCK 41666666 /* Ether */ -#define CONFIG_SH_ETHER 1 #define CONFIG_SH_ETHER_USE_PORT (0) #define CONFIG_SH_ETHER_PHY_ADDR (0x1f) #define CONFIG_PHY_SMSC 1 diff --git a/include/configs/espt.h b/include/configs/espt.h index a5ac8cb584..65221fce8e 100644 --- a/include/configs/espt.h +++ b/include/configs/espt.h @@ -77,7 +77,6 @@ #define CONFIG_SYS_TMU_CLK_DIV 4 /* Ether */ -#define CONFIG_SH_ETHER 1 #define CONFIG_SH_ETHER_USE_PORT (1) #define CONFIG_SH_ETHER_PHY_ADDR (0x00) #define CONFIG_BITBANGMII diff --git a/include/configs/gose.h b/include/configs/gose.h index 610ba1a7ac..fab0edd5e6 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -44,7 +44,6 @@ #define CONFIG_SH_QSPI /* SH Ether */ -#define CONFIG_SH_ETHER #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 0x1 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index b9214d2f34..c449e43f95 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -44,7 +44,6 @@ #define CONFIG_SH_QSPI /* SH Ether */ -#define CONFIG_SH_ETHER #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 0x1 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII diff --git a/include/configs/lager.h b/include/configs/lager.h index 291b03c50b..000e5cd8f3 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -44,7 +44,6 @@ #define CONFIG_SH_QSPI /* SH Ether */ -#define CONFIG_SH_ETHER #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 0x1 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII diff --git a/include/configs/porter.h b/include/configs/porter.h index 451d9dd66f..10dce6b476 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -45,7 +45,6 @@ #define CONFIG_SPI_FLASH_QUAD /* SH Ether */ -#define CONFIG_SH_ETHER #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 0x1 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h index 9258a3bcde..f9800ec168 100644 --- a/include/configs/r0p7734.h +++ b/include/configs/r0p7734.h @@ -18,7 +18,6 @@ #undef CONFIG_SHOW_BOOT_PROGRESS /* Ether */ -#define CONFIG_SH_ETHER 1 #define CONFIG_SH_ETHER_USE_PORT (0) #define CONFIG_SH_ETHER_PHY_ADDR (0x0) #define CONFIG_PHY_SMSC 1 diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index 2f81cc5bf9..ee57eb2fd1 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -47,7 +47,6 @@ #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024) /* Ether */ -#define CONFIG_SH_ETHER 1 #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 18 #define CONFIG_SH_ETHER_CACHE_WRITEBACK 1 diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h index bcb85a6bd8..e7f9f61974 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -47,7 +47,6 @@ #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024) /* Ether */ -#define CONFIG_SH_ETHER 1 #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 18 #define CONFIG_SH_ETHER_CACHE_WRITEBACK 1 diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index bee1a1da51..a2b3307804 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -48,7 +48,6 @@ #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024) /* Ether */ -#define CONFIG_SH_ETHER 1 #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 1 #define CONFIG_SH_ETHER_CACHE_WRITEBACK 1 diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h index 0598b25154..de4a587914 100644 --- a/include/configs/sh7763rdp.h +++ b/include/configs/sh7763rdp.h @@ -77,7 +77,6 @@ #define CONFIG_SYS_TMU_CLK_DIV (4) /* 4 (default), 16, 64, 256 or 1024 */ /* Ether */ -#define CONFIG_SH_ETHER 1 #define CONFIG_SH_ETHER_USE_PORT (1) #define CONFIG_SH_ETHER_PHY_ADDR (0x01) #define CONFIG_BITBANGMII diff --git a/include/configs/silk.h b/include/configs/silk.h index 0384325cb5..79a4f06c0b 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -45,7 +45,6 @@ #define CONFIG_SPI_FLASH_QUAD /* SH Ether */ -#define CONFIG_SH_ETHER #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 0x1 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII diff --git a/include/configs/stout.h b/include/configs/stout.h index 9422c042f3..789f364168 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -48,7 +48,6 @@ #define CONFIG_SPI_FLASH_QUAD /* SH Ether */ -#define CONFIG_SH_ETHER #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 0x1 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 4e87d66bea..394243b3d2 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1924,7 +1924,6 @@ CONFIG_SHOW_ACTIVITY CONFIG_SHOW_BOOT_PROGRESS CONFIG_SH_CMT_CLK_FREQ CONFIG_SH_DSP -CONFIG_SH_ETHER CONFIG_SH_ETHER_ALIGNE_SIZE CONFIG_SH_ETHER_BASE_ADDR CONFIG_SH_ETHER_CACHE_INVALIDATE