From 82171ea0ff9e38462e813b791dd57c8ad95dc768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Thu, 12 May 2016 12:25:08 +0300 Subject: AGESA vendorcode: Move compiler class definition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia4cef7d584e43f1911db2f81d8b86ed406b75aad Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/14786 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Stefan Reinauer --- src/vendorcode/amd/agesa/Makefile.inc | 13 +++++++++++++ src/vendorcode/amd/agesa/f10/Makefile.inc | 10 +--------- src/vendorcode/amd/agesa/f12/Makefile.inc | 10 +--------- src/vendorcode/amd/agesa/f14/Makefile.inc | 10 +--------- src/vendorcode/amd/agesa/f15/Makefile.inc | 8 -------- src/vendorcode/amd/agesa/f15tn/Makefile.inc | 8 -------- src/vendorcode/amd/agesa/f16kb/Makefile.inc | 7 ------- 7 files changed, 16 insertions(+), 50 deletions(-) (limited to 'src') diff --git a/src/vendorcode/amd/agesa/Makefile.inc b/src/vendorcode/amd/agesa/Makefile.inc index 02d9063cde..3c07bf4d8d 100644 --- a/src/vendorcode/amd/agesa/Makefile.inc +++ b/src/vendorcode/amd/agesa/Makefile.inc @@ -5,3 +5,16 @@ subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY15) += f15 subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY15_TN) += f15tn subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY15_RL) += f15tn subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY16_KB) += f16kb + +ifeq ($(CONFIG_CPU_AMD_AGESA),y) + +classes-y += libagesa +libagesa-y = + +ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32),y) +$(eval $(call create_class_compiler,libagesa,x86_32)) +else +$(eval $(call create_class_compiler,libagesa,x86_64)) +endif + +endif diff --git a/src/vendorcode/amd/agesa/f10/Makefile.inc b/src/vendorcode/amd/agesa/f10/Makefile.inc index 1109c08084..4786a25ffd 100644 --- a/src/vendorcode/amd/agesa/f10/Makefile.inc +++ b/src/vendorcode/amd/agesa/f10/Makefile.inc @@ -51,19 +51,11 @@ CPPFLAGS_x86_32 += $(AGESA_INC) CPPFLAGS_x86_64 += $(AGESA_INC) ####################################################################### -classes-y += libagesa - -ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32),y) -$(eval $(call create_class_compiler,libagesa,x86_32)) -else -$(eval $(call create_class_compiler,libagesa,x86_64)) -endif - #libagesa-y += Proc/CPU/Family/0x10/F10IoCstate.c #libagesa-y += Proc/CPU/Feature/cpuIoCstate.c #libagesa-y += Proc/Mem/NB/ON/mnprotoon.c -libagesa-y = Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c +libagesa-y += Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c libagesa-y += Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c libagesa-y += Proc/CPU/cpuInitEarlyTable.c libagesa-y += Proc/CPU/cahalt.c diff --git a/src/vendorcode/amd/agesa/f12/Makefile.inc b/src/vendorcode/amd/agesa/f12/Makefile.inc index 30efd4c1ef..c94e5d0a35 100644 --- a/src/vendorcode/amd/agesa/f12/Makefile.inc +++ b/src/vendorcode/amd/agesa/f12/Makefile.inc @@ -88,15 +88,7 @@ CPPFLAGS_x86_64 += $(AGESA_INC) ####################################################################### -classes-y += libagesa - -ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32),y) -$(eval $(call create_class_compiler,libagesa,x86_32)) -else -$(eval $(call create_class_compiler,libagesa,x86_64)) -endif - -libagesa-y = Legacy/Proc/agesaCallouts.c +libagesa-y += Legacy/Proc/agesaCallouts.c libagesa-y += Legacy/Proc/Dispatcher.c libagesa-y += Legacy/Proc/hobTransfer.c libagesa-y += Lib/amdlib.c diff --git a/src/vendorcode/amd/agesa/f14/Makefile.inc b/src/vendorcode/amd/agesa/f14/Makefile.inc index a5f7561b77..3be3559a61 100644 --- a/src/vendorcode/amd/agesa/f14/Makefile.inc +++ b/src/vendorcode/amd/agesa/f14/Makefile.inc @@ -72,15 +72,7 @@ CPPFLAGS_x86_32 += $(AGESA_INC) CPPFLAGS_x86_64 += $(AGESA_INC) ####################################################################### -classes-y += libagesa - -ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32),y) -$(eval $(call create_class_compiler,libagesa,x86_32)) -else -$(eval $(call create_class_compiler,libagesa,x86_64)) -endif - -libagesa-y = Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c +libagesa-y += Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c libagesa-y += Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c libagesa-y += Proc/GNB/Nb/Family/0x14/F14NbLclkDpm.c libagesa-y += Proc/GNB/Modules/GnbPcieAlibV1/PcieAlib.c diff --git a/src/vendorcode/amd/agesa/f15/Makefile.inc b/src/vendorcode/amd/agesa/f15/Makefile.inc index b7bc898197..9ac6644217 100644 --- a/src/vendorcode/amd/agesa/f15/Makefile.inc +++ b/src/vendorcode/amd/agesa/f15/Makefile.inc @@ -64,14 +64,6 @@ CPPFLAGS_x86_64 += $(AGESA_INC) ####################################################################### -classes-y += libagesa - -ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32),y) -$(eval $(call create_class_compiler,libagesa,x86_32)) -else -$(eval $(call create_class_compiler,libagesa,x86_64)) -endif - libagesa-y += Legacy/Proc/agesaCallouts.c libagesa-y += Legacy/Proc/Dispatcher.c libagesa-y += Legacy/Proc/hobTransfer.c diff --git a/src/vendorcode/amd/agesa/f15tn/Makefile.inc b/src/vendorcode/amd/agesa/f15tn/Makefile.inc index 986fbc5a15..5331f462ba 100644 --- a/src/vendorcode/amd/agesa/f15tn/Makefile.inc +++ b/src/vendorcode/amd/agesa/f15tn/Makefile.inc @@ -85,14 +85,6 @@ CPPFLAGS_x86_32 += $(AGESA_INC) CPPFLAGS_x86_64 += $(AGESA_INC) ####################################################################### -classes-y += libagesa - -ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32),y) -$(eval $(call create_class_compiler,libagesa,x86_32)) -else -$(eval $(call create_class_compiler,libagesa,x86_64)) -endif - libagesa-y += Legacy/Proc/Dispatcher.c libagesa-y += Legacy/Proc/agesaCallouts.c libagesa-y += Legacy/Proc/hobTransfer.c diff --git a/src/vendorcode/amd/agesa/f16kb/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Makefile.inc index 2cee89e7ba..6c3a445bc3 100644 --- a/src/vendorcode/amd/agesa/f16kb/Makefile.inc +++ b/src/vendorcode/amd/agesa/f16kb/Makefile.inc @@ -89,15 +89,8 @@ CPPFLAGS_x86_64 += $(AGESA_INC) ####################################################################### -classes-y += libagesa -ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32),y) -$(eval $(call create_class_compiler,libagesa,x86_32)) -else -$(eval $(call create_class_compiler,libagesa,x86_64)) -endif -libagesa-y = libagesa-y += Legacy/Proc/agesaCallouts.c libagesa-y += Legacy/Proc/Dispatcher.c libagesa-y += Legacy/Proc/hobTransfer.c -- cgit v1.2.3