diff options
| author | Tom Rini <[email protected]> | 2022-04-15 08:09:52 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-04-15 08:10:32 -0400 |
| commit | 7f418ea59852945eeb9e5d2555d306f09643d555 (patch) | |
| tree | 069dbaf3a1f62b68251189e9acdbd9affcbd98c5 /include/configs | |
| parent | 239fe55a6ce516f329687c0680428ca2acfc73ca (diff) | |
| parent | 0154e6de37e8bbaac837939391f6d4a8f0b3fd18 (diff) | |
Merge branch 'next' of https://source.denx.de/u-boot/custodians/u-boot-net
- DM9000 DM support
- tftp server bug fix
- mdio ofnode support functions
- Various phy fixes and improvements.
[trini: Fixup merge conflicts in drivers/net/phy/ethernet_id.c
drivers/net/phy/phy.c include/phy.h]
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/M5253DEMO.h | 1 | ||||
| -rw-r--r-- | include/configs/at91sam9261ek.h | 1 | ||||
| -rw-r--r-- | include/configs/ci20.h | 1 | ||||
| -rw-r--r-- | include/configs/colibri_pxa270.h | 1 | ||||
| -rw-r--r-- | include/configs/devkit8000.h | 1 |
5 files changed, 0 insertions, 5 deletions
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index b7fdd7135f2..079675be5bc 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -25,7 +25,6 @@ # undef CONFIG_LBA48 #endif -#define CONFIG_DRIVER_DM9000 #ifdef CONFIG_DRIVER_DM9000 # define CONFIG_DM9000_BASE (CONFIG_SYS_CS1_BASE | 0x300) # define DM9000_IO CONFIG_DM9000_BASE diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 55ddb38c70a..2089fe52e45 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -44,7 +44,6 @@ #endif /* Ethernet */ -#define CONFIG_DRIVER_DM9000 #define CONFIG_DM9000_BASE 0x30000000 #define DM9000_IO CONFIG_DM9000_BASE #define DM9000_DATA (CONFIG_DM9000_BASE + 4) diff --git a/include/configs/ci20.h b/include/configs/ci20.h index ea9440dac07..cc70a59e728 100644 --- a/include/configs/ci20.h +++ b/include/configs/ci20.h @@ -24,7 +24,6 @@ #define CONFIG_SYS_NS16550_CLK 48000000 /* Ethernet: davicom DM9000 */ -#define CONFIG_DRIVER_DM9000 1 #define CONFIG_DM9000_BASE 0xb6000000 #define DM9000_IO CONFIG_DM9000_BASE #define DM9000_DATA (CONFIG_DM9000_BASE + 2) diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index a5ba916279a..809afb77f20 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -43,7 +43,6 @@ */ #ifdef CONFIG_CMD_NET -#define CONFIG_DRIVER_DM9000 1 #define CONFIG_DM9000_BASE 0x08000000 #define DM9000_IO (CONFIG_DM9000_BASE) #define DM9000_DATA (CONFIG_DM9000_BASE + 4) diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 16b36501329..5dbd126a2a0 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -35,7 +35,6 @@ /* Hardware drivers */ /* DM9000 */ -#define CONFIG_DRIVER_DM9000 1 #define CONFIG_DM9000_BASE 0x2c000000 #define DM9000_IO CONFIG_DM9000_BASE #define DM9000_DATA (CONFIG_DM9000_BASE + 0x400) |