diff options
| author | Tom Rini <trini@konsulko.com> | 2017-09-01 13:30:19 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-09-01 13:30:19 -0400 |
| commit | 0b6e5b2c48f91afec21870502761e27961ac061c (patch) | |
| tree | 0e8b8e618cb3ec432643a628be4eb3bcba10991c | |
| parent | 1d20170467b079642be96996dcd71db64c3c365c (diff) | |
| parent | 6ff005cf19363382fc867d7876a75fd8a386e894 (diff) | |
Merge git://git.denx.de/u-boot-sunxi
| -rw-r--r-- | arch/arm/include/asm/arch-sunxi/sys_proto.h | 2 | ||||
| -rw-r--r-- | board/sunxi/Makefile | 2 | ||||
| -rw-r--r-- | include/configs/sunxi-common.h | 2 | ||||
| -rwxr-xr-x | scripts/build-whitelist.sh | 4 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
5 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/include/asm/arch-sunxi/sys_proto.h b/arch/arm/include/asm/arch-sunxi/sys_proto.h index a373319a2b4..096510b787c 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 f4411f01c3e..526cb72a510 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 212862acd1c..1373b1f0378 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 7d8160d5f26..6feb9b67cf5 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 d8710958a39..4651bb55e78 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 |