summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/facebook/fbg1701/Kconfig9
-rw-r--r--src/mainboard/facebook/fbg1701/Makefile.inc6
-rw-r--r--src/mainboard/facebook/fbg1701/logo.c46
-rw-r--r--src/mainboard/facebook/fbg1701/logo.h21
-rw-r--r--src/mainboard/facebook/fbg1701/ramstage.c13
5 files changed, 0 insertions, 95 deletions
diff --git a/src/mainboard/facebook/fbg1701/Kconfig b/src/mainboard/facebook/fbg1701/Kconfig
index 41d59ff450..5e71db018a 100644
--- a/src/mainboard/facebook/fbg1701/Kconfig
+++ b/src/mainboard/facebook/fbg1701/Kconfig
@@ -58,15 +58,6 @@ config FSP_LOC
hex
default 0xfff9c000
-config FSP1_1_DISPLAY_LOGO
- bool "Enable logo"
- default n
-
-config FSP1_1_LOGO_FILE_NAME
- string "Logo file"
- depends on FSP1_1_DISPLAY_LOGO
- default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/logo.bmp"
-
config VENDORCODE_ELTAN_OEM_MANIFEST_LOC
hex
default 0xFFFE9000
diff --git a/src/mainboard/facebook/fbg1701/Makefile.inc b/src/mainboard/facebook/fbg1701/Makefile.inc
index a273f41682..ac4e571653 100644
--- a/src/mainboard/facebook/fbg1701/Makefile.inc
+++ b/src/mainboard/facebook/fbg1701/Makefile.inc
@@ -28,17 +28,11 @@ ramstage-y += cpld.c
ramstage-y += gpio.c
ramstage-y += hda_verb.c
ramstage-y += irqroute.c
-ramstage-$(CONFIG_FSP1_1_DISPLAY_LOGO) += logo.c
ramstage-y += ramstage.c
ramstage-y += w25q64.c
romstage-y += cpld.c
-cbfs-files-$(CONFIG_FSP1_1_DISPLAY_LOGO) += logo.bmp
-logo.bmp-file := $(call strip_quotes,$(CONFIG_FSP1_1_LOGO_FILE_NAME))
-logo.bmp-type := raw
-logo.bmp-compression := LZMA
-
# Order of names in SPD_SOURCES is important!
SPD_SOURCES = SAMSUNG_K4B8G1646D-MYKO
SPD_SOURCES += MICRON_MT41K512M16HA-125A
diff --git a/src/mainboard/facebook/fbg1701/logo.c b/src/mainboard/facebook/fbg1701/logo.c
deleted file mode 100644
index 3823c71fdc..0000000000
--- a/src/mainboard/facebook/fbg1701/logo.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2017 Patrick Rudolph <siro@das-labor.org>
- * Copyright (C) 2018-2019 Eltan B.V.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
-#include <soc/ramstage.h>
-#include <console/console.h>
-#include <include/cbfs.h>
-#include "logo.h"
-
-static char logo_data[1 * MiB];
-static size_t logo_data_sz = 0;
-
-void *load_logo(size_t *logo_size)
-{
- const char *filename = "logo.bmp";
-
- if (logo_data_sz != 0) {
- if (logo_size)
- *logo_size = logo_data_sz;
- return (void *)logo_data;
- }
-
- logo_data_sz =
- cbfs_boot_load_file(filename, logo_data, sizeof(logo_data), CBFS_TYPE_RAW);
- if (logo_data_sz == 0)
- return NULL;
-
- if (logo_size)
- *logo_size = logo_data_sz;
-
- printk(BIOS_DEBUG, "Found a Logo of %zu bytes after decompression\n", logo_data_sz);
-
- return (void *)logo_data;
-}
diff --git a/src/mainboard/facebook/fbg1701/logo.h b/src/mainboard/facebook/fbg1701/logo.h
deleted file mode 100644
index 0682d3fa2d..0000000000
--- a/src/mainboard/facebook/fbg1701/logo.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2019 Eltan B.V.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
-#ifndef LOGO_H
-#define LOGO_H
-
-void *load_logo(size_t *logo_size);
-
-#endif
diff --git a/src/mainboard/facebook/fbg1701/ramstage.c b/src/mainboard/facebook/fbg1701/ramstage.c
index 9b25b983f7..055c733fef 100644
--- a/src/mainboard/facebook/fbg1701/ramstage.c
+++ b/src/mainboard/facebook/fbg1701/ramstage.c
@@ -19,7 +19,6 @@
#include <soc/ramstage.h>
#include <soc/smbus.h>
#include "cpld.h"
-#include "logo.h"
struct edp_data {
u8 payload_length;
@@ -359,16 +358,4 @@ static void mainboard_configure_edp_bridge(void)
void mainboard_silicon_init_params(SILICON_INIT_UPD *params)
{
mainboard_configure_edp_bridge();
-
- if (CONFIG(FSP1_1_DISPLAY_LOGO)) {
- size_t logo_len;
- void *logo = NULL;
-
- logo = load_logo(&logo_len);
-
- if (logo) {
- params->PcdLogoPtr = (u32)logo;
- params->PcdLogoSize = logo_len;
- }
- }
}