[coreboot] New patch to review for coreboot: 685f150 Change AMD vendorcode build

Kyösti Mälkki (kyosti.malkki@gmail.com) gerrit at coreboot.org
Thu Dec 1 16:01:31 CET 2011


Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/468

-gerrit

commit 685f150a7e7e668965f6ca78025d71bff86b512d
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Thu Dec 1 16:24:20 2011 +0200

    Change AMD vendorcode build
    
    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 <kyosti.malkki at gmail.com>
---
 Makefile.inc                                 |    3 ++-
 src/mainboard/amd/inagua/Makefile.inc        |    1 -
 src/mainboard/amd/persimmon/Makefile.inc     |    1 -
 src/mainboard/amd/south_station/Makefile.inc |    1 -
 src/mainboard/amd/torpedo/Makefile.inc       |    1 -
 src/mainboard/amd/union_station/Makefile.inc |    1 -
 src/mainboard/asrock/e350m1/Makefile.inc     |    1 -
 src/mainboard/supermicro/h8qgi/Makefile.inc  |    2 --
 src/northbridge/amd/Makefile.inc             |    3 ---
 src/vendorcode/Makefile.inc                  |    6 +-----
 src/vendorcode/amd/Makefile.inc              |    2 ++
 src/vendorcode/amd/agesa/Makefile.inc        |    3 +++
 src/vendorcode/amd/cimx/Makefile.inc         |    2 ++
 13 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/Makefile.inc b/Makefile.inc
index 4c87bd2..e12cc92 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -38,7 +38,8 @@ PHONY+= clean-abuild coreboot
 
 #######################################################################
 # root source directories of coreboot
-subdirs-y := src/lib src/boot src/console src/devices src/ec src/southbridge src/northbridge src/superio src/drivers src/cpu
+subdirs-y := src/lib src/boot src/console src/devices src/ec src/southbridge
+subdirs-y += src/northbridge src/superio src/drivers src/cpu src/vendorcode
 subdirs-y += util/cbfstool util/sconfig
 subdirs-y += src/arch/$(ARCHDIR-y)
 subdirs-y += src/mainboard/$(MAINBOARDDIR)
diff --git a/src/mainboard/amd/inagua/Makefile.inc b/src/mainboard/amd/inagua/Makefile.inc
index 531a736..d9fc200 100755
--- a/src/mainboard/amd/inagua/Makefile.inc
+++ b/src/mainboard/amd/inagua/Makefile.inc
@@ -31,4 +31,3 @@ ramstage-y += PlatformGnbPcie.c
 
 ramstage-y += reset.c
 
-subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY14) += $(src)/vendorcode/amd/agesa/f14
\ No newline at end of file
diff --git a/src/mainboard/amd/persimmon/Makefile.inc b/src/mainboard/amd/persimmon/Makefile.inc
index afad9ac..8a72727 100644
--- a/src/mainboard/amd/persimmon/Makefile.inc
+++ b/src/mainboard/amd/persimmon/Makefile.inc
@@ -38,4 +38,3 @@ ramstage-y += PlatformGnbPcie.c
 
 ramstage-y += reset.c
 
-subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY14) += ../../../vendorcode/amd/agesa/f14
diff --git a/src/mainboard/amd/south_station/Makefile.inc b/src/mainboard/amd/south_station/Makefile.inc
index 1cb32b3..d9fc200 100644
--- a/src/mainboard/amd/south_station/Makefile.inc
+++ b/src/mainboard/amd/south_station/Makefile.inc
@@ -31,4 +31,3 @@ ramstage-y += PlatformGnbPcie.c
 
 ramstage-y += reset.c
 
-subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY14) += ../../../vendorcode/amd/agesa/f14
diff --git a/src/mainboard/amd/torpedo/Makefile.inc b/src/mainboard/amd/torpedo/Makefile.inc
index 986d90d..ee44ade 100755
--- a/src/mainboard/amd/torpedo/Makefile.inc
+++ b/src/mainboard/amd/torpedo/Makefile.inc
@@ -47,4 +47,3 @@ ramstage-y += PlatformGnbPcie.c
 ramstage-y += reset.c
 ramstage-y += pmio.c
 
-subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY12) += $(src)/vendorcode/amd/agesa/f12
diff --git a/src/mainboard/amd/union_station/Makefile.inc b/src/mainboard/amd/union_station/Makefile.inc
index 1cb32b3..d9fc200 100644
--- a/src/mainboard/amd/union_station/Makefile.inc
+++ b/src/mainboard/amd/union_station/Makefile.inc
@@ -31,4 +31,3 @@ ramstage-y += PlatformGnbPcie.c
 
 ramstage-y += reset.c
 
-subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY14) += ../../../vendorcode/amd/agesa/f14
diff --git a/src/mainboard/asrock/e350m1/Makefile.inc b/src/mainboard/asrock/e350m1/Makefile.inc
index 22d8373..d9fc200 100644
--- a/src/mainboard/asrock/e350m1/Makefile.inc
+++ b/src/mainboard/asrock/e350m1/Makefile.inc
@@ -31,4 +31,3 @@ ramstage-y += PlatformGnbPcie.c
 
 ramstage-y += reset.c
 
-subdirs-$(CONFIG_AMD_AGESA) += ../../../vendorcode/amd/agesa/f14
diff --git a/src/mainboard/supermicro/h8qgi/Makefile.inc b/src/mainboard/supermicro/h8qgi/Makefile.inc
index 211387d..b09c5ca 100755
--- a/src/mainboard/supermicro/h8qgi/Makefile.inc
+++ b/src/mainboard/supermicro/h8qgi/Makefile.inc
@@ -29,5 +29,3 @@ ramstage-y += dimmSpd.c
 ramstage-y += BiosCallOuts.c
 ramstage-y += platform_oem.c
 
-AGESA_ROOT ?= $(src)/vendorcode/amd/agesa/f10/
-subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY10) += ../../../../$(AGESA_ROOT)
diff --git a/src/northbridge/amd/Makefile.inc b/src/northbridge/amd/Makefile.inc
index 5299780..bf96b80 100644
--- a/src/northbridge/amd/Makefile.inc
+++ b/src/northbridge/amd/Makefile.inc
@@ -5,6 +5,3 @@ subdirs-$(CONFIG_NORTHBRIDGE_AMD_GX2) += gx2
 subdirs-$(CONFIG_NORTHBRIDGE_AMD_LX) += lx
 
 subdirs-$(CONFIG_AMD_AGESA) += agesa
-subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY10) += ../../vendorcode/amd/agesa/f10
-subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY12) += ../../vendorcode/amd/agesa/f12
-subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY14) += ../../vendorcode/amd/agesa/f14
diff --git a/src/vendorcode/Makefile.inc b/src/vendorcode/Makefile.inc
index bd55573..16c0d68 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 0000000..2897ff2
--- /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 0000000..5516888
--- /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/cimx/Makefile.inc b/src/vendorcode/amd/cimx/Makefile.inc
new file mode 100644
index 0000000..bb9b78c
--- /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




More information about the coreboot mailing list