On 03.01.21 23:06, Phil Sutter wrote:
A few minor changes:
Get rid of leftover comments, other commits removed the defines they referred to.
CONFIG_SYS_NETA_INTERFACE_TYPE is not used anymore since commit e3b9c98a23ca9 ("net: mvneta: Convert to driver model").
Drop CONFIG_USB_MAX_CONTROLLER_COUNT: it is per-HCI type, so XHCI and EHCI could still both work be used.
Unconditionally define CONFIG_EHCI_IS_TDI: it has no effect on XHCI so that conditional doesn't make any sense.
Define a larger PHY_ANEG_TIMEOUT: In my test bed, the NIC is directly connected to some RTL8111 and the default 8s timeout was often too short.
Signed-off-by: Phil Sutter phil@nwl.cc
Reviewed-by: Stefan Roese sr@denx.de
Thanks, Stefan
include/configs/ds414.h | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/include/configs/ds414.h b/include/configs/ds414.h index a92e788a38b9e..8aa2d47bec68d 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 */
Viele Grüße, Stefan