Shelley Chen has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/79773?usp=email )
Change subject: WIP: vendorcode/google/chromeos: Pick correct logo ......................................................................
WIP: vendorcode/google/chromeos: Pick correct logo
Use new chromeos_device_branded_plus() function to determine if current device is a plus device or not and pick the appropriate logo per return of this function.
BUG=b:317880956 BRANCH=None TEST=emerge-rex coreboot
Change-Id: Ic2cb3fb91a9cb9edebd4d1124a686e34ab8badd5 Signed-off-by: Shelley Chen shchen@google.com --- M src/lib/bmp_logo.c 1 file changed, 11 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/73/79773/1
diff --git a/src/lib/bmp_logo.c b/src/lib/bmp_logo.c index 330ed6f..5099730 100644 --- a/src/lib/bmp_logo.c +++ b/src/lib/bmp_logo.c @@ -5,6 +5,7 @@ #include <cbfs.h> #include <cbmem.h> #include <stdint.h> +#include <vendorcode/google/chromeos/chromeos.h>
static const struct cbmem_entry *logo_entry;
@@ -16,6 +17,15 @@ if (acpi_is_wakeup_s3()) return;
+ /* Check factory config for cbx or cb logo */ + const char *logo_file_name; + bool is_cbx_device = chromeos_device_branded_plus(); + if (is_cbx_device) { + logo_file_name = "cbx_logo.bmp"; + } else { + logo_file_name = "cb_logo.bmp"; + } + logo_entry = cbmem_entry_add(CBMEM_ID_FSP_LOGO, 1 * MiB); if (!logo_entry) return; @@ -24,7 +34,7 @@ if (!logo_buffer) return;
- *logo_size = cbfs_load("logo.bmp", logo_buffer, 1 * MiB); + *logo_size = cbfs_load(logo_file_name, logo_buffer, 1 * MiB); if (*logo_size) *logo_ptr = (uintptr_t)logo_buffer; }