diff options
author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2011-12-01 17:49:43 +0200 |
---|---|---|
committer | Patrick Georgi <patrick@georgi-clan.de> | 2011-12-02 08:59:26 +0100 |
commit | 2a830d0b9807566a5f2c4401cd9fd285661034f1 (patch) | |
tree | b9d14fbb849d8191da333f166db3cf7534da43d8 | |
parent | 2c1f4d2d836bfb5728c692e08bda172a1639ec81 (diff) | |
download | coreboot-2a830d0b9807566a5f2c4401cd9fd285661034f1.tar.xz |
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@gmail.com>
Reviewed-on: http://review.coreboot.org/468
Tested-by: build bot (Jenkins)
Reviewed-by: Kerry Sheh <shekairui@gmail.com>
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
-rw-r--r-- | Makefile.inc | 3 | ||||
-rwxr-xr-x | src/mainboard/amd/inagua/Makefile.inc | 1 | ||||
-rw-r--r-- | src/mainboard/amd/persimmon/Makefile.inc | 1 | ||||
-rw-r--r-- | src/mainboard/amd/south_station/Makefile.inc | 1 | ||||
-rwxr-xr-x | src/mainboard/amd/torpedo/Makefile.inc | 1 | ||||
-rw-r--r-- | src/mainboard/amd/union_station/Makefile.inc | 1 | ||||
-rw-r--r-- | src/mainboard/asrock/e350m1/Makefile.inc | 1 | ||||
-rwxr-xr-x | src/mainboard/supermicro/h8qgi/Makefile.inc | 2 | ||||
-rw-r--r-- | src/northbridge/amd/Makefile.inc | 3 | ||||
-rw-r--r-- | src/vendorcode/Makefile.inc | 6 | ||||
-rw-r--r-- | src/vendorcode/amd/Makefile.inc | 2 | ||||
-rw-r--r-- | src/vendorcode/amd/agesa/Makefile.inc | 3 | ||||
-rwxr-xr-x | src/vendorcode/amd/agesa/f10/Makefile.inc | 2 | ||||
-rw-r--r-- | src/vendorcode/amd/cimx/Makefile.inc | 2 |
14 files changed, 11 insertions, 18 deletions
diff --git a/Makefile.inc b/Makefile.inc index 4c87bd2716..e12cc92392 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 531a736904..d9fc200965 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 afad9ac252..8a72727d81 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 1cb32b3a9a..d9fc200965 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 986d90d714..ee44adec10 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 1cb32b3a9a..d9fc200965 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 22d8373600..d9fc200965 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 211387d146..b09c5caba5 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 52997808f1..bf96b80c16 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 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 |