diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-12 23:03:44 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-12 23:03:44 -0400 |
| commit | 88c7a0a8c2ce6b503ff5d5509effb2a9f844993e (patch) | |
| tree | e3c57d6e9c0cdeb438ba8f96c19f93fe14336654 /board/keymile/common | |
| parent | 60f38d82c45fef55ac04ee52b234e6dd07e31935 (diff) | |
| parent | 193a1e9f196b7fb7e913a70936c8a49060a1859c (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- Various improvements to Keymile boards - mostly DT conversation
(Pascal & Holger)
- Removal of now unsupported Keymile boards (Pascal & Holger)
- Small MVEBU PCI fix (Marek)
- Turris Omnia defconfig update (Marek)
- Misc Allied Telesis defconfig updates (Chris)
Diffstat (limited to 'board/keymile/common')
| -rw-r--r-- | board/keymile/common/common.h | 4 | ||||
| -rw-r--r-- | board/keymile/common/ivm.c | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/board/keymile/common/common.h b/board/keymile/common/common.h index 859d9130a9..42b760dc6e 100644 --- a/board/keymile/common/common.h +++ b/board/keymile/common/common.h @@ -120,10 +120,6 @@ struct bfticu_iomap { u8 pb_dbug; }; -#if !defined(CONFIG_PIGGY_MAC_ADRESS_OFFSET) -#define CONFIG_PIGGY_MAC_ADRESS_OFFSET 0 -#endif - int ethernet_present(void); int ivm_read_eeprom(unsigned char *buf, int len); int ivm_analyze_eeprom(unsigned char *buf, int len); diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c index da0634f01b..50df44d1c1 100644 --- a/board/keymile/common/ivm.c +++ b/board/keymile/common/ivm.c @@ -311,11 +311,6 @@ static int ivm_populate_env(unsigned char *buf, int len) /* if an offset is defined, add it */ process_mac(valbuf, page2, CONFIG_PIGGY_MAC_ADRESS_OFFSET, true); env_set((char *)"ethaddr", (char *)valbuf); -#ifdef CONFIG_KMVECT1 -/* KMVECT1 has two ethernet interfaces */ - process_mac(valbuf, page2, 1, true); - env_set((char *)"eth1addr", (char *)valbuf); -#endif #else /* KMTEGR1 has a special setup. eth0 has no connection to the outside and * gets an locally administred MAC address, eth1 is the debug interface and |