diff options
| author | Julius Werner <jwerner@chromium.org> | 2021-02-05 16:51:25 -0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2021-03-17 08:10:20 +0000 |
| commit | 77639e4537cc9e56e65880e022e154af6d042453 (patch) | |
| tree | fea2b411d9d1d7a52d53630efaef5fd4363809c2 /src/drivers/net | |
| parent | 81dc20e744aa1762c17dcf5aac5c37643d62a983 (diff) | |
cbfs: Replace more instances of cbfs_boot_locate() with newer APIs
In pursuit of the eventual goal of removing cbfs_boot_locate() (and
direct rdev access) from CBFS APIs, this patch replaces all remaining
"simple" uses of the function call that can easily be replaced by the
newer APIs (like cbfs_load() or cbfs_map()). Some cases of
cbfs_boot_locate() remain that will be more complicated to solve.
Signed-off-by: Julius Werner <jwerner@chromium.org>
Change-Id: Icd0f21e2fa49c7cc834523578b7b45b5482cb1a8
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50348
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/drivers/net')
| -rw-r--r-- | src/drivers/net/atl1e.c | 15 | ||||
| -rw-r--r-- | src/drivers/net/r8168.c | 15 |
2 files changed, 8 insertions, 22 deletions
diff --git a/src/drivers/net/atl1e.c b/src/drivers/net/atl1e.c index b533537ac8..9b1b2ab953 100644 --- a/src/drivers/net/atl1e.c +++ b/src/drivers/net/atl1e.c @@ -41,18 +41,11 @@ static u8 get_hex_digit(const u8 c) static enum cb_err fetch_mac_string_cbfs(u8 *macstrbuf) { - struct cbfsf fh; - uint32_t matchraw = CBFS_TYPE_RAW; - - if (!cbfs_boot_locate(&fh, "atl1e-macaddress", &matchraw)) { - /* check the cbfs for the mac address */ - if (rdev_readat(&fh.data, macstrbuf, 0, MACLEN) != MACLEN) { - printk(BIOS_ERR, "atl1e: Error reading MAC from CBFS\n"); - return CB_ERR; - } - return CB_SUCCESS; + if (!cbfs_load("atl1e-macaddress", macstrbuf, MACLEN)) { + printk(BIOS_ERR, "atl1e: Error reading MAC from CBFS\n"); + return CB_ERR; } - return CB_ERR; + return CB_SUCCESS; } static void get_mac_address(u8 *macaddr, const u8 *strbuf) diff --git a/src/drivers/net/r8168.c b/src/drivers/net/r8168.c index af7c38707a..398b15d93c 100644 --- a/src/drivers/net/r8168.c +++ b/src/drivers/net/r8168.c @@ -166,18 +166,11 @@ static void fetch_mac_string_vpd(struct drivers_net_config *config, u8 *macstrbu static enum cb_err fetch_mac_string_cbfs(u8 *macstrbuf) { - struct cbfsf fh; - uint32_t matchraw = CBFS_TYPE_RAW; - - if (!cbfs_boot_locate(&fh, "rt8168-macaddress", &matchraw)) { - /* check the cbfs for the mac address */ - if (rdev_readat(&fh.data, macstrbuf, 0, MACLEN) != MACLEN) { - printk(BIOS_ERR, "r8168: Error reading MAC from CBFS\n"); - return CB_ERR; - } - return CB_SUCCESS; + if (!cbfs_load("rt8168-macaddress", macstrbuf, MACLEN)) { + printk(BIOS_ERR, "r8168: Error reading MAC from CBFS\n"); + return CB_ERR; } - return CB_ERR; + return CB_SUCCESS; } static void get_mac_address(u8 *macaddr, const u8 *strbuf) |