Hi,
On Wed, Jul 26, 2017 at 07:26:26PM +0800, Dave Prue wrote:
> GMAC Initialization for sun7i targets has been broken since v2017.05-rc3
> due to the renaming of CONFIG_SUNXI_GMAC to CONFIG_SUN7I_GMAC in Kconfig
> without propogating the name change throughout the code.
>
> Signed-off-by: Dave Prue <d...@prue.com>
> ---
>
> arch/arm/include/asm/arch-sunxi/sys_proto.h | 2 +-
> board/sunxi/Makefile | 2 +-
> include/configs/sunxi-common.h | 2 +-
> scripts/build-whitelist.sh | 2 +-
> scripts/config_whitelist.txt | 2 +-
> 5 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/include/asm/arch-sunxi/sys_proto.h
> b/arch/arm/include/asm/arch-sunxi/sys_proto.h
> index a373319..096510b 100644
> --- a/arch/arm/include/asm/arch-sunxi/sys_proto.h
> +++ b/arch/arm/include/asm/arch-sunxi/sys_proto.h
> @@ -24,7 +24,7 @@ void sdelay(unsigned long);
> void return_to_fel(uint32_t lr, uint32_t sp);
>
> /* Board / SoC level designware gmac init */
> -#if !defined CONFIG_SPL_BUILD && defined CONFIG_SUNXI_GMAC
> +#if !defined CONFIG_SPL_BUILD && defined CONFIG_SUN7I_GMAC
> void eth_init_board(void);
> #else
> static inline void eth_init_board(void) {}
> diff --git a/board/sunxi/Makefile b/board/sunxi/Makefile
> index 43766e0..34a2786 100644
> --- a/board/sunxi/Makefile
> +++ b/board/sunxi/Makefile
> @@ -9,7 +9,7 @@
> # SPDX-License-Identifier: GPL-2.0+
> #
> obj-y += board.o
> -obj-$(CONFIG_SUNXI_GMAC) += gmac.o
> +obj-$(CONFIG_SUN7I_GMAC) += gmac.o
> obj-$(CONFIG_SUNXI_AHCI) += ahci.o
> obj-$(CONFIG_MACH_SUN4I) += dram_sun4i_auto.o
> obj-$(CONFIG_MACH_SUN5I) += dram_sun5i_auto.o
> diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
> index 9b514ff..93e0281 100644
> --- a/include/configs/sunxi-common.h
> +++ b/include/configs/sunxi-common.h
> @@ -300,7 +300,7 @@ extern int soft_i2c_gpio_scl;
> #define CONFIG_PHYLIB
> #endif
>
> -#ifdef CONFIG_SUNXI_GMAC
> +#ifdef CONFIG_SUN7I_GMAC
> #define CONFIG_PHY_GIGE /* GMAC can use gigabit PHY
> */
> #define CONFIG_PHY_ADDR 1
> #define CONFIG_MII /* MII PHY management */
> diff --git a/scripts/build-whitelist.sh b/scripts/build-whitelist.sh
> index f169eaa..8e0496b 100755
> --- a/scripts/build-whitelist.sh
> +++ b/scripts/build-whitelist.sh
> @@ -16,7 +16,7 @@ export LC_ALL=C LC_COLLATE=C
> # SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8)
> #
> # We want this to produce:
> -# CONFIG_SUNXI_GMAC
> +# CONFIG_SUN7I_GMAC
> # CONFIG_AHCI
> # CONFIG_SATAPWR
> #
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index c8cf428..8c13e4d 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -2696,7 +2696,7 @@ CONFIG_STV0991_HZ_CLOCK
> CONFIG_ST_SMI
> CONFIG_SUNXI_AHCI
> CONFIG_SUNXI_EMAC
> -CONFIG_SUNXI_GMAC
> +CONFIG_SUN7I_GMACThese two shouldn't be needed anymore, it has been converted to KConfig entirely. maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
signature.asc
Description: PGP signature
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
