Merge git://git.denx.de/u-boot-sunxi

diff --git a/arch/arm/include/asm/arch-sunxi/sys_proto.h b/arch/arm/include/asm/arch-sunxi/sys_proto.h
index a373319a2b4a14b503b1c5f0b6f5a56e83ff7b37..096510b787c8d8f46295700bfe27bee13019df06 100644 (file)
--- 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 f4411f01c3e3cdce9efc425801354dd52c00a0cb..526cb72a510997fb607f43c37a94e89150f49cf4 100644 (file)
--- 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 212862acd1cb630eb33b2f9e9270e82533ee628b..1373b1f037875da37f970e6779a960455d38c5b8 100644 (file)
--- 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 7d8160d5f26e83ff5292e21b36e458c13fbbcc0a..6feb9b67cf59ee068e32cb93d41af290c370f44a 100755 (executable)
--- 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 d8710958a39d8ff0402ee155d325e806bcdb7140..4651bb55e780a8fa590b579106421a1018b28d0e 100644 (file)
--- 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