From 2a830d0b9807566a5f2c4401cd9fd285661034f1 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Thu, 1 Dec 2011 17:49:43 +0200 Subject: Change AMD vendorcode build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apply the normal method of recursively including subdirectories for src/vendorcode. Remove redundant references under mainboard and northbridge. Change-Id: I914a6e262ed2abe83f407df36fe5c1af5eb4bcb0 Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/468 Tested-by: build bot (Jenkins) Reviewed-by: Kerry Sheh Reviewed-by: Patrick Georgi --- src/vendorcode/Makefile.inc | 6 +----- src/vendorcode/amd/Makefile.inc | 2 ++ src/vendorcode/amd/agesa/Makefile.inc | 3 +++ src/vendorcode/amd/agesa/f10/Makefile.inc | 2 +- src/vendorcode/amd/cimx/Makefile.inc | 2 ++ 5 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 src/vendorcode/amd/Makefile.inc create mode 100644 src/vendorcode/amd/agesa/Makefile.inc create mode 100644 src/vendorcode/amd/cimx/Makefile.inc (limited to 'src/vendorcode') diff --git a/src/vendorcode/Makefile.inc b/src/vendorcode/Makefile.inc index bd5557313f..16c0d68497 100644 --- a/src/vendorcode/Makefile.inc +++ b/src/vendorcode/Makefile.inc @@ -1,6 +1,2 @@ -subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY10) += $(src)/vendorcode/amd/agesa/f10 -subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY12) += $(src)/vendorcode/amd/agesa/f12 -subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY14) += $(src)/vendorcode/amd/agesa/f14 +subdirs-y += amd -subdirs-$(CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800) += $(src)/vendorcode/amd/cimx/sb800 -subdirs-$(CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900) += $(src)/vendorcode/amd/cimx/sb900 diff --git a/src/vendorcode/amd/Makefile.inc b/src/vendorcode/amd/Makefile.inc new file mode 100644 index 0000000000..2897ff25c3 --- /dev/null +++ b/src/vendorcode/amd/Makefile.inc @@ -0,0 +1,2 @@ +subdirs-y += agesa +subdirs-y += cimx diff --git a/src/vendorcode/amd/agesa/Makefile.inc b/src/vendorcode/amd/agesa/Makefile.inc new file mode 100644 index 0000000000..5516888d19 --- /dev/null +++ b/src/vendorcode/amd/agesa/Makefile.inc @@ -0,0 +1,3 @@ +subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY10) += f10 +subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY12) += f12 +subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY14) += f14 diff --git a/src/vendorcode/amd/agesa/f10/Makefile.inc b/src/vendorcode/amd/agesa/f10/Makefile.inc index b2125151b7..298eb954ca 100755 --- a/src/vendorcode/amd/agesa/f10/Makefile.inc +++ b/src/vendorcode/amd/agesa/f10/Makefile.inc @@ -18,7 +18,7 @@ # ## ABSOLUTE AGESA V5 ROOT PATH ## -AGESA_ROOT ?= $(PWD) +AGESA_ROOT = src/vendorcode/amd/agesa/f10 AGESA_INC ?= -I$(src)/mainboard/$(MAINBOARDDIR) AGESA_INC += -I$(AGESA_ROOT) diff --git a/src/vendorcode/amd/cimx/Makefile.inc b/src/vendorcode/amd/cimx/Makefile.inc new file mode 100644 index 0000000000..bb9b78c88f --- /dev/null +++ b/src/vendorcode/amd/cimx/Makefile.inc @@ -0,0 +1,2 @@ +subdirs-$(CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800) += sb800 +subdirs-$(CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900) += sb900 -- cgit v1.2.3