From 1e7ba810c6bba7b31995fe9b1998ffa264acf835 Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Wed, 5 Mar 2025 12:17:01 +0000 Subject: [PATCH] {commonlib, lib}: Rename CBMEM_ID_FSP_LOGO to CBMEM_ID_BMP_LOGO MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit renames the cbmem ID from CBMEM_ID_FSP_LOGO to CBMEM_ID_BMP_LOGO. This change: - Standardizes the naming to reflect the actual content, which is a BMP logo. - Removes the FSP-specific prefix, making the ID more generic and suitable for use in the common library. - Aligns the code with the recent Kconfig changes that moved BMP_LOGO related options to the common library. BUG=b:400738815 TEST=Able to build and boot google/brox. Change-Id: I838d4e6ad0efdef063f2cc78bb83d1d37e065f45 Signed-off-by: Subrata Banik Reviewed-on: https://review.coreboot.org/c/coreboot/+/86731 Tested-by: build bot (Jenkins) Reviewed-by: Jérémy Compostella Reviewed-by: Dinesh Gehlot --- src/commonlib/bsd/include/commonlib/bsd/cbmem_id.h | 4 ++-- src/lib/bmp_logo.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/commonlib/bsd/include/commonlib/bsd/cbmem_id.h b/src/commonlib/bsd/include/commonlib/bsd/cbmem_id.h index b88a0831b9..7873d5856f 100644 --- a/src/commonlib/bsd/include/commonlib/bsd/cbmem_id.h +++ b/src/commonlib/bsd/include/commonlib/bsd/cbmem_id.h @@ -81,7 +81,7 @@ #define CBMEM_ID_FMAP 0x464d4150 #define CBMEM_ID_CBFS_RO_MCACHE 0x524d5346 #define CBMEM_ID_CBFS_RW_MCACHE 0x574d5346 -#define CBMEM_ID_FSP_LOGO 0x4c4f474f +#define CBMEM_ID_BMP_LOGO 0x4c4f474f #define CBMEM_ID_SMM_COMBUFFER 0x53534d32 #define CBMEM_ID_TYPE_C_INFO 0x54595045 #define CBMEM_ID_MEM_CHIP_INFO 0x5048434D @@ -164,7 +164,7 @@ { CBMEM_ID_FMAP, "FMAP "}, \ { CBMEM_ID_CBFS_RO_MCACHE, "RO MCACHE "}, \ { CBMEM_ID_CBFS_RW_MCACHE, "RW MCACHE "}, \ - { CBMEM_ID_FSP_LOGO, "FSP LOGO "}, \ + { CBMEM_ID_BMP_LOGO, "BMP LOGO "}, \ { CBMEM_ID_SMM_COMBUFFER, "SMM COMBUFFER"}, \ { CBMEM_ID_TYPE_C_INFO, "TYPE_C INFO"},\ { CBMEM_ID_MEM_CHIP_INFO, "MEM CHIP INFO"},\ diff --git a/src/lib/bmp_logo.c b/src/lib/bmp_logo.c index 5a5adaafb5..6e3267ee87 100644 --- a/src/lib/bmp_logo.c +++ b/src/lib/bmp_logo.c @@ -26,7 +26,7 @@ void *bmp_load_logo(size_t *logo_size) if (acpi_is_wakeup_s3()) return NULL; - logo_entry = cbmem_entry_add(CBMEM_ID_FSP_LOGO, 1 * MiB); + logo_entry = cbmem_entry_add(CBMEM_ID_BMP_LOGO, 1 * MiB); if (!logo_entry) return NULL;