From c27daff542246281303b1de495e06a9a872b01d6 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Sun, 16 Jul 2017 04:47:23 +0300 Subject: binaryPI: Drop remains of ACPI S3 on FCH MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Never reached and actual code was already wiped out. Change-Id: Ic17cbc56e83d23e228e23578357843ac9cd77eda Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/20623 Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/cpu/amd/pi/Makefile.inc | 2 -- src/cpu/amd/pi/spi.c | 42 --------------------------- src/northbridge/amd/pi/00630F01/northbridge.c | 3 -- src/northbridge/amd/pi/00660F01/northbridge.c | 3 -- src/northbridge/amd/pi/00730F01/northbridge.c | 3 -- 5 files changed, 53 deletions(-) delete mode 100644 src/cpu/amd/pi/spi.c (limited to 'src') diff --git a/src/cpu/amd/pi/Makefile.inc b/src/cpu/amd/pi/Makefile.inc index 3fef7e8580..7e3c8c03cc 100644 --- a/src/cpu/amd/pi/Makefile.inc +++ b/src/cpu/amd/pi/Makefile.inc @@ -17,8 +17,6 @@ subdirs-$(CONFIG_CPU_AMD_PI_00630F01) += 00630F01 subdirs-$(CONFIG_CPU_AMD_PI_00730F01) += 00730F01 subdirs-$(CONFIG_CPU_AMD_PI_00660F01) += 00660F01 -ramstage-$(CONFIG_SPI_FLASH) += spi.c - cpu_incs-y += $(src)/cpu/amd/agesa/cache_as_ram.inc romstage-y += romstage.c diff --git a/src/cpu/amd/pi/spi.c b/src/cpu/amd/pi/spi.c deleted file mode 100644 index 8ed0a377c9..0000000000 --- a/src/cpu/amd/pi/spi.c +++ /dev/null @@ -1,42 +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 "s3_resume.h" - -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); - - return; -} diff --git a/src/northbridge/amd/pi/00630F01/northbridge.c b/src/northbridge/amd/pi/00630F01/northbridge.c index 96d30e901e..4af0182f11 100644 --- a/src/northbridge/amd/pi/00630F01/northbridge.c +++ b/src/northbridge/amd/pi/00630F01/northbridge.c @@ -629,9 +629,6 @@ static void domain_read_resources(device_t dev) static void domain_enable_resources(device_t dev) { - if (acpi_is_wakeup_s3()) - agesawrapper_fchs3laterestore(); - /* Must be called after PCI enumeration and resource allocation */ if (!acpi_is_wakeup_s3()) { /* Enable MMIO on AMD CPU Address Map Controller */ diff --git a/src/northbridge/amd/pi/00660F01/northbridge.c b/src/northbridge/amd/pi/00660F01/northbridge.c index 039f386592..00740f1f6e 100644 --- a/src/northbridge/amd/pi/00660F01/northbridge.c +++ b/src/northbridge/amd/pi/00660F01/northbridge.c @@ -634,9 +634,6 @@ static void domain_read_resources(device_t dev) static void domain_enable_resources(device_t dev) { - if (acpi_is_wakeup_s3()) - AGESAWRAPPER(fchs3laterestore); - /* Must be called after PCI enumeration and resource allocation */ if (!acpi_is_wakeup_s3()) AGESAWRAPPER(amdinitmid); diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c index de2059dce9..ce1eb53b9d 100644 --- a/src/northbridge/amd/pi/00730F01/northbridge.c +++ b/src/northbridge/amd/pi/00730F01/northbridge.c @@ -648,9 +648,6 @@ static void domain_read_resources(device_t dev) static void domain_enable_resources(device_t dev) { - if (acpi_is_wakeup_s3()) - AGESAWRAPPER(fchs3laterestore); - /* Must be called after PCI enumeration and resource allocation */ if (!acpi_is_wakeup_s3()) AGESAWRAPPER(amdinitmid); -- cgit v1.2.3