Arthur Heymans (arthur@aheymans.xyz) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18089
-gerrit
commit 250a2d1c78aff7d41005cc42a58e4d0b48fc8e71 Author: Arthur Heymans arthur@aheymans.xyz Date: Tue Jan 10 15:48:38 2017 +0100
drivers/net: Change cbfsfile from macaddress to rt8168-macaddress
The name macaddress is quite generic and could confuse users that it can override the macaddress of a arbitrary networking devices.
Change-Id: Idffa7ea0ca8a11f472baea59d1e81191aaa022b2 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- src/drivers/net/Makefile.inc | 7 ++++--- src/drivers/net/r8168.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/drivers/net/Makefile.inc b/src/drivers/net/Makefile.inc index fdb85cc..ff98e5b 100644 --- a/src/drivers/net/Makefile.inc +++ b/src/drivers/net/Makefile.inc @@ -6,6 +6,7 @@ $(obj)/macaddress: echo " Creating a file holding the rt8168 macaddress" printf %s $(CONFIG_REALTEK_8168_MACADDRESS) > $@
-cbfs-files-$(CONFIG_REALTEK_8168_RESET) += macaddress -macaddress-file := $(obj)/macaddress -macaddress-type := raw +cbfs-files-$(CONFIG_REALTEK_8168_RESET) += rt8168-macaddress +rt8168-macaddress-file := $(obj)/rt8168-macaddress +rt8168-macaddress-type := raw + diff --git a/src/drivers/net/r8168.c b/src/drivers/net/r8168.c index 90171d5..b226a74 100644 --- a/src/drivers/net/r8168.c +++ b/src/drivers/net/r8168.c @@ -88,7 +88,7 @@ static void program_mac_address(struct device *dev, u16 io_base) int i = 0; u8 mac[6] = { 0x00, 0xe0, 0x4c, 0x00, 0xc0, 0xb0 };
- if (!cbfs_boot_locate(&fh, "macaddress", &matchraw)) { + if (!cbfs_boot_locate(&fh, "rt8168-macaddress", &matchraw)) { if (rdev_readat(&fh.data, macstrbuf, 0, MACLEN) == MACLEN) get_mac_address(mac, macstrbuf); else