From 81a4fefce223ba358310aec2d988484202c176e2 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Tue, 1 Nov 2022 23:33:45 +0100 Subject: cpu/amd/agesa: Remove leftover code Now that all agesa CPUs are removed this code is unused. Change-Id: If0c082bbdb09457e3876962fa75725add11cb67c Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/69118 Reviewed-by: Elyes Haouas Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- src/vendorcode/amd/Kconfig | 34 +---------------------------- src/vendorcode/amd/pi/00670F00/Makefile.inc | 8 +++---- src/vendorcode/amd/pi/Makefile.inc | 4 ++-- 3 files changed, 7 insertions(+), 39 deletions(-) (limited to 'src/vendorcode') diff --git a/src/vendorcode/amd/Kconfig b/src/vendorcode/amd/Kconfig index 23786161d3..b09591613d 100644 --- a/src/vendorcode/amd/Kconfig +++ b/src/vendorcode/amd/Kconfig @@ -1,42 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-only -if CPU_AMD_AGESA || CPU_AMD_PI || SOC_AMD_PI +if CPU_AMD_PI || SOC_AMD_PI menu "AMD Platform Initialization" -choice - prompt "AGESA source" - default CPU_AMD_AGESA_BINARY_PI if CPU_AMD_PI - default CPU_AMD_AGESA_BINARY_PI if SOC_AMD_PI - default CPU_AMD_AGESA_OPENSOURCE if CPU_AMD_AGESA - help - Select the method for including the AMD Platform Initialization - code into coreboot. Platform Initialization code is required for - all AMD processors. - -config CPU_AMD_AGESA_BINARY_PI - bool "binary PI" - help - Use a binary PI package. Generally, these will be stored in the - "3rdparty/blobs" directory. For some processors, these must be obtained - directly from AMD Embedded Processors Group - (http://www.amd.com/embedded). - -config CPU_AMD_AGESA_OPENSOURCE - bool "open-source AGESA" - help - Build the PI package ("AGESA") from source code in the "vendorcode" - directory. - -endchoice - -if CPU_AMD_AGESA_OPENSOURCE -source "src/vendorcode/amd/agesa/Kconfig" -endif - -if CPU_AMD_AGESA_BINARY_PI source "src/vendorcode/amd/pi/Kconfig" -endif config AGESA_EXTRA_TIMESTAMPS bool "Add instrumentation for AGESA calls" diff --git a/src/vendorcode/amd/pi/00670F00/Makefile.inc b/src/vendorcode/amd/pi/00670F00/Makefile.inc index 71898a3c54..96c3ea9bcd 100644 --- a/src/vendorcode/amd/pi/00670F00/Makefile.inc +++ b/src/vendorcode/amd/pi/00670F00/Makefile.inc @@ -85,7 +85,7 @@ agesa_raw_files += $(wildcard $(AGESA_ROOT)/Lib/*.[cS]) agesa_raw_files += $(wildcard $(AGESA_ROOT)/binaryPI/*.[cS]) -classes-$(CONFIG_CPU_AMD_AGESA_BINARY_PI) += libagesa +classes-y += libagesa ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32),y) $(eval $(call create_class_compiler,libagesa,x86_32)) @@ -136,7 +136,7 @@ $(AGESA_POST_MEM_ELF): $(AGESA_POST_MEM_INPUT_ELF) $(AGESA_POST_MEM_ELF_RMOD): $(AGESA_POST_MEM_ELF) -cbfs-files-$(CONFIG_CPU_AMD_AGESA_BINARY_PI) += $(CONFIG_AGESA_PRE_MEMORY_CBFS_NAME) +cbfs-files-y += $(CONFIG_AGESA_PRE_MEMORY_CBFS_NAME) $(CONFIG_AGESA_PRE_MEMORY_CBFS_NAME)-file := $(CONFIG_AGESA_PRE_MEMORY_BINARY_PI_FILE) $(CONFIG_AGESA_PRE_MEMORY_CBFS_NAME)-type := stage $(CONFIG_AGESA_PRE_MEMORY_CBFS_NAME)-options := --xip @@ -144,7 +144,7 @@ $(CONFIG_AGESA_PRE_MEMORY_CBFS_NAME)-options := --xip # 64 byte alignment. $(CONFIG_AGESA_PRE_MEMORY_CBFS_NAME)-align := 4096 -cbfs-files-$(CONFIG_CPU_AMD_AGESA_BINARY_PI) += $(CONFIG_AGESA_POST_MEMORY_CBFS_NAME) +cbfs-files-y += $(CONFIG_AGESA_POST_MEMORY_CBFS_NAME) $(CONFIG_AGESA_POST_MEMORY_CBFS_NAME)-file := $(AGESA_POST_MEM_ELF_RMOD) $(CONFIG_AGESA_POST_MEMORY_CBFS_NAME)-type := stage $(CONFIG_AGESA_POST_MEMORY_CBFS_NAME)-compression := $(CBFS_COMPRESS_FLAG) @@ -158,7 +158,7 @@ ifeq ($(AGESA_BINARYPI_INPUT_FILE),) files_added:: warn_no_agesa else -cbfs-files-$(CONFIG_CPU_AMD_AGESA_BINARY_PI) += $(CONFIG_AGESA_CBFS_NAME) +cbfs-files-y += $(CONFIG_AGESA_CBFS_NAME) $(CONFIG_AGESA_CBFS_NAME)-file := $(AGESA_BINARYPI_INPUT_FILE) ifeq ($(CONFIG_AGESA_BINARY_PI_AS_STAGE),y) diff --git a/src/vendorcode/amd/pi/Makefile.inc b/src/vendorcode/amd/pi/Makefile.inc index 9b4659eac1..d36671a06f 100644 --- a/src/vendorcode/amd/pi/Makefile.inc +++ b/src/vendorcode/amd/pi/Makefile.inc @@ -108,7 +108,7 @@ ifeq ($(CONFIG_HUDSON_IMC_FWM),y) agesa_raw_files += $(wildcard $(src)/vendorcode/amd/pi/Lib/imc/*.c) endif -classes-$(CONFIG_CPU_AMD_AGESA_BINARY_PI) += libagesa +classes-y += libagesa ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32),y) $(eval $(call create_class_compiler,libagesa,x86_32)) @@ -135,7 +135,7 @@ ramstage-libs += $(agesa_output_path)/libagesa.a ####################################################################### -cbfs-files-$(CONFIG_CPU_AMD_AGESA_BINARY_PI) += $(CONFIG_AGESA_CBFS_NAME) +cbfs-files-y += $(CONFIG_AGESA_CBFS_NAME) $(CONFIG_AGESA_CBFS_NAME)-file := $(CONFIG_AGESA_BINARY_PI_FILE) $(CONFIG_AGESA_CBFS_NAME)-type := raw $(CONFIG_AGESA_CBFS_NAME)-position := $(CONFIG_AGESA_BINARY_PI_LOCATION) -- cgit v1.2.3