From: Michael Brown <mbrown@fensystems.co.uk>
To: devel@edk2.groups.io
Cc: ard.biesheuvel@linaro.org, leif.lindholm@linaro.org,
pete@akeo.ie, Michael Brown <mbrown@fensystems.co.uk>
Subject: [edk2-platforms: PATCH 1/1] Platform/RPi3: Accept "ethernet" or "ethernet0" aliases in device tree
Date: Fri, 19 Jul 2019 18:29:07 +0100 [thread overview]
Message-ID: <20190719172907.788170-2-mbrown@fensystems.co.uk> (raw)
In-Reply-To: <20190719172907.788170-1-mbrown@fensystems.co.uk>
Older device trees tend to use the alias "ethernet". Newer device
trees tend to use "ethernet0" since older versions of U-Boot would
skip aliases that do not include an index number. See, for example,
Linux kernel commit 10b6c0c ("ARM: dts: bcm2835: add index to the
ethernet alias") and U-Boot commit f8e57c6 ("fdt_support: Fixup
'ethernet' aliases not ending in digits").
Accept either "ethernet" or "ethernet0" as being the alias to the node
for which the MAC address should be updated.
Signed-off-by: Michael Brown <mbrown@fensystems.co.uk>
---
Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c b/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c
index 83446e3e45..e80bc2c391 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c
@@ -35,11 +35,14 @@ UpdateMacAddress (
UINT8 MacAddress[6];
//
- // Locate the node that the 'ethernet' alias refers to
+ // Locate the node that the 'ethernet[0]' alias refers to
//
Node = fdt_path_offset (mFdtImage, "ethernet");
if (Node < 0) {
- DEBUG ((DEBUG_ERROR, "%a: failed to locate 'ethernet' alias\n", __FUNCTION__));
+ Node = fdt_path_offset (mFdtImage, "ethernet0");
+ }
+ if (Node < 0) {
+ DEBUG ((DEBUG_ERROR, "%a: failed to locate 'ethernet[0]' alias\n", __FUNCTION__));
return;
}
--
2.20.1
next prev parent reply other threads:[~2019-07-19 17:29 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-19 17:29 [edk2-platforms: PATCH 0/1] Handle RPi device trees using "ethernet0" Michael Brown
2019-07-19 17:29 ` Michael Brown [this message]
2019-07-23 10:34 ` [edk2-platforms: PATCH 1/1] Platform/RPi3: Accept "ethernet" or "ethernet0" aliases in device tree Leif Lindholm
2019-07-23 11:00 ` Michael Brown
2019-07-23 11:17 ` Leif Lindholm
2019-07-24 14:31 ` [edk2-platforms: PATCHv2 0/1] Platform/RPi3: Provide "ethernet[0]" " Michael Brown
2019-07-24 14:31 ` [edk2-platforms: PATCHv2 1/1] " Michael Brown
2019-07-24 18:53 ` Leif Lindholm
2019-07-24 20:53 ` [edk2-devel] " Michael Brown
2019-07-24 21:43 ` Leif Lindholm
2019-07-25 10:27 ` [edk2-platforms: PATCH 0/1] Report device tree modification errors using Print() Michael Brown
2019-07-25 10:27 ` [edk2-platforms: PATCH 1/1] Platform/RPi3: " Michael Brown
2019-08-06 17:07 ` Leif Lindholm
2019-08-08 23:16 ` [edk2-platforms: PATCH v2 0/1] Platform/RPi3: Report device tree Michael Brown
2019-08-09 10:07 ` Leif Lindholm
2019-08-08 23:16 ` [edk2-platforms: PATCH v2 1/1] Platform/RPi3: Report device tree modification errors using Print() Michael Brown
2019-07-25 12:51 ` [edk2-devel] [edk2-platforms: PATCHv2 1/1] Platform/RPi3: Provide "ethernet[0]" aliases in device tree Leif Lindholm
2019-07-23 11:19 ` [edk2-platforms: PATCH 1/1] Platform/RPi3: Accept "ethernet" or "ethernet0" " Pete Batard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190719172907.788170-2-mbrown@fensystems.co.uk \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox