diff options
| author | Tom Rini <trini@konsulko.com> | 2017-08-07 17:37:56 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-07 17:37:56 -0400 |
| commit | 6e7adf7037c76f081b149685fa5e978e2ddf2a22 (patch) | |
| tree | 87093f75b7ff78f120fb5bb81706df4ab69ea744 /arch | |
| parent | b713bc8a2dbaf40ea24dbccf6da4ed02a0035eb6 (diff) | |
| parent | da3b9e7fd6a1e38af3cf0dff0248427c9df583ff (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-bcmcygnus/configs.h | 6 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/include/mach/config.h | 1 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/config.h | 5 |
4 files changed, 4 insertions, 11 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7f6ab4ac7e6..9cfeedeebd9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -523,6 +523,9 @@ config TARGET_BCMCYGNUS imply CMD_HASH imply FAT_WRITE imply HASH_VERIFY + imply NETDEVICES + imply BCM_SF2_ETH + imply BCM_SF2_ETH_GMAC config TARGET_BCMNSP bool "Support bcmnsp" diff --git a/arch/arm/include/asm/arch-bcmcygnus/configs.h b/arch/arm/include/asm/arch-bcmcygnus/configs.h index af7f3bff57a..92b1c5e2d67 100644 --- a/arch/arm/include/asm/arch-bcmcygnus/configs.h +++ b/arch/arm/include/asm/arch-bcmcygnus/configs.h @@ -1,5 +1,5 @@ /* - * Copyright 2014 Broadcom Corporation. + * Copyright 2014-2017 Broadcom. * * SPDX-License-Identifier: GPL-2.0+ */ @@ -23,10 +23,6 @@ #define CONFIG_SYS_NS16550_COM3 0x18023000 /* Ethernet */ -#define CONFIG_BCM_SF2_ETH -#define CONFIG_BCM_SF2_ETH_GMAC - -#define CONFIG_PHYLIB #define CONFIG_PHY_BROADCOM #define CONFIG_PHY_RESET_DELAY 10000 /* PHY reset delay in us*/ diff --git a/arch/arm/mach-mvebu/include/mach/config.h b/arch/arm/mach-mvebu/include/mach/config.h index 1b35e0802b2..3cd6a1c332b 100644 --- a/arch/arm/mach-mvebu/include/mach/config.h +++ b/arch/arm/mach-mvebu/include/mach/config.h @@ -78,7 +78,6 @@ #define CONFIG_MII /* expose smi ove miiphy interface */ #if !defined(CONFIG_ARMADA_375) #define CONFIG_MVNETA /* Enable Marvell Gbe Controller Driver */ -#define CONFIG_PHYLIB #endif #define CONFIG_ENV_OVERWRITE /* ethaddr can be reprogrammed */ #define CONFIG_PHY_GIGE /* GbE speed/duplex detect */ diff --git a/arch/powerpc/include/asm/config.h b/arch/powerpc/include/asm/config.h index eaa23d2edf4..6aec815c712 100644 --- a/arch/powerpc/include/asm/config.h +++ b/arch/powerpc/include/asm/config.h @@ -74,16 +74,11 @@ /* The TSEC driver uses the PHYLIB infrastructure */ #ifndef CONFIG_PHYLIB #if defined(CONFIG_TSEC_ENET) -#define CONFIG_PHYLIB - #include <config_phylib_all_drivers.h> #endif /* TSEC_ENET */ #endif /* !CONFIG_PHYLIB */ /* The FMAN driver uses the PHYLIB infrastructure */ -#if defined(CONFIG_FMAN_ENET) -#define CONFIG_PHYLIB -#endif /* All PPC boards must swap IDE bytes */ #define CONFIG_IDE_SWAP_IO |