summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorRaul E Rangel <rrangel@chromium.org>2021-07-16 14:03:21 -0600
committerFelix Held <felix-coreboot@felixheld.de>2021-07-20 16:51:25 +0000
commita736f480883e544b2131c966cdfb80bb42e751b3 (patch)
treef741fb798f4cdc3820031866aee70901251336c4 /src/lib
parent21863e33c808c45c3a3db6ae432675d768832a50 (diff)
downloadcoreboot-a736f480883e544b2131c966cdfb80bb42e751b3.tar.gz
coreboot-a736f480883e544b2131c966cdfb80bb42e751b3.tar.bz2
coreboot-a736f480883e544b2131c966cdfb80bb42e751b3.zip
lib/cbfs,device/pci_rom: Move cbfs_boot_map_optionrom and modernize
These methods are oprom specific. Move them out of CBFS. I also deleted the tohex methods and replaced them with snprintf. BUG=b:179699789 TEST=Boot guybrush and see oprom still loads Signed-off-by: Raul E Rangel <rrangel@chromium.org> Change-Id: I03791f19c93fabfe62d9ecd4f9b4fad0e6a6146e Reviewed-on: https://review.coreboot.org/c/coreboot/+/56393 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Karthik Ramasubramanian <kramasub@google.com> Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/cbfs.c40
1 files changed, 0 insertions, 40 deletions
diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c
index 32ebfafbf650..32b50da30ce9 100644
--- a/src/lib/cbfs.c
+++ b/src/lib/cbfs.c
@@ -264,46 +264,6 @@ static size_t cbfs_load_and_decompress(const struct region_device *rdev, void *b
}
}
-static inline int tohex4(unsigned int c)
-{
- return (c <= 9) ? (c + '0') : (c - 10 + 'a');
-}
-
-static void tohex8(unsigned int val, char *dest)
-{
- dest[0] = tohex4((val >> 4) & 0xf);
- dest[1] = tohex4(val & 0xf);
-}
-
-static void tohex16(unsigned int val, char *dest)
-{
- dest[0] = tohex4(val >> 12);
- dest[1] = tohex4((val >> 8) & 0xf);
- dest[2] = tohex4((val >> 4) & 0xf);
- dest[3] = tohex4(val & 0xf);
-}
-
-void *cbfs_boot_map_optionrom(uint16_t vendor, uint16_t device)
-{
- char name[17] = "pciXXXX,XXXX.rom";
-
- tohex16(vendor, name + 3);
- tohex16(device, name + 8);
-
- return cbfs_map(name, NULL);
-}
-
-void *cbfs_boot_map_optionrom_revision(uint16_t vendor, uint16_t device, uint8_t rev)
-{
- char name[20] = "pciXXXX,XXXX,XX.rom";
-
- tohex16(vendor, name + 3);
- tohex16(device, name + 8);
- tohex8(rev, name + 13);
-
- return cbfs_map(name, NULL);
-}
-
void *_cbfs_alloc(const char *name, cbfs_allocator_t allocator, void *arg,
size_t *size_out, bool force_ro, enum cbfs_type *type)
{