> From: Lionel Koenig <lionel.koe...@gmail.com>
> Date: Thu, 31 Aug 2017 19:21:01 +0200
>
> Following 4d43d065db3262f9a9918ba72457bf36dfb8e0bb,
> SUNXI_GMAC was still used to configure the code while
> SUN7I_GMAC was used in the configuration tools.
>
> Signed-off-by: Lionel Koenig <lionel.koe...@gmail.com>
Reviewed-by: Mark Kettenis <kette...@openbsd.org>
This is fixes an annoying regression in on Allwinner A20 boards. So
it would be good if this can be fixed ASAP.
> ---
> arch/arm/include/asm/arch-sunxi/sys_proto.h | 2 +-
> board/sunxi/Makefile | 2 +-
> include/configs/sunxi-common.h | 2 +-
> scripts/build-whitelist.sh | 4 ++--
> scripts/config_whitelist.txt | 2 +-
> 5 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/include/asm/arch-sunxi/sys_proto.h
> b/arch/arm/include/asm/arch-sunxi/sys_proto.h
> index a373319a2b..096510b787 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 f4411f01c3..526cb72a51 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
> ifndef CONFIG_SPL_BUILD
> obj-$(CONFIG_SUNXI_AHCI) += ahci.o
> endif
> diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
> index 212862acd1..1373b1f037 100644
> --- a/include/configs/sunxi-common.h
> +++ b/include/configs/sunxi-common.h
> @@ -294,7 +294,7 @@ extern int soft_i2c_gpio_scl;
> #define CONFIG_MII /* MII PHY management */
> #endif
>
> -#ifdef CONFIG_SUNXI_GMAC
> +#ifdef CONFIG_SUN7I_GMAC
> #define CONFIG_PHY_ADDR 1
> #define CONFIG_MII /* MII PHY management */
> #define CONFIG_PHY_REALTEK
> diff --git a/scripts/build-whitelist.sh b/scripts/build-whitelist.sh
> index 7d8160d5f2..6feb9b67cf 100755
> --- a/scripts/build-whitelist.sh
> +++ b/scripts/build-whitelist.sh
> @@ -13,10 +13,10 @@ export LC_ALL=C LC_COLLATE=C
> # There are two independent greps. The first pulls out the component parts
> # of CONFIG_SYS_EXTRA_OPTIONS. An example is:
> #
> -# SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8)
> +# SUN7I_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 d8710958a3..19416dddca 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -2307,7 +2307,7 @@ CONFIG_STV0991_HZ_CLOCK
> CONFIG_ST_SMI
> CONFIG_SUNXI_AHCI
> CONFIG_SUNXI_EMAC
> -CONFIG_SUNXI_GMAC
> +CONFIG_SUN7I_GMAC
> CONFIG_SUNXI_GPIO
> CONFIG_SUNXI_MAX_FB_SIZE
> CONFIG_SUNXI_USB_PHYS
> --
> 2.14.1
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot
>
>
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
