diff options
| author | Tom Rini <trini@konsulko.com> | 2024-04-05 17:23:58 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-04-05 17:23:58 -0400 |
| commit | 9cba29b19f43f9450117e8bc89e7dda691ed5ab5 (patch) | |
| tree | 548bda96c5a6e2756e6a4de3a297630fc5022f57 /board/dhelectronics/dh_stm32mp1/board.c | |
| parent | eff62097f67639b6d935d07b23543aa82468bc5b (diff) | |
| parent | f6be41c83c17c09dddfb1e29a7ca391b5190634d (diff) | |
Merge tag 'u-boot-imx-master-20240405' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/20228
- Convert imx8mp-beacon and verdin-imx8mm/verdin-imx8mp to OF_UPSTREAM.
- Enable PCIe NVMe support on imx8mp_beacon.
- Fix Ethernet and board detection on mx6cuboxi.
- Fix signature_block_hdr struct fields.
- Fix imx9_probe_mu prototype and make it to get called in
EVT_DM_POST_INIT_R.
- Test whether ethernet node is enabled before reading MAC EEPROM on
DHSOM SoMs.
Diffstat (limited to 'board/dhelectronics/dh_stm32mp1/board.c')
| -rw-r--r-- | board/dhelectronics/dh_stm32mp1/board.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c index d1f662d9701..079dfff0389 100644 --- a/board/dhelectronics/dh_stm32mp1/board.c +++ b/board/dhelectronics/dh_stm32mp1/board.c @@ -128,6 +128,9 @@ static int dh_stm32_setup_ethaddr(void) if (dh_mac_is_in_env("ethaddr")) return 0; + if (dh_get_mac_is_enabled("ethernet0")) + return 0; + if (!dh_get_mac_from_eeprom(enetaddr, "eeprom0")) return eth_env_set_enetaddr("ethaddr", enetaddr); @@ -141,6 +144,9 @@ static int dh_stm32_setup_eth1addr(void) if (dh_mac_is_in_env("eth1addr")) return 0; + if (dh_get_mac_is_enabled("ethernet1")) + return 0; + if (dh_stm32_mac_is_in_ks8851()) return 0; |