From fa62e01b902c00144847103113902c3c817c2443 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Niew=C3=B6hner?= Date: Wed, 23 Oct 2019 17:40:10 +0200 Subject: drivers/intel/fsp1_1: remove orphaned functionality MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove orphaned functionality from the FSP1.1 driver that only has been used by skylake, which is now FSP2.0-only. Change-Id: I732f2d6846788d5c03647c6fb620e45b3b66de5f Signed-off-by: Michael Niewöhner Reviewed-on: https://review.coreboot.org/c/coreboot/+/36266 Reviewed-by: Michael Niewöhner Reviewed-by: Arthur Heymans Reviewed-by: Nico Huber Tested-by: build bot (Jenkins) --- src/drivers/intel/fsp1_1/Makefile.inc | 1 - src/drivers/intel/fsp1_1/bootblock.c | 56 ------------------------ src/drivers/intel/fsp1_1/include/fsp/bootblock.h | 19 -------- 3 files changed, 76 deletions(-) delete mode 100644 src/drivers/intel/fsp1_1/bootblock.c delete mode 100644 src/drivers/intel/fsp1_1/include/fsp/bootblock.h diff --git a/src/drivers/intel/fsp1_1/Makefile.inc b/src/drivers/intel/fsp1_1/Makefile.inc index 6873220c6f..85c4e0e608 100644 --- a/src/drivers/intel/fsp1_1/Makefile.inc +++ b/src/drivers/intel/fsp1_1/Makefile.inc @@ -17,7 +17,6 @@ verstage-y += car.c verstage-y += fsp_util.c verstage-$(CONFIG_SEPARATE_VERSTAGE) += verstage.c -bootblock-y += bootblock.c bootblock-$(CONFIG_USE_GENERIC_FSP_CAR_INC) += cache_as_ram.S bootblock-y += fsp_util.c diff --git a/src/drivers/intel/fsp1_1/bootblock.c b/src/drivers/intel/fsp1_1/bootblock.c deleted file mode 100644 index cb14832ced..0000000000 --- a/src/drivers/intel/fsp1_1/bootblock.c +++ /dev/null @@ -1,56 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * 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 -#include -#include - -static void fill_temp_ram_init_params(FSP_TEMP_RAM_INIT_PARAMS *params) -{ - params->MicrocodeRegionBase = CONFIG_CPU_MICROCODE_CBFS_LOC; - params->MicrocodeRegionLength = CONFIG_CPU_MICROCODE_CBFS_LEN; - params->CodeRegionBase = 0xFFFFFFFF - CONFIG_ROM_SIZE + 1; - params->CodeRegionLength = CONFIG_ROM_SIZE; -} - -void bootblock_fsp_temp_ram_init(void) -{ - FSP_TEMP_RAM_INIT fsp_temp_ram_init; - FSP_TEMP_RAM_INIT_PARAMS temp_ram_init_params; - FSP_INFO_HEADER *fih; - EFI_STATUS status; - - /* Locate the FSP header */ - fih = find_fsp(CONFIG_FSP_LOC); - /* Check the FSP header */ - if (((uintptr_t)fih >= ERROR_NO_FV_SIG) && - ((uintptr_t)fih <= ERROR_FSP_REV_MISMATCH)) { - printk(BIOS_ERR, "FSP header error %p, ", fih); - fih = NULL; - } - if (fih == NULL) - die("FSP_INFO_HEADER not set!\n"); - - fill_temp_ram_init_params(&temp_ram_init_params); - - /* Perform Temp RAM Init */ - printk(BIOS_DEBUG, "Calling FspTempRamInit\n"); - post_code(POST_FSP_TEMP_RAM_INIT); - fsp_temp_ram_init = (FSP_TEMP_RAM_INIT)(fih->ImageBase - + fih->TempRamInitEntryOffset); - status = fsp_temp_ram_init(&temp_ram_init_params); - printk(BIOS_DEBUG, "FspTempRamInit returned 0x%08x\n", status); - if (status != FSP_SUCCESS) - die("FspTempRamInit failed. Giving up."); - -} diff --git a/src/drivers/intel/fsp1_1/include/fsp/bootblock.h b/src/drivers/intel/fsp1_1/include/fsp/bootblock.h deleted file mode 100644 index 8517491f43..0000000000 --- a/src/drivers/intel/fsp1_1/include/fsp/bootblock.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * 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 FSP1_1_BOOTBLOCK_H -#define FSP1_1_BOOTBLOCK_H - -void bootblock_fsp_temp_ram_init(void); - -#endif -- cgit v1.2.3