diff options
| author | Tom Rini <trini@konsulko.com> | 2016-04-04 13:15:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-04-04 13:15:23 -0400 |
| commit | 7e10a7c3bc382ff79bb6746944a0a4a0073a0faf (patch) | |
| tree | 9d2c995a9bc807922cbc6c7966eb98e652c9b99f /arch/arm/mach-mvebu/include/mach/config.h | |
| parent | 30eae26b5629d6b06f11ca92c84ff30d57b784be (diff) | |
| parent | ebe7890321250352b812dbbf127a46ef58256d1c (diff) | |
Merge git://www.denx.de/git/u-boot-marvell
Diffstat (limited to 'arch/arm/mach-mvebu/include/mach/config.h')
| -rw-r--r-- | arch/arm/mach-mvebu/include/mach/config.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/include/mach/config.h b/arch/arm/mach-mvebu/include/mach/config.h index cc1fc5f9d4..b8a8c62e81 100644 --- a/arch/arm/mach-mvebu/include/mach/config.h +++ b/arch/arm/mach-mvebu/include/mach/config.h @@ -17,7 +17,8 @@ #include <asm/arch/soc.h> -#if defined(CONFIG_ARMADA_XP) || defined(CONFIG_ARMADA_38X) +#if defined(CONFIG_ARMADA_XP) || defined(CONFIG_ARMADA_375) \ + || defined(CONFIG_ARMADA_38X) /* * Set this for the common xor register definitions needed in dram.c * for A38x as well here. @@ -78,8 +79,10 @@ #ifdef CONFIG_CMD_NET #define CONFIG_CMD_MII #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 */ #define CONFIG_ARP_TIMEOUT 200 |