CONFIG_CHIP_NAME to control config chip.h without .name

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1764 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

2 files changed, 8 insertions, 1 deletions

diff --git a/src/northbridge/amd/amdk8/Config.lb b/src/northbridge/amd/amdk8/Config.lb
index 2371e9b0e3..35b137068b 100644
--- a/src/northbridge/amd/amdk8/Config.lb
+++ b/src/northbridge/amd/amdk8/Config.lb
@@ -1,7 +1,11 @@
+uses CONFIG_CHIP_NAME
 uses AGP_APERTURE_SIZE
 default AGP_APERTURE_SIZE=0x4000000
 
-config chip.h
+if CONFIG_CHIP_NAME
+	config chip.h
+end
+
 object northbridge.o
 driver misc_control.o
 
diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index c58226915e..85f8fe4e86 100644
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -488,12 +488,15 @@ static struct pci_driver mcf0_driver __pci_driver = {
 	.device = 0x1100,
 };
 
+#if CONFIG_CHIP_NAME == 1
 
 struct chip_operations northbridge_amd_amdk8_ops = {
 	CHIP_NAME("AMD K8 Northbridge")
 	.enable_dev = 0,
 };
 
+#endif
+
 static void pci_domain_read_resources(device_t dev)
 {
 	struct resource *resource;