From 081602b2115903df7a5d4450c4fd3a7e0be010ee Mon Sep 17 00:00:00 2001 From: "Ronald G. Minnich" Date: Sun, 24 Aug 2008 06:16:03 +0000 Subject: [PATCH] More sensible way to conditionally include hypertransport.c Builds both K8 and Geode bioses with no trouble. Signed-off-by: Ronald G. Minnich Acked-by: Ronald G. Minnch git-svn-id: svn://coreboot.org/repository/coreboot-v3@811 f3766cd6-281f-0410-b1cd-43a5c92072e9 --- device/Makefile | 4 ++++ northbridge/amd/k8/Makefile | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/device/Makefile b/device/Makefile index 78d2d3864e..88f1ada8ac 100644 --- a/device/Makefile +++ b/device/Makefile @@ -28,3 +28,7 @@ STAGE2_DEVICE_SRC = device.c device_util.c root_device.c \ pci_device.c pci_ops.c pci_rom.c pnp_device.c pnp_raw.c \ smbus_ops.c +# this is only needed on the K8 +ifeq ($(CONFIG_NORTHBRIDGE_AMD_K8),y) +STAGE2_DEVICE_SRC += hypertransport.c +endif diff --git a/northbridge/amd/k8/Makefile b/northbridge/amd/k8/Makefile index 9366319d00..2b7f2ba652 100644 --- a/northbridge/amd/k8/Makefile +++ b/northbridge/amd/k8/Makefile @@ -26,7 +26,6 @@ STAGE2_CHIPSET_SRC += $(src)/northbridge/amd/k8/get_sblk_pci1234.c \ $(src)/northbridge/amd/k8/common.c \ $(src)/northbridge/amd/k8/cpu.c \ $(src)/northbridge/amd/k8/domain.c \ - $(src)/northbridge/amd/k8/pci.c \ - $(src)/device/hypertransport.c + $(src)/northbridge/amd/k8/pci.c endif