diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-24 19:26:25 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-24 19:26:25 +0300 |
| commit | ceb6ddbc73607e9395bb5f0ad94159755f049e77 (patch) | |
| tree | 626729342d117934be03db50981a4bba8ebcceca /drivers/net | |
| parent | 3fbd2dce351ab5d40d3244f26bd713caa4f826e2 (diff) | |
| parent | c6e4e8f99c1430e803dc2ef306935a93b46dad7c (diff) | |
| download | u-boot-ceb6ddbc73607e9395bb5f0ad94159755f049e77.tar.xz | |
Merge tag 'u-boot-amlogic-20190423' of git://git.denx.de/u-boot-amlogic
- Add support for Amlogic p200 & p201 Reference Designs
- Add Amlogic SoC information display
- Add support for the Libretech-AC AML-S805X-AC board
- Add Amlogic AXG reset compatible
- Add I2C support for Amlogic AXG
- Fix AXG PIN and BANK pinctrl definitions
- Fix regmap_read_poll_timeout warning about sandbox_timer_add_offset
- Add initial support for Amlogic G12A SoC and U200 board
- Enable PHY_REALTEK for selected boards
- Fix Khadas VIM2 README
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/sandbox.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c index decce2fa59..c136392350 100644 --- a/drivers/net/sandbox.c +++ b/drivers/net/sandbox.c @@ -350,7 +350,7 @@ static int sb_eth_recv(struct udevice *dev, int flags, uchar **packetp) struct eth_sandbox_priv *priv = dev_get_priv(dev); if (skip_timeout) { - sandbox_timer_add_offset(11000UL); + timer_test_add_offset(11000UL); skip_timeout = false; } |