From 85b2e910df73affa8e12c0b66fc33c5b8c1e5f69 Mon Sep 17 00:00:00 2001 From: Marshall Dawson Date: Tue, 16 Jan 2018 22:10:30 -0700 Subject: [PATCH] amd/common/s3: Remove legacy spi.c Remove the original spi.c file that writes S3 NV data to flash in a proprietary format. The s3 folder is retained to facilitate new development. Change-Id: I1b5fe8e854c3d2dd71506c2acd6ff73e4b86d7d4 Signed-off-by: Marshall Dawson Reviewed-on: https://review.coreboot.org/23305 Tested-by: build bot (Jenkins) Reviewed-by: Richard Spiegel Reviewed-by: Martin Roth --- .../amd/common/block/include/amdblocks/spi.h | 23 ----------- src/soc/amd/common/block/s3/Makefile.inc | 2 - src/soc/amd/common/block/s3/spi.c | 39 ------------------- 3 files changed, 64 deletions(-) delete mode 100644 src/soc/amd/common/block/include/amdblocks/spi.h delete mode 100644 src/soc/amd/common/block/s3/spi.c diff --git a/src/soc/amd/common/block/include/amdblocks/spi.h b/src/soc/amd/common/block/include/amdblocks/spi.h deleted file mode 100644 index 1825f62003..0000000000 --- a/src/soc/amd/common/block/include/amdblocks/spi.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2017 Advanced Micro Devices, Inc. - * - * 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 __AMD_SPI_H__ -#define __AMD_SPI_H__ - -#include - -void spi_SaveS3info(u32 pos, u32 size, u8 *buf, u32 len); - -#endif /* __AMD_SPI_H__ */ diff --git a/src/soc/amd/common/block/s3/Makefile.inc b/src/soc/amd/common/block/s3/Makefile.inc index f19cb2e3b4..f3dd97072a 100644 --- a/src/soc/amd/common/block/s3/Makefile.inc +++ b/src/soc/amd/common/block/s3/Makefile.inc @@ -1,5 +1,3 @@ ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_S3),y) -ramstage-$(CONFIG_HAVE_ACPI_RESUME) += spi.c - endif diff --git a/src/soc/amd/common/block/s3/spi.c b/src/soc/amd/common/block/s3/spi.c deleted file mode 100644 index f72416ad97..0000000000 --- a/src/soc/amd/common/block/s3/spi.c +++ /dev/null @@ -1,39 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2012 Advanced Micro Devices, Inc. - * - * 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 -#include - -void spi_SaveS3info(u32 pos, u32 size, u8 *buf, u32 len) -{ - struct spi_flash flash; - - spi_init(); - if (spi_flash_probe(0, 0, &flash)) { - printk(BIOS_DEBUG, "Could not find SPI device\n"); - /* Dont make flow stop. */ - return; - } - - spi_flash_volatile_group_begin(&flash); - - spi_flash_erase(&flash, pos, size); - spi_flash_write(&flash, pos, sizeof(len), &len); - spi_flash_write(&flash, pos + sizeof(len), len, buf); - - spi_flash_volatile_group_end(&flash); -}