diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-27 11:39:31 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-27 11:39:31 -0500 |
| commit | 8b195f4b716e4d802768e0e2cd63b417a4690b7f (patch) | |
| tree | ee95cc34be28ab8a49b4fb9f6d99a893006c810f /include/configs | |
| parent | 290e40b2aa96e13b19292d81146063e036028931 (diff) | |
| parent | 177cecdc4edcda5881cf217e21568d921b630bf5 (diff) | |
| download | u-boot-8b195f4b716e4d802768e0e2cd63b417a4690b7f.tar.gz u-boot-8b195f4b716e4d802768e0e2cd63b417a4690b7f.tar.xz u-boot-8b195f4b716e4d802768e0e2cd63b417a4690b7f.zip | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- Espressobin: Disable slot when emmc is not present (Pali)
- DS414; config header cleanup (Phil)
- PCI: auto-config enhancement (Phil)
- pci_mvebu: Also map IO region (Phil)
- serial: a3720: Implement pending method for output direction (Pali)
- turris_mox: Enable a few commands (Marek)
- helios4 & ClearFog changes (Dennis)
- Plus some minor misc changes
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/ds414.h | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/include/configs/ds414.h b/include/configs/ds414.h index a92e788a38..8aa2d47bec 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -24,31 +24,13 @@ #define CONFIG_SYS_I2C_SLAVE 0x0 #define CONFIG_SYS_I2C_SPEED 100000 -/* Environment in SPI NOR flash */ - -#define CONFIG_SYS_NETA_INTERFACE_TYPE PHY_INTERFACE_MODE_RGMII - /* PCIe support */ #ifndef CONFIG_SPL_BUILD #define CONFIG_PCI_SCAN_SHOW #endif /* USB/EHCI/XHCI configuration */ - -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 - -/* FIXME: broken XHCI support - * Below defines should enable support for the two rear USB3 ports. Sadly, this - * does not work because: - * - xhci-pci seems to not support DM_USB, so with that enabled it is not - * found. - * - USB init fails, controller does not respond in time */ - -#if !defined(CONFIG_USB_XHCI_HCD) #define CONFIG_EHCI_IS_TDI -#endif - -/* why is this only defined in mv-common.h if CONFIG_DM is undefined? */ /* * mv-common.h should be defined after CMD configs since it used them @@ -95,4 +77,7 @@ #define CONFIG_BOOTCOMMAND "sf read ${loadaddr} 0xd0000 0x700000; bootm" #define CONFIG_LOADADDR 0x80000 +/* increase autoneg timeout, my NIC sucks */ +#define PHY_ANEG_TIMEOUT 16000 + #endif /* _CONFIG_SYNOLOGY_DS414_H */ |