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/via/Makefile.inc | 4 ---- src/northbridge/via/cn700/Makefile.inc | 4 ++++ src/northbridge/via/cx700/Makefile.inc | 4 ++++ src/northbridge/via/vx800/Makefile.inc | 4 ++++ src/northbridge/via/vx900/Makefile.inc | 4 ++++ 5 files changed, 16 insertions(+), 4 deletions(-) delete mode 100644 src/northbridge/via/Makefile.inc (limited to 'src/northbridge/via') diff --git a/src/northbridge/via/Makefile.inc b/src/northbridge/via/Makefile.inc deleted file mode 100644 index b3d595e9b9..0000000000 --- a/src/northbridge/via/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -subdirs-$(CONFIG_NORTHBRIDGE_VIA_CN700) += cn700 -subdirs-$(CONFIG_NORTHBRIDGE_VIA_CX700) += cx700 -subdirs-$(CONFIG_NORTHBRIDGE_VIA_VX800) += vx800 -subdirs-$(CONFIG_NORTHBRIDGE_VIA_VX900) += vx900 diff --git a/src/northbridge/via/cn700/Makefile.inc b/src/northbridge/via/cn700/Makefile.inc index ebe915f549..9feddd506a 100644 --- a/src/northbridge/via/cn700/Makefile.inc +++ b/src/northbridge/via/cn700/Makefile.inc @@ -18,6 +18,10 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +ifeq ($(CONFIG_NORTHBRIDGE_VIA_CN700),y) + ramstage-y += northbridge.c ramstage-y += agp.c ramstage-y += vga.c + +endif diff --git a/src/northbridge/via/cx700/Makefile.inc b/src/northbridge/via/cx700/Makefile.inc index 03b52c6ff9..57bf2b5230 100644 --- a/src/northbridge/via/cx700/Makefile.inc +++ b/src/northbridge/via/cx700/Makefile.inc @@ -17,6 +17,8 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +ifeq ($(CONFIG_NORTHBRIDGE_VIA_CX700),y) + ramstage-y += reset.c ramstage-y += northbridge.c @@ -24,3 +26,5 @@ ramstage-y += agp.c ramstage-y += lpc.c ramstage-y += sata.c ramstage-y += vga.c + +endif diff --git a/src/northbridge/via/vx800/Makefile.inc b/src/northbridge/via/vx800/Makefile.inc index 2305db9b45..951fc7121d 100644 --- a/src/northbridge/via/vx800/Makefile.inc +++ b/src/northbridge/via/vx800/Makefile.inc @@ -18,6 +18,8 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +ifeq ($(CONFIG_NORTHBRIDGE_VIA_VX800),y) + ramstage-y += northbridge.c ramstage-y += vga.c ramstage-y += lpc.c @@ -25,3 +27,5 @@ ramstage-y += ide.c chipset_bootblock_inc += $(src)/northbridge/via/vx800/romstrap.inc bootblock-y += romstrap.ld + +endif diff --git a/src/northbridge/via/vx900/Makefile.inc b/src/northbridge/via/vx900/Makefile.inc index b51030944a..6178c114ab 100644 --- a/src/northbridge/via/vx900/Makefile.inc +++ b/src/northbridge/via/vx900/Makefile.inc @@ -17,6 +17,8 @@ ## along with this program. If not, see . ## +ifeq ($(CONFIG_NORTHBRIDGE_VIA_VX900),y) + romstage-y += pci_util.c romstage-y += early_smbus.c romstage-y += early_vx900.c @@ -46,3 +48,5 @@ ramstage-y += ./../../../drivers/pc80/vga/vga_io.c chipset_bootblock_inc += $(src)/northbridge/via/vx900/romstrap.inc bootblock-y += romstrap.ld + +endif -- cgit v1.2.3