From 77639e4537cc9e56e65880e022e154af6d042453 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Fri, 5 Feb 2021 16:51:25 -0800 Subject: 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 Change-Id: Icd0f21e2fa49c7cc834523578b7b45b5482cb1a8 Reviewed-on: https://review.coreboot.org/c/coreboot/+/50348 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/drivers/generic/cbfs-serial/cbfs-serial.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'src/drivers/generic/cbfs-serial') diff --git a/src/drivers/generic/cbfs-serial/cbfs-serial.c b/src/drivers/generic/cbfs-serial/cbfs-serial.c index 9f8aaa80f9..6ff010cb41 100644 --- a/src/drivers/generic/cbfs-serial/cbfs-serial.c +++ b/src/drivers/generic/cbfs-serial/cbfs-serial.c @@ -10,25 +10,14 @@ const char *smbios_mainboard_serial_number(void) { static char serial_number[MAX_SERIAL_LENGTH + 1] = {0}; - struct cbfsf file; if (serial_number[0] != 0) return serial_number; - if (cbfs_boot_locate(&file, "serial_number", NULL) == 0) { - struct region_device cbfs_region; - size_t serial_len; - - cbfs_file_data(&cbfs_region, &file); - - serial_len = region_device_sz(&cbfs_region); - if (serial_len <= MAX_SERIAL_LENGTH) { - if (rdev_readat(&cbfs_region, serial_number, 0, - serial_len) == serial_len) { - serial_number[serial_len] = 0; - return serial_number; - } - } + size_t serial_len = cbfs_load("serial_number", serial_number, MAX_SERIAL_LENGTH); + if (serial_len) { + serial_number[serial_len] = '\0'; + return serial_number; } strncpy(serial_number, CONFIG_MAINBOARD_SERIAL_NUMBER, -- cgit v1.2.3