Skip to contentSkip to conversation

sunxi: Fix CONFIG_SUNXI_GMAC references

PATCH Superseded Jagan Teki 1 participant 2 messages Sep 1, 2017

Subsystems (2)
Arm (32-bit) Arm/Allwinner sunXi SoC support
lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH v2 1/1 sunxi: Fix CONFIG_SUNXI_GMAC references

From: Dave Prue <[email protected]>

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 <[email protected]>
Reviewed-by Simon Glass <[email protected]>
Reviewed-by Jagan Teki <[email protected]>
Reviewed-by Mark Kettenis <[email protected]>
Tested-by Mark Kettenis <[email protected]>
[Tweek commit message, config_whitelist.txt, build-whitelist.sh]
Signed-off-by Jagan Teki <[email protected]>

---
Changes for v2:
- Tweek the commit message
- Remove SUNXI_GMAC from config_whitelist.txt
- %s/SUNXI_GMAC/SUN7I_GMAC in build-whitelist.sh

 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                | 1 -
 5 files changed, 5 insertions(+), 6 deletions(-)
arch/arm/include/asm/arch-sunxi/sys_proto.h +1 -1
index a373319..096510b 100644
@@ -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) {}
board/sunxi/Makefile +1 -1
index f4411f0..526cb72 100644
@@ -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
include/configs/sunxi-common.h +1 -1
index 212862a..1373b1f 100644
@@ -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
scripts/build-whitelist.sh +2 -2
index 7d8160d..6feb9b6 100755
@@ -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
 #
scripts/config_whitelist.txt +0 -1
index d871095..4651bb5 100644
@@ -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
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH v2 1/1 sunxi: Fix CONFIG_SUNXI_GMAC references

Quoted 7 lines · Jagan Teki

From: Dave Prue <[email protected]>

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)

Quoted 7 lines
Signed-off-by Dave Prue <[email protected]>
Reviewed-by Simon Glass <[email protected]>
Reviewed-by Jagan Teki <[email protected]>
Reviewed-by Mark Kettenis <[email protected]>
Tested-by Mark Kettenis <[email protected]>
[Tweek commit message, config_whitelist.txt, build-whitelist.sh]
Signed-off-by Jagan Teki <[email protected]>

Applied to u-boot-sunxi/master

thanks!

Signature · 4 lines
Jagan Teki
Free Software Engineer | www.openedev.com
U-Boot, Linux | Upstream Maintainer
Hyderabad, India.