From e1133b7d7d353480e135bf0f94e4d0f94a617360 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Mon, 27 Apr 2015 14:04:38 -0700 Subject: kbuild: automatically include northbridges This change switches all northbridge vendors and southbridges to be autoincluded by Makefile.inc, rather than having to be mentioned explicitly in northbridge/Makefile.inc or in northbridge//Makefile.inc. This means, vendor and northbridge directories are now "drop in", e.g. be placed in the coreboot directory hierarchy without having to modify any higher level coreboot files. The long term plan is to enable out of tree components to be built with a given coreboot version (given that the API did not change). Change-Id: I8468154dbfaaaffcba9fda27ba2d7b9049ad5c19 Signed-off-by: Stefan Reinauer Reviewed-on: http://review.coreboot.org/9800 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/northbridge/amd/Makefile.inc | 8 -------- src/northbridge/amd/agesa/Makefile.inc | 5 +++++ src/northbridge/amd/amdfam10/Makefile.inc | 4 ++++ src/northbridge/amd/amdk8/Makefile.inc | 4 ++++ src/northbridge/amd/cimx/Makefile.inc | 4 ++++ src/northbridge/amd/gx2/Makefile.inc | 4 ++++ src/northbridge/amd/lx/Makefile.inc | 4 ++++ src/northbridge/amd/pi/Makefile.inc | 4 ++++ 8 files changed, 29 insertions(+), 8 deletions(-) delete mode 100644 src/northbridge/amd/Makefile.inc (limited to 'src/northbridge/amd') diff --git a/src/northbridge/amd/Makefile.inc b/src/northbridge/amd/Makefile.inc deleted file mode 100644 index 80e9961f03..0000000000 --- a/src/northbridge/amd/Makefile.inc +++ /dev/null @@ -1,8 +0,0 @@ -subdirs-$(CONFIG_NORTHBRIDGE_AMD_AMDFAM10) += amdfam10 -subdirs-$(CONFIG_NORTHBRIDGE_AMD_AMDK8) += amdk8 -subdirs-$(CONFIG_NORTHBRIDGE_AMD_GX2) += gx2 -subdirs-$(CONFIG_NORTHBRIDGE_AMD_LX) += lx -subdirs-$(CONFIG_NORTHBRIDGE_AMD_AGESA) += agesa -subdirs-$(CONFIG_NORTHBRIDGE_AMD_PI) += pi - -subdirs-$(CONFIG_AMD_NB_CIMX) += cimx diff --git a/src/northbridge/amd/agesa/Makefile.inc b/src/northbridge/amd/agesa/Makefile.inc index 8cf9ae3a3b..09d2d50347 100644 --- a/src/northbridge/amd/agesa/Makefile.inc +++ b/src/northbridge/amd/agesa/Makefile.inc @@ -16,6 +16,9 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # + +ifeq ($(CONFIG_NORTHBRIDGE_AMD_AGESA),y) + subdirs-$(CONFIG_NORTHBRIDGE_AMD_AGESA_FAMILY10) += family10 subdirs-$(CONFIG_NORTHBRIDGE_AMD_AGESA_FAMILY12) += family12 subdirs-$(CONFIG_NORTHBRIDGE_AMD_AGESA_FAMILY14) += family14 @@ -26,3 +29,5 @@ subdirs-$(CONFIG_NORTHBRIDGE_AMD_AGESA_FAMILY16_KB) += family16kb romstage-y += def_callouts.c agesawrapper.c eventlog.c ramstage-y += def_callouts.c agesawrapper.c eventlog.c + +endif diff --git a/src/northbridge/amd/amdfam10/Makefile.inc b/src/northbridge/amd/amdfam10/Makefile.inc index 65bdc0363c..8a105fd984 100644 --- a/src/northbridge/amd/amdfam10/Makefile.inc +++ b/src/northbridge/amd/amdfam10/Makefile.inc @@ -1,3 +1,5 @@ +ifeq ($(CONFIG_NORTHBRIDGE_AMD_AMDFAM10),y) + ramstage-y += northbridge.c ramstage-y += misc_control.c romstage-y += amdfam10_util.c @@ -12,3 +14,5 @@ ramstage-y += get_pci1234.c # Enable this if you want to check the values of the PCI routing registers. # Call show_all_routes() anywhere amdfam10.h is included. #ramstage-y += util.c + +endif diff --git a/src/northbridge/amd/amdk8/Makefile.inc b/src/northbridge/amd/amdk8/Makefile.inc index eeef9e8054..29274f48ec 100644 --- a/src/northbridge/amd/amdk8/Makefile.inc +++ b/src/northbridge/amd/amdk8/Makefile.inc @@ -1,3 +1,5 @@ +ifeq ($(CONFIG_NORTHBRIDGE_AMD_AMDK8),y) + ramstage-y += northbridge.c ramstage-y += misc_control.c ramstage-y += get_sblk_pci1234.c @@ -27,3 +29,5 @@ ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c # #end # + +endif diff --git a/src/northbridge/amd/cimx/Makefile.inc b/src/northbridge/amd/cimx/Makefile.inc index 80844c87fe..a3b16572e0 100644 --- a/src/northbridge/amd/cimx/Makefile.inc +++ b/src/northbridge/amd/cimx/Makefile.inc @@ -17,4 +17,8 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # +ifeq ($(CONFIG_AMD_NB_CIMX),y) + subdirs-$(CONFIG_NORTHBRIDGE_AMD_CIMX_RD890) += rd890 + +endif diff --git a/src/northbridge/amd/gx2/Makefile.inc b/src/northbridge/amd/gx2/Makefile.inc index ad904c4387..7936acb137 100644 --- a/src/northbridge/amd/gx2/Makefile.inc +++ b/src/northbridge/amd/gx2/Makefile.inc @@ -1,3 +1,7 @@ +ifeq ($(CONFIG_NORTHBRIDGE_AMD_GX2),y) + ramstage-y += northbridge.c ramstage-y += northbridgeinit.c ramstage-y += grphinit.c + +endif diff --git a/src/northbridge/amd/lx/Makefile.inc b/src/northbridge/amd/lx/Makefile.inc index 5ff227d9ee..19d9e44db6 100644 --- a/src/northbridge/amd/lx/Makefile.inc +++ b/src/northbridge/amd/lx/Makefile.inc @@ -1,5 +1,9 @@ +ifeq ($(CONFIG_NORTHBRIDGE_AMD_LX),y) + ramstage-y += northbridge.c ramstage-y += northbridgeinit.c ramstage-y += grphinit.c romstage-y += raminit.c + +endif diff --git a/src/northbridge/amd/pi/Makefile.inc b/src/northbridge/amd/pi/Makefile.inc index 3ded87f58d..9cd7410be3 100644 --- a/src/northbridge/amd/pi/Makefile.inc +++ b/src/northbridge/amd/pi/Makefile.inc @@ -17,6 +17,8 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # +ifeq ($(CONFIG_NORTHBRIDGE_AMD_PI),y) + subdirs-$(CONFIG_NORTHBRIDGE_AMD_PI_00630F01) += 00630F01 subdirs-$(CONFIG_NORTHBRIDGE_AMD_PI_00730F01) += 00730F01 @@ -24,3 +26,5 @@ romstage-y += agesawrapper.c romstage-y += def_callouts.c ramstage-y += agesawrapper.c ramstage-y += def_callouts.c + +endif -- cgit v1.2.3