Skip to content
Snippets Groups Projects
Commit 6ff005cf authored by Dave Prue's avatar Dave Prue Committed by Jagan Teki
Browse files

sunxi: Fix CONFIG_SUNXI_GMAC references


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: 4d43d065)

Signed-off-by: default avatarDave Prue <dave@prue.com>
Reviewed-by: default avatarSimon Glass <sjg@chromium.org>
Reviewed-by: default avatarJagan Teki <jagan@openedev.com>
Reviewed-by: default avatarMark Kettenis <kettenis@openbsd.org>
Tested-by: default avatarMark Kettenis <kettenis@openbsd.org>
[Tweek commit message, config_whitelist.txt, build-whitelist.sh]
Signed-off-by: default avatarJagan Teki <jagan@openedev.com>
parent 8a647fc3
Branches
Tags
No related merge requests found
...@@ -24,7 +24,7 @@ void sdelay(unsigned long); ...@@ -24,7 +24,7 @@ void sdelay(unsigned long);
void return_to_fel(uint32_t lr, uint32_t sp); void return_to_fel(uint32_t lr, uint32_t sp);
/* Board / SoC level designware gmac init */ /* 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); void eth_init_board(void);
#else #else
static inline void eth_init_board(void) {} static inline void eth_init_board(void) {}
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
obj-y += board.o obj-y += board.o
obj-$(CONFIG_SUNXI_GMAC) += gmac.o obj-$(CONFIG_SUN7I_GMAC) += gmac.o
ifndef CONFIG_SPL_BUILD ifndef CONFIG_SPL_BUILD
obj-$(CONFIG_SUNXI_AHCI) += ahci.o obj-$(CONFIG_SUNXI_AHCI) += ahci.o
endif endif
......
...@@ -294,7 +294,7 @@ extern int soft_i2c_gpio_scl; ...@@ -294,7 +294,7 @@ extern int soft_i2c_gpio_scl;
#define CONFIG_MII /* MII PHY management */ #define CONFIG_MII /* MII PHY management */
#endif #endif
#ifdef CONFIG_SUNXI_GMAC #ifdef CONFIG_SUN7I_GMAC
#define CONFIG_PHY_ADDR 1 #define CONFIG_PHY_ADDR 1
#define CONFIG_MII /* MII PHY management */ #define CONFIG_MII /* MII PHY management */
#define CONFIG_PHY_REALTEK #define CONFIG_PHY_REALTEK
......
...@@ -13,10 +13,10 @@ export LC_ALL=C LC_COLLATE=C ...@@ -13,10 +13,10 @@ export LC_ALL=C LC_COLLATE=C
# There are two independent greps. The first pulls out the component parts # There are two independent greps. The first pulls out the component parts
# of CONFIG_SYS_EXTRA_OPTIONS. An example is: # 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: # We want this to produce:
# CONFIG_SUNXI_GMAC # CONFIG_SUN7I_GMAC
# CONFIG_AHCI # CONFIG_AHCI
# CONFIG_SATAPWR # CONFIG_SATAPWR
# #
......
...@@ -2307,7 +2307,6 @@ CONFIG_STV0991_HZ_CLOCK ...@@ -2307,7 +2307,6 @@ CONFIG_STV0991_HZ_CLOCK
CONFIG_ST_SMI CONFIG_ST_SMI
CONFIG_SUNXI_AHCI CONFIG_SUNXI_AHCI
CONFIG_SUNXI_EMAC CONFIG_SUNXI_EMAC
CONFIG_SUNXI_GMAC
CONFIG_SUNXI_GPIO CONFIG_SUNXI_GPIO
CONFIG_SUNXI_MAX_FB_SIZE CONFIG_SUNXI_MAX_FB_SIZE
CONFIG_SUNXI_USB_PHYS CONFIG_SUNXI_USB_PHYS
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment