[U-Boot] [PATCH] sunxi: Fix CONFIG_SUNXI_GMAC references
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 dave@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_GMAC CONFIG_SUNXI_GPIO CONFIG_SUNXI_MAX_FB_SIZE CONFIG_SUNXI_USB_PHYS
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 dave@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_GMAC
These two shouldn't be needed anymore, it has been converted to KConfig entirely.
maxime
On 26 July 2017 at 05:26, Dave Prue dave@prue.com 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 dave@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(-)
Reviewed-by: Simon Glass sjg@chromium.org
On Sun, Aug 6, 2017 at 10:45 AM, Simon Glass sjg@chromium.org wrote:
On 26 July 2017 at 05:26, Dave Prue dave@prue.com 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 dave@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(-)
Reviewed-by: Simon Glass sjg@chromium.org
Reviewed-by: Jagan Teki jagan@openedev.com
thanks!
From: Jagan Teki jagannadh.teki@gmail.com Date: Mon, 7 Aug 2017 14:56:58 +0530
On Sun, Aug 6, 2017 at 10:45 AM, Simon Glass sjg@chromium.org wrote:
On 26 July 2017 at 05:26, Dave Prue dave@prue.com 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 dave@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(-)
Reviewed-by: Simon Glass sjg@chromium.org
Reviewed-by: Jagan Teki jagan@openedev.com
And makes the interface work again under OpenBSD, so:
Reviewed-by: Mark Kettenis kettenis@openbsd.org Tested-by: Mark Kettenis kettenis@openbsd.org
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Date: Mon, 7 Aug 2017 11:35:52 +0200 (CEST) From: Mark Kettenis mark.kettenis@xs4all.nl Cc: albert.u.boot@aribaud.net, jernej.skrabec@siol.net, u-boot@lists.denx.de, andre.przywara@arm.com, hdegoede@redhat.com, icenowy@aosc.xyz, maxime.ripard@free-electrons.com, jagan@openedev.com, afaerber@suse.de Sender: "U-Boot" u-boot-bounces@lists.denx.de X-XS4ALL-DNSBL-Checked: mxdrop302.xs4all.net checked 81.169.180.215 against DNS blacklists X-CNFS-Analysis: v=2.2 cv=V9A/6qvi c=1 sm=0 tr=0 a=ONADgqKa62I6zSSZ3CeWOA==:117 a=ONADgqKa62I6zSSZ3CeWOA==:17 a=IkcTkHD0fZMA:10 a=xqWC_Br6kY4A:10 a=KeKAF7QvOSUA:10 a=WiVod9pSvdkA:10 a=pGLkceISAAAA:8 a=cm27Pg_UAAAA:8 a=yTmaW2WvAAAA:8 a=8flm3ZimAAAA:8 a=3tcz3bTJAAAA:8 a=YfCOm-DyAAAA:8 a=ulZhkHzn2l8uUku_rLcA:9 a=QEXdDO2ut3YA:10 a=6kGIvZw6iX1k4Y-7sg4_:22 a=xmb-EsYY8bH0VWELuYED:22 a=JtT7V0wkIbYGGTrklAfD:22 a=bqseOZt422ZGMqA63K3A:22 a=4EbjBm0RLgFgoQzmu6QD:22 a=zQLMK8awuJ6_Hvp-_9Ux:22 X-Virus-Scanned: by XS4ALL Virus Scanner X-XS4ALL-Spam-Score: -0.5 () RP_MATCHES_RCVD, T_HEADER_FROM_DIFFERENT_DOMAINS X-XS4ALL-Spam: NO Envelope-To: mark.kettenis@xs4all.nl X-MIME-Autoconverted: from base64 to 8bit by sibelius.xs4all.nl id v779cZ2M003524
From: Jagan Teki jagannadh.teki@gmail.com Date: Mon, 7 Aug 2017 14:56:58 +0530
On Sun, Aug 6, 2017 at 10:45 AM, Simon Glass sjg@chromium.org wrote:
On 26 July 2017 at 05:26, Dave Prue dave@prue.com 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 dave@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(-)
Reviewed-by: Simon Glass sjg@chromium.org
Reviewed-by: Jagan Teki jagan@openedev.com
And makes the interface work again under OpenBSD, so:
Reviewed-by: Mark Kettenis kettenis@openbsd.org Tested-by: Mark Kettenis kettenis@openbsd.org
Actually the scripts/build-whitelist.sh change isn't right. It should also either be dropped or SUNXI_GMAC on the line above should be changed into SUN7I_GMAC. It's in a comment, but with the change the comment doesn't make sense anymore ;).
Am 07.08.2017 um 11:26 schrieb Jagan Teki:
On Sun, Aug 6, 2017 at 10:45 AM, Simon Glass sjg@chromium.org wrote:
On 26 July 2017 at 05:26, Dave Prue dave@prue.com wrote:
GMAC Initialization for sun7i targets has been broken since v2017.05-rc3
"initialization", but more importantly:
due to the renaming of CONFIG_SUNXI_GMAC to CONFIG_SUN7I_GMAC in Kconfig without propogating the name change throughout the code.
"propagating" please :)
Cheers, Andreas
Signed-off-by: Dave Prue dave@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(-)
Reviewed-by: Simon Glass sjg@chromium.org
Reviewed-by: Jagan Teki jagan@openedev.com
thanks!
participants (6)
-
Andreas Färber -
Dave Prue -
Jagan Teki -
Mark Kettenis -
Maxime Ripard -
Simon Glass