| Message ID | 1504279437-11341-1-git-send-email-jteki@openedev.com |
|---|---|
| State | Accepted |
| Commit | 6ff005cf19363382fc867d7876a75fd8a386e894 |
| Delegated to: | Jagannadha Sutradharudu Teki |
| Headers | show |
| Series | [U-Boot,v2] sunxi: Fix CONFIG_SUNXI_GMAC references | expand |
On Fri, Sep 1, 2017 at 8:53 PM, Jagan Teki <jagannadh.teki@gmail.com> wrote: > From: Dave Prue <dave@prue.com> > > SUNXI_GMAC was still used to configure the code where as the > same has been renamed and moved to Kconfig in below commit > "sunxi: Move SUNXI_GMAC to Kconfig" > (sha1: 4d43d065db3262f9a9918ba72457bf36dfb8e0bb) > > Signed-off-by: Dave Prue <dave@prue.com> > Reviewed-by: Simon Glass <sjg@chromium.org> > Reviewed-by: Jagan Teki <jagan@openedev.com> > Reviewed-by: Mark Kettenis <kettenis@openbsd.org> > Tested-by: Mark Kettenis <kettenis@openbsd.org> > [Tweek commit message, config_whitelist.txt, build-whitelist.sh] > Signed-off-by: Jagan Teki <jagan@openedev.com> Applied to u-boot-sunxi/master thanks!
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 f4411f0..526cb72 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 212862a..1373b1f 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 7d8160d..6feb9b6 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 d871095..4651bb5 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -2307,7 +2307,6 @@ CONFIG_STV0991_HZ_CLOCK CONFIG_ST_SMI CONFIG_SUNXI_AHCI CONFIG_SUNXI_EMAC -CONFIG_SUNXI_GMAC CONFIG_SUNXI_GPIO CONFIG_SUNXI_MAX_FB_SIZE CONFIG_SUNXI_USB_PHYS