[U-Boot] [PATCH 3/3] sunxi: Convert SUNXI_GMAC to Kconfig
Jagan Teki
jagannadh.teki at gmail.com
Tue May 2 11:16:27 UTC 2017
On Mon, Feb 20, 2017 at 8:08 PM, Tom Rini <trini at konsulko.com> wrote:
> Migrate this option to Kconfig.
>
> Signed-off-by: Tom Rini <trini at konsulko.com>
> ---
> configs/A20-OLinuXino-Lime2_defconfig | 3 ++-
> configs/A20-OLinuXino-Lime_defconfig | 3 ++-
> configs/A20-OLinuXino_MICRO_defconfig | 3 ++-
> configs/A20-Olimex-SOM-EVB_defconfig | 3 ++-
> configs/Bananapi_defconfig | 3 ++-
> configs/Bananapro_defconfig | 3 ++-
> configs/CSQ_CS908_defconfig | 2 +-
> configs/Colombus_defconfig | 3 ++-
> configs/Cubieboard2_defconfig | 3 ++-
> configs/Cubietruck_defconfig | 3 ++-
> configs/Hummingbird_A31_defconfig | 3 ++-
> configs/Itead_Ibox_A20_defconfig | 3 ++-
> configs/Lamobo_R1_defconfig | 3 ++-
> configs/Linksprite_pcDuino3_Nano_defconfig | 3 ++-
> configs/Linksprite_pcDuino3_defconfig | 3 ++-
> configs/Mele_A1000G_quad_defconfig | 2 +-
> configs/Mele_I7_defconfig | 2 +-
> configs/Mele_M3_defconfig | 2 +-
> configs/Mele_M5_defconfig | 2 +-
> configs/Mele_M9_defconfig | 2 +-
> configs/Orangepi_defconfig | 3 ++-
> configs/Orangepi_mini_defconfig | 3 ++-
> configs/Sinlinx_SinA31s_defconfig | 2 +-
> configs/Sinovoip_BPI_M2_defconfig | 3 ++-
> configs/Wits_Pro_A20_DKT_defconfig | 3 ++-
> configs/i12-tvbox_defconfig | 3 ++-
> configs/icnova-a20-swac_defconfig | 3 ++-
> configs/mixtile_loftq_defconfig | 3 ++-
> drivers/net/Kconfig | 7 +++++++
> 29 files changed, 56 insertions(+), 28 deletions(-)
>
> diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
> index e9d7350..9b40c42 100644
> --- a/configs/A20-OLinuXino-Lime2_defconfig
> +++ b/configs/A20-OLinuXino-Lime2_defconfig
> @@ -9,7 +9,7 @@ CONFIG_USB0_VBUS_DET="PH5"
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,SATAPWR=SUNXI_GPC(3)"
> +CONFIG_SYS_EXTRA_OPTIONS="RGMII,SATAPWR=SUNXI_GPC(3)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -21,6 +21,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y
> # CONFIG_SPL_PARTITION_UUIDS is not set
> CONFIG_DFU_RAM=y
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_AXP_ALDO3_VOLT=2800
> CONFIG_AXP_ALDO4_VOLT=2800
> CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig
> index dea2e6b..4229811 100644
> --- a/configs/A20-OLinuXino-Lime_defconfig
> +++ b/configs/A20-OLinuXino-Lime_defconfig
> @@ -7,7 +7,7 @@ CONFIG_MMC0_CD_PIN="PH1"
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,SATAPWR=SUNXI_GPC(3)"
> +CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPC(3)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -16,6 +16,7 @@ CONFIG_SPL=y
> # CONFIG_SPL_ISO_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_AXP_ALDO3_VOLT=2800
> CONFIG_AXP_ALDO4_VOLT=2800
> CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig
> index 703aee1..2c83e08 100644
> --- a/configs/A20-OLinuXino_MICRO_defconfig
> +++ b/configs/A20-OLinuXino_MICRO_defconfig
> @@ -10,7 +10,7 @@ CONFIG_VIDEO_VGA=y
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,SATAPWR=SUNXI_GPB(8)"
> +CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPB(8)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -19,6 +19,7 @@ CONFIG_SPL=y
> # CONFIG_SPL_ISO_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_AXP_ALDO3_VOLT=2800
> CONFIG_AXP_ALDO4_VOLT=2800
> CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/A20-Olimex-SOM-EVB_defconfig b/configs/A20-Olimex-SOM-EVB_defconfig
> index a631815..f3ba2f1 100644
> --- a/configs/A20-Olimex-SOM-EVB_defconfig
> +++ b/configs/A20-Olimex-SOM-EVB_defconfig
> @@ -12,7 +12,7 @@ CONFIG_USB0_VBUS_DET="PH5"
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olimex-som-evb"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,SATAPWR=SUNXI_GPC(3)"
> +CONFIG_SYS_EXTRA_OPTIONS="RGMII,SATAPWR=SUNXI_GPC(3)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -21,6 +21,7 @@ CONFIG_SPL=y
> # CONFIG_SPL_ISO_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_AXP_ALDO3_VOLT=2800
> CONFIG_AXP_ALDO4_VOLT=2800
> CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig
> index 8fccea8..e2672e7 100644
> --- a/configs/Bananapi_defconfig
> +++ b/configs/Bananapi_defconfig
> @@ -8,7 +8,7 @@ CONFIG_GMAC_TX_DELAY=3
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapi"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23)"
> +CONFIG_SYS_EXTRA_OPTIONS="RGMII,MACPWR=SUNXI_GPH(23)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -18,4 +18,5 @@ CONFIG_SPL=y
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_NETCONSOLE=y
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/Bananapro_defconfig b/configs/Bananapro_defconfig
> index dda7080..0fa99d8 100644
> --- a/configs/Bananapro_defconfig
> +++ b/configs/Bananapro_defconfig
> @@ -10,7 +10,7 @@ CONFIG_GMAC_TX_DELAY=3
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapro"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23)"
> +CONFIG_SYS_EXTRA_OPTIONS="RGMII,MACPWR=SUNXI_GPH(23)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -20,5 +20,6 @@ CONFIG_SPL=y
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_NETCONSOLE=y
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_AXP_ALDO4_VOLT=2500
> CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/CSQ_CS908_defconfig b/configs/CSQ_CS908_defconfig
> index 953ec25..30b408a 100644
> --- a/configs/CSQ_CS908_defconfig
> +++ b/configs/CSQ_CS908_defconfig
> @@ -6,7 +6,6 @@ CONFIG_USB1_VBUS_PIN=""
> CONFIG_USB2_VBUS_PIN=""
> CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31s-cs908"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -15,6 +14,7 @@ CONFIG_SPL=y
> # CONFIG_SPL_ISO_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_AXP_ALDO1_VOLT=3300
> CONFIG_AXP_DLDO1_VOLT=3300
> CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig
> index ac283a2..5c96671 100644
> --- a/configs/Colombus_defconfig
> +++ b/configs/Colombus_defconfig
> @@ -16,7 +16,7 @@ CONFIG_VIDEO_LCD_PANEL_I2C_SCL="PA24"
> CONFIG_VIDEO_LCD_PANEL_EDP_4_LANE_1620M_VIA_ANX9804=y
> CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-colombus"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII"
> +CONFIG_SYS_EXTRA_OPTIONS="RGMII"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -25,5 +25,6 @@ CONFIG_SPL=y
> # CONFIG_SPL_ISO_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_AXP_ALDO1_VOLT=3300
> CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig
> index ca3c991..ddf9533 100644
> --- a/configs/Cubieboard2_defconfig
> +++ b/configs/Cubieboard2_defconfig
> @@ -7,7 +7,7 @@ CONFIG_MMC0_CD_PIN="PH1"
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubieboard2"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,SATAPWR=SUNXI_GPB(8)"
> +CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPB(8)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -16,4 +16,5 @@ CONFIG_SPL=y
> # CONFIG_SPL_ISO_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
> index 4ac1285..c1e953f 100644
> --- a/configs/Cubietruck_defconfig
> +++ b/configs/Cubietruck_defconfig
> @@ -12,7 +12,7 @@ CONFIG_GMAC_TX_DELAY=1
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubietruck"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,SATAPWR=SUNXI_GPH(12)"
> +CONFIG_SYS_EXTRA_OPTIONS="RGMII,SATAPWR=SUNXI_GPH(12)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -24,6 +24,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y
> # CONFIG_SPL_PARTITION_UUIDS is not set
> CONFIG_DFU_RAM=y
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_GADGET=y
> diff --git a/configs/Hummingbird_A31_defconfig b/configs/Hummingbird_A31_defconfig
> index c1cbbc8..d01361a 100644
> --- a/configs/Hummingbird_A31_defconfig
> +++ b/configs/Hummingbird_A31_defconfig
> @@ -8,7 +8,7 @@ CONFIG_VIDEO_VGA_VIA_LCD=y
> CONFIG_VIDEO_VGA_EXTERNAL_DAC_EN="PH25"
> CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-hummingbird"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII"
> +CONFIG_SYS_EXTRA_OPTIONS="RGMII"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -17,5 +17,6 @@ CONFIG_SPL=y
> # CONFIG_SPL_ISO_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_AXP_ALDO1_VOLT=3300
> CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/Itead_Ibox_A20_defconfig b/configs/Itead_Ibox_A20_defconfig
> index 7d0b8ed..8408fa6 100644
> --- a/configs/Itead_Ibox_A20_defconfig
> +++ b/configs/Itead_Ibox_A20_defconfig
> @@ -7,7 +7,7 @@ CONFIG_MMC0_CD_PIN="PH1"
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-itead-ibox"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,SATAPWR=SUNXI_GPB(8)"
> +CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPB(8)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -16,4 +16,5 @@ CONFIG_SPL=y
> # CONFIG_SPL_ISO_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/Lamobo_R1_defconfig b/configs/Lamobo_R1_defconfig
> index d37fa02..c35c313 100644
> --- a/configs/Lamobo_R1_defconfig
> +++ b/configs/Lamobo_R1_defconfig
> @@ -8,7 +8,7 @@ CONFIG_GMAC_TX_DELAY=4
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-lamobo-r1"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),SATAPWR=SUNXI_GPB(3)"
> +CONFIG_SYS_EXTRA_OPTIONS="RGMII,MACPWR=SUNXI_GPH(23),SATAPWR=SUNXI_GPB(3)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -17,4 +17,5 @@ CONFIG_SPL=y
> # CONFIG_SPL_ISO_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/Linksprite_pcDuino3_Nano_defconfig b/configs/Linksprite_pcDuino3_Nano_defconfig
> index 0663c46..a065c0b 100644
> --- a/configs/Linksprite_pcDuino3_Nano_defconfig
> +++ b/configs/Linksprite_pcDuino3_Nano_defconfig
> @@ -9,7 +9,7 @@ CONFIG_GMAC_TX_DELAY=3
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3-nano"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,SATAPWR=SUNXI_GPH(2)"
> +CONFIG_SYS_EXTRA_OPTIONS="RGMII,SATAPWR=SUNXI_GPH(2)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -18,4 +18,5 @@ CONFIG_SPL=y
> # CONFIG_SPL_ISO_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig
> index e116345..64971c0 100644
> --- a/configs/Linksprite_pcDuino3_defconfig
> +++ b/configs/Linksprite_pcDuino3_defconfig
> @@ -7,7 +7,7 @@ CONFIG_DRAM_ZQ=122
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,SATAPWR=SUNXI_GPH(2)"
> +CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPH(2)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -16,4 +16,5 @@ CONFIG_SPL=y
> # CONFIG_SPL_ISO_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/Mele_A1000G_quad_defconfig b/configs/Mele_A1000G_quad_defconfig
> index 8f03835..69c08ab 100644
> --- a/configs/Mele_A1000G_quad_defconfig
> +++ b/configs/Mele_A1000G_quad_defconfig
> @@ -7,7 +7,6 @@ CONFIG_USB1_VBUS_PIN="PC27"
> CONFIG_USB2_VBUS_PIN=""
> CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-mele-a1000g-quad"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -16,6 +15,7 @@ CONFIG_SPL=y
> # CONFIG_SPL_ISO_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_AXP_DCDC1_VOLT=3300
> CONFIG_AXP_ALDO1_VOLT=3300
> CONFIG_AXP_DLDO1_VOLT=3300
> diff --git a/configs/Mele_I7_defconfig b/configs/Mele_I7_defconfig
> index 572b521..60e4e42 100644
> --- a/configs/Mele_I7_defconfig
> +++ b/configs/Mele_I7_defconfig
> @@ -6,7 +6,6 @@ CONFIG_USB1_VBUS_PIN="PC27"
> CONFIG_USB2_VBUS_PIN=""
> CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-i7"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -15,6 +14,7 @@ CONFIG_SPL=y
> # CONFIG_SPL_ISO_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_AXP_DCDC1_VOLT=3300
> CONFIG_AXP_ALDO1_VOLT=3300
> CONFIG_AXP_DLDO1_VOLT=3300
> diff --git a/configs/Mele_M3_defconfig b/configs/Mele_M3_defconfig
> index 31e8aaf..8d25c2b 100644
> --- a/configs/Mele_M3_defconfig
> +++ b/configs/Mele_M3_defconfig
> @@ -9,7 +9,6 @@ CONFIG_VIDEO_VGA=y
> CONFIG_VIDEO_COMPOSITE=y
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m3"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -18,4 +17,5 @@ CONFIG_SPL=y
> # CONFIG_SPL_ISO_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/Mele_M5_defconfig b/configs/Mele_M5_defconfig
> index 6993894..1d359fe 100644
> --- a/configs/Mele_M5_defconfig
> +++ b/configs/Mele_M5_defconfig
> @@ -9,7 +9,6 @@ CONFIG_VIDEO_COMPOSITE=y
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m5"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -18,4 +17,5 @@ CONFIG_SPL=y
> # CONFIG_SPL_ISO_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/Mele_M9_defconfig b/configs/Mele_M9_defconfig
> index a9dc159..3d69f37 100644
> --- a/configs/Mele_M9_defconfig
> +++ b/configs/Mele_M9_defconfig
> @@ -6,7 +6,6 @@ CONFIG_USB1_VBUS_PIN="PC27"
> CONFIG_USB2_VBUS_PIN=""
> CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-m9"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -15,6 +14,7 @@ CONFIG_SPL=y
> # CONFIG_SPL_ISO_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_AXP_DCDC1_VOLT=3300
> CONFIG_AXP_ALDO1_VOLT=3300
> CONFIG_AXP_DLDO1_VOLT=3300
> diff --git a/configs/Orangepi_defconfig b/configs/Orangepi_defconfig
> index 6faad87..c162ecc 100644
> --- a/configs/Orangepi_defconfig
> +++ b/configs/Orangepi_defconfig
> @@ -11,7 +11,7 @@ CONFIG_GMAC_TX_DELAY=3
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23)"
> +CONFIG_SYS_EXTRA_OPTIONS="RGMII,MACPWR=SUNXI_GPH(23)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -20,4 +20,5 @@ CONFIG_SPL=y
> # CONFIG_SPL_ISO_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig
> index 0224ee7..7ac2c99 100644
> --- a/configs/Orangepi_mini_defconfig
> +++ b/configs/Orangepi_mini_defconfig
> @@ -13,7 +13,7 @@ CONFIG_GMAC_TX_DELAY=3
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi-mini"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23)"
> +CONFIG_SYS_EXTRA_OPTIONS="RGMII,MACPWR=SUNXI_GPH(23)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -22,4 +22,5 @@ CONFIG_SPL=y
> # CONFIG_SPL_ISO_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/Sinlinx_SinA31s_defconfig b/configs/Sinlinx_SinA31s_defconfig
> index 54c975a..78e8b7c 100644
> --- a/configs/Sinlinx_SinA31s_defconfig
> +++ b/configs/Sinlinx_SinA31s_defconfig
> @@ -10,7 +10,6 @@ CONFIG_USB1_VBUS_PIN=""
> CONFIG_USB2_VBUS_PIN=""
> CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31s-sina31s"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -19,5 +18,6 @@ CONFIG_SPL=y
> # CONFIG_SPL_ISO_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_AXP_DLDO1_VOLT=3300
> CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/Sinovoip_BPI_M2_defconfig b/configs/Sinovoip_BPI_M2_defconfig
> index dbff234..ed03f82 100644
> --- a/configs/Sinovoip_BPI_M2_defconfig
> +++ b/configs/Sinovoip_BPI_M2_defconfig
> @@ -6,7 +6,7 @@ CONFIG_USB1_VBUS_PIN=""
> CONFIG_USB2_VBUS_PIN=""
> CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31s-sinovoip-bpi-m2"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII"
> +CONFIG_SYS_EXTRA_OPTIONS="RGMII"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -15,6 +15,7 @@ CONFIG_SPL=y
> # CONFIG_SPL_ISO_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_AXP_ALDO1_VOLT=3300
> CONFIG_AXP_ALDO2_VOLT=1800
> CONFIG_AXP_DLDO1_VOLT=3000
> diff --git a/configs/Wits_Pro_A20_DKT_defconfig b/configs/Wits_Pro_A20_DKT_defconfig
> index 6385a79..0a32bfb 100644
> --- a/configs/Wits_Pro_A20_DKT_defconfig
> +++ b/configs/Wits_Pro_A20_DKT_defconfig
> @@ -12,7 +12,7 @@ CONFIG_VIDEO_LCD_PANEL_LVDS=y
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-wits-pro-a20-dkt"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII"
> +CONFIG_SYS_EXTRA_OPTIONS="RGMII"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -21,4 +21,5 @@ CONFIG_SPL=y
> # CONFIG_SPL_ISO_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/i12-tvbox_defconfig b/configs/i12-tvbox_defconfig
> index 8c35fe6..93ca65d 100644
> --- a/configs/i12-tvbox_defconfig
> +++ b/configs/i12-tvbox_defconfig
> @@ -6,7 +6,7 @@ CONFIG_DRAM_CLK=384
> CONFIG_VIDEO_COMPOSITE=y
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-i12-tvbox"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,MACPWR=SUNXI_GPH(21)"
> +CONFIG_SYS_EXTRA_OPTIONS="MACPWR=SUNXI_GPH(21)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -15,4 +15,5 @@ CONFIG_SPL=y
> # CONFIG_SPL_ISO_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/icnova-a20-swac_defconfig b/configs/icnova-a20-swac_defconfig
> index 5ef0e47..00b98d7 100644
> --- a/configs/icnova-a20-swac_defconfig
> +++ b/configs/icnova-a20-swac_defconfig
> @@ -13,7 +13,7 @@ CONFIG_VIDEO_LCD_POWER="PH22"
> CONFIG_VIDEO_LCD_PANEL_LVDS=y
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-icnova-swac"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,CMD_BMP"
> +CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,CMD_BMP"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> CONFIG_CMD_UNZIP=y
> @@ -23,4 +23,5 @@ CONFIG_CMD_UNZIP=y
> # CONFIG_SPL_ISO_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/mixtile_loftq_defconfig b/configs/mixtile_loftq_defconfig
> index ec6a438..d2d6b75 100644
> --- a/configs/mixtile_loftq_defconfig
> +++ b/configs/mixtile_loftq_defconfig
> @@ -7,7 +7,7 @@ CONFIG_USB1_VBUS_PIN="PH24"
> CONFIG_USB2_VBUS_PIN=""
> CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-mixtile-loftq"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPA(21)"
> +CONFIG_SYS_EXTRA_OPTIONS="RGMII,MACPWR=SUNXI_GPA(21)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> @@ -16,5 +16,6 @@ CONFIG_SPL=y
> # CONFIG_SPL_ISO_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SUNXI_GMAC=y
> CONFIG_AXP_ALDO1_VOLT=3300
> CONFIG_USB_EHCI_HCD=y
> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> index cdb0afc..d456143 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -177,6 +177,13 @@ config SUNXI_EMAC
> help
> This driver supports the Allwinner based SUN4I/SUN5I ethernet MAC.
>
> +config SUNXI_GMAC
> + bool "Allwinner sunxi gigabit ethernet MAC support"
> + depends on DM_ETH
> + help
> + This driver supports the Allwinner based SUN6I/SUN7I gigabit
> + ethernet MAC.
Since there is one more driver for 8I better to mention specifics on
bool something like
bool "Allwinner A31/A20 EMAC support"
thanks!
--
Jagan Teki
Free Software Engineer | www.openedev.com
U-Boot, Linux | Upstream Maintainer
Hyderabad, India.
More information about the U-Boot
mailing list