summaryrefslogtreecommitdiff
path: root/src/northbridge/amd
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2009-04-01 13:43:21 +0000
committerStefan Reinauer <stepan@openbios.org>2009-04-01 13:43:21 +0000
commit3081bdfa44b89c2fa34eee902c13e0d1d618bff3 (patch)
treeecbc109bd40a63fc168355b0fff859f9a0473e20 /src/northbridge/amd
parent77cf00850f457e799f7b05ee9c98fb6b990b2514 (diff)
downloadcoreboot-3081bdfa44b89c2fa34eee902c13e0d1d618bff3.tar.xz
Drop CONFIG_CHIP_NAME. Those config statements in Config.lb should
be used unconditionally, and the names don't hurt. Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4042 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/northbridge/amd')
-rw-r--r--src/northbridge/amd/amdfam10/Config.lb5
-rw-r--r--src/northbridge/amd/amdfam10/northbridge.c4
-rw-r--r--src/northbridge/amd/amdk8/Config.lb5
-rw-r--r--src/northbridge/amd/amdk8/northbridge.c4
4 files changed, 2 insertions, 16 deletions
diff --git a/src/northbridge/amd/amdfam10/Config.lb b/src/northbridge/amd/amdfam10/Config.lb
index 2ddbc6fa26..5e9081991d 100644
--- a/src/northbridge/amd/amdfam10/Config.lb
+++ b/src/northbridge/amd/amdfam10/Config.lb
@@ -17,15 +17,12 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-uses CONFIG_CHIP_NAME
uses AGP_APERTURE_SIZE
uses HAVE_ACPI_TABLES
default AGP_APERTURE_SIZE=0x4000000
-if CONFIG_CHIP_NAME
- config chip.h
-end
+config chip.h
driver northbridge.o
driver misc_control.o
diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
index 95e09f4c6a..92f9ea3819 100644
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -652,15 +652,11 @@ static struct pci_driver mcf0_driver __pci_driver = {
.device = 0x1200,
};
-#if CONFIG_CHIP_NAME == 1
-
struct chip_operations northbridge_amd_amdfam10_ops = {
CHIP_NAME("AMD FAM10 Northbridge")
.enable_dev = 0,
};
-#endif
-
static void pci_domain_read_resources(device_t dev)
{
struct resource *resource;
diff --git a/src/northbridge/amd/amdk8/Config.lb b/src/northbridge/amd/amdk8/Config.lb
index 99bb337963..272c7fdc62 100644
--- a/src/northbridge/amd/amdk8/Config.lb
+++ b/src/northbridge/amd/amdk8/Config.lb
@@ -1,12 +1,9 @@
-uses CONFIG_CHIP_NAME
uses AGP_APERTURE_SIZE
uses HAVE_ACPI_TABLES
default AGP_APERTURE_SIZE=0x4000000
-if CONFIG_CHIP_NAME
- config chip.h
-end
+config chip.h
driver northbridge.o
driver misc_control.o
diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index 59cbbff4d0..ac9dc20634 100644
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -629,15 +629,11 @@ static const 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;