GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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/<vendor>/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 <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/9800
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Stefan Reinauer 2015-04-27 14:04:38 -07:00
parent aae53ab76a
commit e1133b7d7d
37 changed files with 118 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.inc
View File

@ -54,8 +54,8 @@ PHONY+= clean-abuild coreboot lint lint-stable build-dirs
# root source directories of coreboot
subdirs-y := src/lib src/console src/device
subdirs-y += src/ec/acpi $(wildcard src/ec/*/*) $(wildcard src/southbridge/*/*)
subdirs-y += $(wildcard src/soc/*/*)
subdirs-y += src/northbridge src/superio src/drivers src/cpu src/vendorcode
subdirs-y += $(wildcard src/soc/*/*) $(wildcard src/northbridge/*/*)
subdirs-y += src/superio src/drivers src/cpu src/vendorcode
subdirs-y += util/cbfstool util/sconfig util/nvramtool util/broadcom
subdirs-y += $(wildcard src/arch/*)
subdirs-y += src/mainboard/$(MAINBOARDDIR)

5
src/northbridge/Makefile.inc
View File

@ -1,5 +0,0 @@
subdirs-y += amd
subdirs-y += dmp
subdirs-y += intel
subdirs-y += rdc
subdirs-y += via

8
src/northbridge/amd/Makefile.inc
View File

@ -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

5
src/northbridge/amd/agesa/Makefile.inc
View File

@ -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

4
src/northbridge/amd/amdfam10/Makefile.inc
View File

@ -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

4
src/northbridge/amd/amdk8/Makefile.inc
View File

@ -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

4
src/northbridge/amd/cimx/Makefile.inc
View File

@ -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

4
src/northbridge/amd/gx2/Makefile.inc
View File

@ -1,3 +1,7 @@
ifeq ($(CONFIG_NORTHBRIDGE_AMD_GX2),y)
ramstage-y += northbridge.c
ramstage-y += northbridgeinit.c
ramstage-y += grphinit.c
endif

4
src/northbridge/amd/lx/Makefile.inc
View File

@ -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

4
src/northbridge/amd/pi/Makefile.inc
View File

@ -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

20
src/northbridge/dmp/Makefile.inc
View File

@ -1,20 +0,0 @@
##
## This file is part of the coreboot project.
##
## Copyright (C) 2013 DMP Electronics Inc.
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation; version 2 of the License.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
## along with this program; if not, write to the Free Software
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
subdirs-$(CONFIG_NORTHBRIDGE_DMP_VORTEX86EX) += vortex86ex

4
src/northbridge/dmp/vortex86ex/Makefile.inc
View File

@ -17,5 +17,9 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
ifeq ($(CONFIG_NORTHBRIDGE_DMP_VORTEX86EX),y)
ramstage-y += northbridge.c
ramstage-y += xgi_oprom.c
endif

21
src/northbridge/intel/Makefile.inc
View File

@ -1,21 +0,0 @@
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_E7501) += e7501
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_E7505) += e7505
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_I3100) += i3100
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_I440BX) += i440bx
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_I440LX) += i440lx
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_I82810) += i82810
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_I82830) += i82830
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_I855) += i855
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_I945) += i945
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_GM45) += gm45
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_SCH) += sch
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_I5000) += i5000
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_NEHALEM) += nehalem
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE) += sandybridge
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE_NATIVE) += sandybridge
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE) += sandybridge
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE_NATIVE) += sandybridge
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_HASWELL) += haswell
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_FSP_SANDYBRIDGE) += fsp_sandybridge
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_FSP_IVYBRIDGE) += fsp_sandybridge
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_FSP_RANGELEY) += fsp_rangeley

4
src/northbridge/intel/e7501/Makefile.inc
View File

@ -1 +1,5 @@
ifeq ($(CONFIG_NORTHBRIDGE_INTEL_E7501),y)
ramstage-y += northbridge.c
endif

4
src/northbridge/intel/e7505/Makefile.inc
View File

@ -1,3 +1,7 @@
ifeq ($(CONFIG_NORTHBRIDGE_INTEL_E7505),y)
ramstage-y += northbridge.c
romstage-y += raminit.c
romstage-y += debug.c
endif

3
src/northbridge/intel/fsp_rangeley/Makefile.inc
View File

@ -18,6 +18,8 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
ifeq ($(CONFIG_NORTHBRIDGE_INTEL_FSP_RANGELEY),y)
subdirs-y += fsp
ramstage-y += northbridge.c
ramstage-y += raminit.c
@ -36,3 +38,4 @@ CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)
CPPFLAGS_common += -I$(src)/northbridge/intel/fsp_rangeley/
CPPFLAGS_common += -I$(src)/northbridge/intel/fsp_rangeley/fsp
endif

3
src/northbridge/intel/fsp_sandybridge/Makefile.inc
View File

@ -18,6 +18,8 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
ifeq ($(CONFIG_NORTHBRIDGE_INTEL_FSP_SANDYBRIDGE)$(CONFIG_NORTHBRIDGE_INTEL_FSP_IVYBRIDGE),y)
subdirs-y += fsp
ramstage-y += northbridge.c
ramstage-y += ram_calc.c
@ -36,3 +38,4 @@ smm-$(CONFIG_HAVE_SMI_HANDLER) += finalize.c
CPPFLAGS_common += -I$(src)/northbridge/intel/fsp_sandybridge/fsp
endif

4
src/northbridge/intel/gm45/Makefile.inc
View File

@ -17,6 +17,8 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
ifeq ($(CONFIG_NORTHBRIDGE_INTEL_GM45),y)
romstage-y += early_init.c
romstage-y += early_reset.c
romstage-y += delay.c
@ -38,3 +40,5 @@ ramstage-y += northbridge.c
ramstage-y += gma.c
smm-$(CONFIG_HAVE_SMI_HANDLER) += delay.c
endif

3
src/northbridge/intel/haswell/Makefile.inc
View File

@ -17,6 +17,8 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
ifeq ($(CONFIG_NORTHBRIDGE_INTEL_HASWELL),y)
ramstage-y += ram_calc.c
ramstage-y += northbridge.c
ramstage-y += gma.c
@ -52,3 +54,4 @@ mrc.cache-position := 0xfffe0000
mrc.cache-type := mrc_cache
endif
endif

4
src/northbridge/intel/i3100/Makefile.inc
View File

@ -1,3 +1,7 @@
ifeq ($(CONFIG_NORTHBRIDGE_INTEL_I3100),y)
ramstage-y += northbridge.c
ramstage-y += pciexp_porta.c
ramstage-y += pciexp_porta_ep80579.c
endif

4
src/northbridge/intel/i440bx/Makefile.inc
View File

@ -18,7 +18,11 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
ifeq ($(CONFIG_NORTHBRIDGE_INTEL_I440BX),y)
ramstage-y += northbridge.c
romstage-y += raminit.c
romstage-y += debug.c
endif

4
src/northbridge/intel/i440lx/Makefile.inc
View File

@ -18,4 +18,8 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
ifeq ($(CONFIG_NORTHBRIDGE_INTEL_I440LX),y)
ramstage-y += northbridge.c
endif

4
src/northbridge/intel/i5000/Makefile.inc
View File

@ -17,6 +17,10 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
ifeq ($(CONFIG_NORTHBRIDGE_INTEL_I5000),y)
ramstage-y += northbridge.c
romstage-y += raminit.c
cpu_incs += src/northbridge/intel/i5000/halt_second_bsp.S
endif

4
src/northbridge/intel/i82810/Makefile.inc
View File

@ -18,7 +18,11 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
ifeq ($(CONFIG_NORTHBRIDGE_INTEL_I82810),y)
ramstage-y += northbridge.c
romstage-y += raminit.c
romstage-y += debug.c
endif

4
src/northbridge/intel/i82830/Makefile.inc
View File

@ -1,4 +1,8 @@
ifeq ($(CONFIG_NORTHBRIDGE_INTEL_I82830),y)
ramstage-y += northbridge.c
ramstage-y += vga.c
smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
endif

4
src/northbridge/intel/i855/Makefile.inc
View File

@ -1 +1,5 @@
ifeq ($(CONFIG_NORTHBRIDGE_INTEL_I855),y)
ramstage-y += northbridge.c
endif

4
src/northbridge/intel/i945/Makefile.inc
View File

@ -17,6 +17,8 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
ifeq ($(CONFIG_NORTHBRIDGE_INTEL_I945),y)
ramstage-y += ram_calc.c
ramstage-y += northbridge.c
ramstage-y += gma.c
@ -29,3 +31,5 @@ romstage-y += errata.c
romstage-y += debug.c
smm-y += udelay.c
endif

3
src/northbridge/intel/nehalem/Makefile.inc
View File

@ -17,6 +17,8 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
ifeq ($(CONFIG_NORTHBRIDGE_INTEL_NEHALEM),y)
ramstage-y += ram_calc.c
ramstage-y += northbridge.c
ramstage-y += gma.c
@ -42,3 +44,4 @@ mrc.cache-file := $(obj)/mrc.cache
mrc.cache-position := 0xfffe0000
mrc.cache-type := mrc_cache
endif

3
src/northbridge/intel/sandybridge/Makefile.inc
View File

@ -17,6 +17,8 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
ifeq ($(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE_NATIVE)$(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE)$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE_NATIVE)$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE),y)
ramstage-y += ram_calc.c
ramstage-y += northbridge.c
ramstage-y += gma.c
@ -65,3 +67,4 @@ mrc.cache-position := $(mrc-cache-position-y)
mrc.cache-type := mrc_cache
endif
endif

4
src/northbridge/intel/sch/Makefile.inc
View File

@ -17,7 +17,11 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
ifeq ($(CONFIG_NORTHBRIDGE_INTEL_SCH),y)
ramstage-y += northbridge.c
ramstage-y += gma.c
ramstage-y += port_access.c
ramstage-y += acpi.c
endif

1
src/northbridge/rdc/Makefile.inc
View File

@ -1 +0,0 @@
subdirs-$(CONFIG_NORTHBRIDGE_RDC_R8610) += r8610

4
src/northbridge/rdc/r8610/Makefile.inc
View File

@ -18,4 +18,8 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
ifeq ($(CONFIG_NORTHBRIDGE_RDC_R8610),y)
ramstage-y += northbridge.c
endif

4
src/northbridge/via/Makefile.inc
View File

@ -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

4
src/northbridge/via/cn700/Makefile.inc
View File

@ -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

4
src/northbridge/via/cx700/Makefile.inc
View File

@ -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

4
src/northbridge/via/vx800/Makefile.inc
View File

@ -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

4
src/northbridge/via/vx900/Makefile.inc
View File

@ -17,6 +17,8 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>.
##
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