From e9665959edeba6ae2d5364c4f7339704b6b6fd42 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Fri, 21 Jan 2022 17:06:20 -0800 Subject: treewide: Remove "ERROR: "/"WARN: " prefixes from log messages Now that the console system itself will clearly differentiate loglevels, it is no longer necessary to explicitly add "ERROR: " in front of every BIOS_ERR message to help it stand out more (and allow automated tooling to grep for it). Removing all these extra .rodata characters should save us a nice little amount of binary size. This patch was created by running find src/ -type f -exec perl -0777 -pi -e 's/printk\(\s*BIOS_ERR,\s*"ERROR: /printk\(BIOS_ERR, "/gi' '{}' ';' and doing some cursory review/cleanup on the result. Then doing the same thing for BIOS_WARN with 's/printk\(\s*BIOS_WARNING,\s*"WARN(ING)?: /printk\(BIOS_WARNING, "/gi' Signed-off-by: Julius Werner Change-Id: I3d0573acb23d2df53db6813cb1a5fc31b5357db8 Reviewed-on: https://review.coreboot.org/c/coreboot/+/61309 Tested-by: build bot (Jenkins) Reviewed-by: HAOUAS Elyes Reviewed-by: Lance Zhao Reviewed-by: Jason Glenesk --- src/drivers/intel/fsp1_1/fsp_relocate.c | 4 ++-- src/drivers/intel/fsp2_0/memory_init.c | 6 +++--- src/drivers/intel/pmc_mux/conn/conn.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/drivers/intel') diff --git a/src/drivers/intel/fsp1_1/fsp_relocate.c b/src/drivers/intel/fsp1_1/fsp_relocate.c index 7aaba82e6b..875fcf218f 100644 --- a/src/drivers/intel/fsp1_1/fsp_relocate.c +++ b/src/drivers/intel/fsp1_1/fsp_relocate.c @@ -15,14 +15,14 @@ int fsp_relocate(struct prog *fsp_relocd) void *new_loc = cbfs_cbmem_alloc(prog_name(fsp_relocd), CBMEM_ID_REFCODE, &size); if (new_loc == NULL) { - printk(BIOS_ERR, "ERROR: Unable to load FSP into memory.\n"); + printk(BIOS_ERR, "Unable to load FSP into memory.\n"); return -1; } fih_offset = fsp1_1_relocate((uintptr_t)new_loc, new_loc, size); if (fih_offset <= 0) { - printk(BIOS_ERR, "ERROR: FSP relocation failure.\n"); + printk(BIOS_ERR, "FSP relocation failure.\n"); return -1; } diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c index 3643866c43..b7e81f0915 100644 --- a/src/drivers/intel/fsp2_0/memory_init.c +++ b/src/drivers/intel/fsp2_0/memory_init.c @@ -36,7 +36,7 @@ static void save_memory_training_data(bool s3wake, uint32_t fsp_version) mrc_data = fsp_find_nv_storage_data(&mrc_data_size); if (!mrc_data) { - printk(BIOS_ERR, "ERROR: FSP_NON_VOLATILE_STORAGE_HOB missing!\n"); + printk(BIOS_ERR, "FSP_NON_VOLATILE_STORAGE_HOB missing!\n"); return; } @@ -48,7 +48,7 @@ static void save_memory_training_data(bool s3wake, uint32_t fsp_version) */ if (mrc_cache_stash_data(MRC_TRAINING_DATA, fsp_version, mrc_data, mrc_data_size) < 0) - printk(BIOS_ERR, "ERROR: Failed to stash MRC data\n"); + printk(BIOS_ERR, "Failed to stash MRC data\n"); } static void do_fsp_post_memory_init(bool s3wake, uint32_t fsp_version) @@ -64,7 +64,7 @@ static void do_fsp_post_memory_init(bool s3wake, uint32_t fsp_version) } else if (cbmem_initialize_id_size(CBMEM_ID_FSP_RESERVED_MEMORY, range_entry_size(&fsp_mem))) { if (CONFIG(HAVE_ACPI_RESUME)) { - printk(BIOS_ERR, "ERROR: Failed to recover CBMEM in S3 resume.\n"); + printk(BIOS_ERR, "Failed to recover CBMEM in S3 resume.\n"); /* Failed S3 resume, reset to come up cleanly */ /* FIXME: A "system" reset is likely enough: */ full_reset(); diff --git a/src/drivers/intel/pmc_mux/conn/conn.c b/src/drivers/intel/pmc_mux/conn/conn.c index f238397245..9fcc7367bc 100644 --- a/src/drivers/intel/pmc_mux/conn/conn.c +++ b/src/drivers/intel/pmc_mux/conn/conn.c @@ -56,7 +56,7 @@ static void conn_write_cbmem_entry(struct device *dev) info = conn_get_cbmem_buffer(); if (!info || (info->port_count >= total_conn_count)) { - printk(BIOS_ERR, "ERROR: No space for Type-C port info!\n"); + printk(BIOS_ERR, "No space for Type-C port info!\n"); return; } -- cgit v1.2.3