diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-10 16:38:40 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-10 16:38:40 -0500 |
| commit | ef2f0d323652c1162937df668b33b3bfe0ca3904 (patch) | |
| tree | f957b7e9edcf79403f8a582d17dc4103f293fc10 /include/configs/stmark2.h | |
| parent | c00bd81ae0d6eb1f94e26b31be3a64cadaa05bcb (diff) | |
| parent | 4f731c795d75aee548f6886f4f0da0a49a99354d (diff) | |
Merge branch '2020-01-10-master-imports'
- Android image support enhancements
- Assorted ARM fixes and enhancements
- m68k update
Diffstat (limited to 'include/configs/stmark2.h')
| -rw-r--r-- | include/configs/stmark2.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index a08d9950bd..4df2750a89 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -60,7 +60,6 @@ /* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT /* DSPI and Serial Flash */ #define CONFIG_CF_DSPI @@ -163,4 +162,19 @@ #define CACR_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ CONFIG_SYS_INIT_RAM_SIZE - 12) +#ifdef CONFIG_MCFFEC +#define CONFIG_MII_INIT 1 +#define CONFIG_SYS_DISCOVER_PHY +#define CONFIG_SYS_RX_ETH_BUFFER 8 +#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN +/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */ +#ifndef CONFIG_SYS_DISCOVER_PHY +#define FECDUPLEX FULL +#define FECSPEED _100BASET +#else +#ifndef CONFIG_SYS_FAULT_ECHO_LINK_DOWN +#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN +#endif +#endif /* CONFIG_SYS_DISCOVER_PHY */ +#endif #endif /* __STMARK2_CONFIG_H */ |