[coreboot-gerrit] New patch to review for coreboot: 09519a9 cbfs: correct types used for accessing files
Aaron Durbin (adurbin@google.com)
gerrit at coreboot.org
Wed Apr 1 21:31:56 CEST 2015
Aaron Durbin (adurbin at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9195
-gerrit
commit 09519a9e858e7510690a505ba498a9a053d21486
Author: Aaron Durbin <adurbin at chromium.org>
Date: Tue Mar 31 20:33:53 2015 -0500
cbfs: correct types used for accessing files
In commit 72a8e5e751a7fa97c9d198f68cad49f9d9851669 the
Makefile's were updated to use named types for cbfs
file addition. However, the call sites were not checked to
ensure the types matched. Correct all call sites to use the
named types.
Change-Id: Ib9fa693ef517e3196a3f04e9c06db52a9116fee7
Signed-off-by: Aaron Durbin <adurbin at chromium.org>
---
src/device/dram/spd_cache.c | 4 ++--
src/drivers/intel/fsp/fastboot_cache.c | 3 ++-
src/include/cbfs_serialized.h | 4 ++++
src/mainboard/google/bolt/romstage.c | 4 ++--
src/mainboard/google/falco/romstage.c | 4 ++--
src/mainboard/google/link/romstage.c | 4 ++--
src/mainboard/google/peppy/romstage.c | 4 ++--
src/mainboard/google/slippy/romstage.c | 4 ++--
src/mainboard/samsung/lumpy/romstage.c | 4 ++--
src/northbridge/intel/haswell/mrccache.c | 4 +++-
src/northbridge/intel/haswell/raminit.c | 2 +-
src/northbridge/intel/sandybridge/mrccache.c | 4 +++-
src/northbridge/intel/sandybridge/raminit.c | 3 +--
src/soc/intel/baytrail/romstage/raminit.c | 4 ++--
src/soc/intel/broadwell/romstage/raminit.c | 2 +-
15 files changed, 31 insertions(+), 23 deletions(-)
diff --git a/src/device/dram/spd_cache.c b/src/device/dram/spd_cache.c
index 7ecd1dc..8abb791 100644
--- a/src/device/dram/spd_cache.c
+++ b/src/device/dram/spd_cache.c
@@ -36,8 +36,8 @@ int read_spd_from_cbfs(u8 *buf, int idx)
size_t min_len = (idx + 1) * SPD_SIZE;
printk(BIOS_DEBUG, "read SPD\n");
- spd_file = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, "spd.bin", 0xab,
- &spd_file_len);
+ spd_file = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, "spd.bin",
+ CBFS_TYPE_SPD, &spd_file_len);
if (!spd_file)
printk(BIOS_EMERG, "file [spd.bin] not found in CBFS");
if (spd_file_len < min_len)
diff --git a/src/drivers/intel/fsp/fastboot_cache.c b/src/drivers/intel/fsp/fastboot_cache.c
index 64982d8..bcf39ab 100644
--- a/src/drivers/intel/fsp/fastboot_cache.c
+++ b/src/drivers/intel/fsp/fastboot_cache.c
@@ -64,7 +64,8 @@ static u32 get_mrc_cache_region(struct mrc_data_container **mrc_region_ptr)
{
size_t region_size;
*mrc_region_ptr = cbfs_get_file_content(CBFS_DEFAULT_MEDIA,
- "mrc.cache", 0xac,
+ "mrc.cache",
+ CBFS_TYPE_MRC_CACHE,
®ion_size);
return region_size;
diff --git a/src/include/cbfs_serialized.h b/src/include/cbfs_serialized.h
index ecb5870..30b2314 100644
--- a/src/include/cbfs_serialized.h
+++ b/src/include/cbfs_serialized.h
@@ -74,7 +74,11 @@
#define CBFS_TYPE_VSA 0x51
#define CBFS_TYPE_MBI 0x52
#define CBFS_TYPE_MICROCODE 0x53
+#define CBFS_TYPE_FSP 0x60
+#define CBFS_TYPE_MRC 0x61
#define CBFS_COMPONENT_CMOS_DEFAULT 0xaa
+#define CBFS_TYPE_SPD 0xab
+#define CBFS_TYPE_MRC_CACHE 0xac
#define CBFS_COMPONENT_CMOS_LAYOUT 0x01aa
#define CBFS_HEADER_MAGIC 0x4F524243
diff --git a/src/mainboard/google/bolt/romstage.c b/src/mainboard/google/bolt/romstage.c
index 91ac6a0..bead56f 100644
--- a/src/mainboard/google/bolt/romstage.c
+++ b/src/mainboard/google/bolt/romstage.c
@@ -78,8 +78,8 @@ static void copy_spd(struct pei_data *peid)
int spd_index = 0; /* No GPIO selection, force index 0 for now */
printk(BIOS_DEBUG, "SPD index %d\n", spd_index);
- spd_file = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, "spd.bin", 0xab,
- &spd_file_len);
+ spd_file = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, "spd.bin",
+ CBFS_TYPE_SPD, &spd_file_len);
if (!spd_file)
die("SPD data not found.");
diff --git a/src/mainboard/google/falco/romstage.c b/src/mainboard/google/falco/romstage.c
index fb811da..4e79159 100644
--- a/src/mainboard/google/falco/romstage.c
+++ b/src/mainboard/google/falco/romstage.c
@@ -79,8 +79,8 @@ static void copy_spd(struct pei_data *peid)
size_t spd_file_len;
printk(BIOS_DEBUG, "SPD index %d\n", spd_index);
- spd_file = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, "spd.bin", 0xab,
- &spd_file_len);
+ spd_file = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, "spd.bin",
+ CBFS_TYPE_SPD, &spd_file_len);
if (!spd_file)
die("SPD data not found.");
diff --git a/src/mainboard/google/link/romstage.c b/src/mainboard/google/link/romstage.c
index b5d64b0..2e7ee52 100644
--- a/src/mainboard/google/link/romstage.c
+++ b/src/mainboard/google/link/romstage.c
@@ -95,8 +95,8 @@ static void copy_spd(struct pei_data *peid)
int spd_index = get_gpios(gpio_vector);
printk(BIOS_DEBUG, "spd index %d\n", spd_index);
- spd_file = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, "spd.bin", 0xab,
- &spd_file_len);
+ spd_file = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, "spd.bin",
+ CBFS_TYPE_SPD, &spd_file_len);
if (!spd_file)
die("SPD data not found.");
diff --git a/src/mainboard/google/peppy/romstage.c b/src/mainboard/google/peppy/romstage.c
index f8d9cb9..27962e1 100644
--- a/src/mainboard/google/peppy/romstage.c
+++ b/src/mainboard/google/peppy/romstage.c
@@ -82,8 +82,8 @@ static void copy_spd(struct pei_data *peid)
size_t spd_file_len;
printk(BIOS_DEBUG, "SPD index %d\n", spd_index);
- spd_file = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, "spd.bin", 0xab,
- &spd_file_len);
+ spd_file = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, "spd.bin",
+ CBFS_TYPE_SPD, &spd_file_len);
if (!spd_file)
die("SPD data not found.");
diff --git a/src/mainboard/google/slippy/romstage.c b/src/mainboard/google/slippy/romstage.c
index 8f6df2f..c242ecd 100644
--- a/src/mainboard/google/slippy/romstage.c
+++ b/src/mainboard/google/slippy/romstage.c
@@ -80,8 +80,8 @@ static void copy_spd(struct pei_data *peid)
size_t spd_file_len;
printk(BIOS_DEBUG, "SPD index %d\n", spd_index);
- spd_file = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, "spd.bin", 0xab,
- &spd_file_len);
+ spd_file = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, "spd.bin",
+ CBFS_TYPE_SPD, &spd_file_len);
if (!spd_file)
die("SPD data not found.");
diff --git a/src/mainboard/samsung/lumpy/romstage.c b/src/mainboard/samsung/lumpy/romstage.c
index 98f5c7d..e63a8f9 100644
--- a/src/mainboard/samsung/lumpy/romstage.c
+++ b/src/mainboard/samsung/lumpy/romstage.c
@@ -237,8 +237,8 @@ void main(unsigned long bist)
break;
}
- spd_data = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, "spd.bin", 0xab,
- &spd_file_len);
+ spd_data = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, "spd.bin",
+ CBFS_TYPE_SPD, &spd_file_len);
if (!spd_data)
die("SPD data not found.");
if (spd_file_len < (spd_index + 1) * 256)
diff --git a/src/northbridge/intel/haswell/mrccache.c b/src/northbridge/intel/haswell/mrccache.c
index b66e9fd..8fbac17 100644
--- a/src/northbridge/intel/haswell/mrccache.c
+++ b/src/northbridge/intel/haswell/mrccache.c
@@ -71,7 +71,9 @@ static u32 get_mrc_cache_region(struct mrc_data_container **mrc_region_ptr)
#else
size_t region_size;
*mrc_region_ptr = cbfs_get_file_content(CBFS_DEFAULT_MEDIA,
- "mrc.cache", 0xac, ®ion_size);
+ "mrc.cache",
+ CBFS_TYPE_MRC_CACHE,
+ ®ion_size);
return region_size;
#endif
}
diff --git a/src/northbridge/intel/haswell/raminit.c b/src/northbridge/intel/haswell/raminit.c
index 197dc0f..6bbb215 100644
--- a/src/northbridge/intel/haswell/raminit.c
+++ b/src/northbridge/intel/haswell/raminit.c
@@ -163,7 +163,7 @@ void sdram_initialize(struct pei_data *pei_data)
/* Locate and call UEFI System Agent binary. */
entry = (unsigned long)cbfs_get_file_content(
- CBFS_DEFAULT_MEDIA, "mrc.bin", 0xab, NULL);
+ CBFS_DEFAULT_MEDIA, "mrc.bin", CBFS_TYPE_MRC, NULL);
if (entry) {
int rv;
asm volatile (
diff --git a/src/northbridge/intel/sandybridge/mrccache.c b/src/northbridge/intel/sandybridge/mrccache.c
index 127ca3d..4a69233 100644
--- a/src/northbridge/intel/sandybridge/mrccache.c
+++ b/src/northbridge/intel/sandybridge/mrccache.c
@@ -71,7 +71,9 @@ static u32 get_mrc_cache_region(struct mrc_data_container **mrc_region_ptr)
#else
size_t region_size;
*mrc_region_ptr = cbfs_get_file_content(CBFS_DEFAULT_MEDIA,
- "mrc.cache", 0xac, ®ion_size);
+ "mrc.cache",
+ CBFS_TYPE_MRC_CACHE,
+ ®ion_size);
return region_size;
#endif
diff --git a/src/northbridge/intel/sandybridge/raminit.c b/src/northbridge/intel/sandybridge/raminit.c
index f6c92db..d8c7eef 100644
--- a/src/northbridge/intel/sandybridge/raminit.c
+++ b/src/northbridge/intel/sandybridge/raminit.c
@@ -246,9 +246,8 @@ void sdram_initialize(struct pei_data *pei_data)
pei_data->tx_byte = do_putchar;
/* Locate and call UEFI System Agent binary. */
- /* TODO make MRC blob (0xab?) defined in cbfs_core.h. */
entry = cbfs_get_file_content(
- CBFS_DEFAULT_MEDIA, "mrc.bin", 0xab, NULL);
+ CBFS_DEFAULT_MEDIA, "mrc.bin", CBFS_TYPE_MRC, NULL);
if (entry) {
int rv;
rv = entry (pei_data);
diff --git a/src/soc/intel/baytrail/romstage/raminit.c b/src/soc/intel/baytrail/romstage/raminit.c
index a51853a..82d154a 100644
--- a/src/soc/intel/baytrail/romstage/raminit.c
+++ b/src/soc/intel/baytrail/romstage/raminit.c
@@ -147,8 +147,8 @@ void raminit(struct mrc_params *mp, int prev_sleep_state)
}
/* Determine if mrc.bin is in the cbfs. */
- if (cbfs_get_file_content(CBFS_DEFAULT_MEDIA, "mrc.bin", 0xab, NULL) ==
- NULL) {
+ if (cbfs_get_file_content(CBFS_DEFAULT_MEDIA, "mrc.bin", CBfS_TYPE_MRC,
+ NULL) == NULL) {
printk(BIOS_DEBUG, "Couldn't find mrc.bin\n");
return;
}
diff --git a/src/soc/intel/broadwell/romstage/raminit.c b/src/soc/intel/broadwell/romstage/raminit.c
index b8b88bc..ce8f879 100644
--- a/src/soc/intel/broadwell/romstage/raminit.c
+++ b/src/soc/intel/broadwell/romstage/raminit.c
@@ -86,7 +86,7 @@ void raminit(struct pei_data *pei_data)
/* Determine if mrc.bin is in the cbfs. */
entry = (pei_wrapper_entry_t)cbfs_get_file_content(
- CBFS_DEFAULT_MEDIA, "mrc.bin", 0xab, NULL);
+ CBFS_DEFAULT_MEDIA, "mrc.bin", CBFS_TYPE_MRC, NULL);
if (entry == NULL) {
printk(BIOS_DEBUG, "Couldn't find mrc.bin\n");
return;
More information about the coreboot-gerrit
mailing list