summaryrefslogtreecommitdiff
path: root/src/northbridge
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2012-08-24 21:54:10 +0300
committerPatrick Georgi <patrick@georgi-clan.de>2012-10-07 12:55:04 +0200
commit02790369ff72d9d2ed5b65eee28f9cde56f3d541 (patch)
tree0c75c91cf49e03d2650932762090dc347ac8cc10 /src/northbridge
parent1f0d379a7e87b12b2b6a4af7833f633b08ef7184 (diff)
downloadcoreboot-02790369ff72d9d2ed5b65eee28f9cde56f3d541.tar.xz
Remove chip.h files without config structure
Also deletes files not included in build: src/southbridge/amd/cimx/sb700/chip_name.c src/southbridge/amd/cimx/sb800/chip_name.c src/southbridge/amd/cimx/sb900/chip_name.c Change-Id: I2068e3859157b758ccea0ca91fa47d09a8639361 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/1473 Tested-by: build bot (Jenkins) Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Reviewed-by: Marc Jones <marcj303@gmail.com>
Diffstat (limited to 'src/northbridge')
-rw-r--r--src/northbridge/amd/agesa/family10/chip.h23
-rw-r--r--src/northbridge/amd/agesa/family10/northbridge.c2
-rw-r--r--src/northbridge/amd/agesa/family10/root_complex/chip.h23
-rw-r--r--src/northbridge/amd/agesa/family12/chip.h23
-rw-r--r--src/northbridge/amd/agesa/family12/northbridge.c1
-rw-r--r--src/northbridge/amd/agesa/family12/root_complex/chip.h23
-rw-r--r--src/northbridge/amd/agesa/family14/chip.h23
-rw-r--r--src/northbridge/amd/agesa/family14/northbridge.c1
-rw-r--r--src/northbridge/amd/agesa/family14/root_complex/chip.h23
-rw-r--r--src/northbridge/amd/agesa/family15/chip.h23
-rw-r--r--src/northbridge/amd/agesa/family15/northbridge.c2
-rw-r--r--src/northbridge/amd/agesa/family15/root_complex/chip.h23
-rw-r--r--src/northbridge/amd/agesa/family15tn/chip.h23
-rw-r--r--src/northbridge/amd/agesa/family15tn/northbridge.c2
-rw-r--r--src/northbridge/amd/agesa/family15tn/root_complex/chip.h23
-rw-r--r--src/northbridge/amd/amdfam10/chip.h23
-rw-r--r--src/northbridge/amd/amdfam10/northbridge.c2
-rw-r--r--src/northbridge/amd/amdfam10/root_complex/chip.h23
-rw-r--r--src/northbridge/amd/amdk8/chip.h4
-rw-r--r--src/northbridge/amd/amdk8/northbridge.c2
-rw-r--r--src/northbridge/amd/amdk8/root_complex/chip.h4
-rw-r--r--src/northbridge/amd/gx1/chip.h4
-rw-r--r--src/northbridge/amd/gx1/northbridge.c1
-rw-r--r--src/northbridge/amd/gx2/chip.h24
-rw-r--r--src/northbridge/amd/gx2/northbridge.c1
-rw-r--r--src/northbridge/amd/gx2/northbridgeinit.c1
-rw-r--r--src/northbridge/amd/lx/chip.h23
-rw-r--r--src/northbridge/amd/lx/northbridge.c1
-rw-r--r--src/northbridge/amd/lx/northbridgeinit.c1
-rw-r--r--src/northbridge/intel/e7501/chip.h4
-rw-r--r--src/northbridge/intel/e7501/northbridge.c1
-rw-r--r--src/northbridge/intel/e7505/chip.h4
-rw-r--r--src/northbridge/intel/e7505/northbridge.c1
-rw-r--r--src/northbridge/intel/i440bx/chip.h24
-rw-r--r--src/northbridge/intel/i440bx/northbridge.c1
-rw-r--r--src/northbridge/intel/i440lx/chip.h24
-rw-r--r--src/northbridge/intel/i440lx/northbridge.c1
-rw-r--r--src/northbridge/intel/i5000/chip.h22
-rw-r--r--src/northbridge/intel/i5000/northbridge.c1
-rw-r--r--src/northbridge/intel/i82810/chip.h23
-rw-r--r--src/northbridge/intel/i82810/northbridge.c1
-rw-r--r--src/northbridge/intel/i82830/chip.h23
-rw-r--r--src/northbridge/intel/i82830/northbridge.c1
-rw-r--r--src/northbridge/intel/i855/chip.h24
-rw-r--r--src/northbridge/intel/i855/northbridge.c1
-rw-r--r--src/northbridge/intel/i945/chip.h22
-rw-r--r--src/northbridge/intel/i945/northbridge.c1
-rw-r--r--src/northbridge/intel/sch/chip.h22
-rw-r--r--src/northbridge/intel/sch/northbridge.c1
-rw-r--r--src/northbridge/rdc/r8610/chip.h23
-rw-r--r--src/northbridge/rdc/r8610/northbridge.c1
-rw-r--r--src/northbridge/via/cn400/agp.c1
-rw-r--r--src/northbridge/via/cn400/chip.h23
-rw-r--r--src/northbridge/via/cn400/northbridge.c1
-rw-r--r--src/northbridge/via/cn400/vga.c1
-rw-r--r--src/northbridge/via/cn400/vlink.c1
-rw-r--r--src/northbridge/via/cn700/agp.c1
-rw-r--r--src/northbridge/via/cn700/chip.h23
-rw-r--r--src/northbridge/via/cn700/northbridge.c1
-rw-r--r--src/northbridge/via/cn700/vga.c1
-rw-r--r--src/northbridge/via/cx700/chip.h22
-rw-r--r--src/northbridge/via/cx700/northbridge.c1
-rw-r--r--src/northbridge/via/cx700/vga.c1
-rw-r--r--src/northbridge/via/vt8601/chip.h4
-rw-r--r--src/northbridge/via/vt8601/northbridge.c1
-rw-r--r--src/northbridge/via/vt8623/chip.h4
-rw-r--r--src/northbridge/via/vt8623/northbridge.c1
-rw-r--r--src/northbridge/via/vt8623/vga.c1
-rw-r--r--src/northbridge/via/vx800/chip.h22
-rw-r--r--src/northbridge/via/vx800/ide.c5
-rw-r--r--src/northbridge/via/vx800/lpc.c1
-rw-r--r--src/northbridge/via/vx800/northbridge.c1
-rw-r--r--src/northbridge/via/vx800/vga.c1
73 files changed, 0 insertions, 696 deletions
diff --git a/src/northbridge/amd/agesa/family10/chip.h b/src/northbridge/amd/agesa/family10/chip.h
deleted file mode 100644
index f95d5b1170..0000000000
--- a/src/northbridge/amd/agesa/family10/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Advanced Micro Devices, 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
- */
-
-struct northbridge_amd_agesa_family10_config
-{
-};
-
diff --git a/src/northbridge/amd/agesa/family10/northbridge.c b/src/northbridge/amd/agesa/family10/northbridge.c
index 2bea5d1c78..f1ed610e42 100644
--- a/src/northbridge/amd/agesa/family10/northbridge.c
+++ b/src/northbridge/amd/agesa/family10/northbridge.c
@@ -39,10 +39,8 @@
#include <Porting.h>
#include <AGESA.h>
#include <Options.h>
-#include "root_complex/chip.h"
#include "northbridge.h"
#include "amdfam10.h"
-#include "chip.h"
extern uint32_t agesawrapper_amdinitmid(void);
diff --git a/src/northbridge/amd/agesa/family10/root_complex/chip.h b/src/northbridge/amd/agesa/family10/root_complex/chip.h
deleted file mode 100644
index 80adb8eb71..0000000000
--- a/src/northbridge/amd/agesa/family10/root_complex/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Advanced Micro Devices, 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
- */
-
-struct northbridge_amd_agesa_family10_root_complex_config
-{
-};
-
diff --git a/src/northbridge/amd/agesa/family12/chip.h b/src/northbridge/amd/agesa/family12/chip.h
deleted file mode 100644
index 39efd523d6..0000000000
--- a/src/northbridge/amd/agesa/family12/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Advanced Micro Devices, 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
- */
-
-struct northbridge_amd_agesa_family12_config
-{
-};
-
diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c
index 7f1478714b..ac3f3082e7 100644
--- a/src/northbridge/amd/agesa/family12/northbridge.c
+++ b/src/northbridge/amd/agesa/family12/northbridge.c
@@ -33,7 +33,6 @@
#include <cpu/x86/lapic.h>
#include <cpu/amd/mtrr.h>
-#include "chip.h"
#include "northbridge.h"
#include "SbEarly.h"
#include "agesawrapper.h"
diff --git a/src/northbridge/amd/agesa/family12/root_complex/chip.h b/src/northbridge/amd/agesa/family12/root_complex/chip.h
deleted file mode 100644
index 556f343ad5..0000000000
--- a/src/northbridge/amd/agesa/family12/root_complex/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Advanced Micro Devices, 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
- */
-
-struct northbridge_amd_agesa_family12_root_complex_config
-{
-};
-
diff --git a/src/northbridge/amd/agesa/family14/chip.h b/src/northbridge/amd/agesa/family14/chip.h
deleted file mode 100644
index 46ea78a64a..0000000000
--- a/src/northbridge/amd/agesa/family14/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Advanced Micro Devices, 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
- */
-
-struct northbridge_amd_agesa_family14_config
-{
-};
-
diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c
index 7ff9adfbba..74473c065e 100644
--- a/src/northbridge/amd/agesa/family14/northbridge.c
+++ b/src/northbridge/amd/agesa/family14/northbridge.c
@@ -34,7 +34,6 @@
#include <cpu/amd/mtrr.h>
#include "agesawrapper.h"
-#include "chip.h"
#include "northbridge.h"
#if CONFIG_AMD_SB_CIMX
#include <sb_cimx.h>
diff --git a/src/northbridge/amd/agesa/family14/root_complex/chip.h b/src/northbridge/amd/agesa/family14/root_complex/chip.h
deleted file mode 100644
index cf95179073..0000000000
--- a/src/northbridge/amd/agesa/family14/root_complex/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Advanced Micro Devices, 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
- */
-
-struct northbridge_amd_agesa_family14_root_complex_config
-{
-};
-
diff --git a/src/northbridge/amd/agesa/family15/chip.h b/src/northbridge/amd/agesa/family15/chip.h
deleted file mode 100644
index b06318b980..0000000000
--- a/src/northbridge/amd/agesa/family15/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 Advanced Micro Devices, 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
- */
-
-struct northbridge_amd_agesa_family15_config
-{
-};
-
diff --git a/src/northbridge/amd/agesa/family15/northbridge.c b/src/northbridge/amd/agesa/family15/northbridge.c
index c4fc6a891d..f297fc0a8c 100644
--- a/src/northbridge/amd/agesa/family15/northbridge.c
+++ b/src/northbridge/amd/agesa/family15/northbridge.c
@@ -40,9 +40,7 @@
#include <cpu/amd/amdfam15.h>
#include <cpuRegisters.h>
#include "agesawrapper.h"
-#include "root_complex/chip.h"
#include "northbridge.h"
-#include "chip.h"
#define MAX_NODE_NUMS (MAX_NODES * MAX_DIES)
diff --git a/src/northbridge/amd/agesa/family15/root_complex/chip.h b/src/northbridge/amd/agesa/family15/root_complex/chip.h
deleted file mode 100644
index 8f670f6b94..0000000000
--- a/src/northbridge/amd/agesa/family15/root_complex/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 Advanced Micro Devices, 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
- */
-
-struct northbridge_amd_agesa_family15_root_complex_config
-{
-};
-
diff --git a/src/northbridge/amd/agesa/family15tn/chip.h b/src/northbridge/amd/agesa/family15tn/chip.h
deleted file mode 100644
index 091de82f6d..0000000000
--- a/src/northbridge/amd/agesa/family15tn/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 Advanced Micro Devices, 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
- */
-
-struct northbridge_amd_agesa_family15tn_config
-{
-};
-
diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c
index 5d50b09b88..ac605b0304 100644
--- a/src/northbridge/amd/agesa/family15tn/northbridge.c
+++ b/src/northbridge/amd/agesa/family15tn/northbridge.c
@@ -40,9 +40,7 @@
#include <cpu/amd/amdfam15.h>
#include <cpuRegisters.h>
#include "agesawrapper.h"
-#include "root_complex/chip.h"
#include "northbridge.h"
-#include "chip.h"
#define MAX_NODE_NUMS (MAX_NODES * MAX_DIES)
diff --git a/src/northbridge/amd/agesa/family15tn/root_complex/chip.h b/src/northbridge/amd/agesa/family15tn/root_complex/chip.h
deleted file mode 100644
index 0306fdd08b..0000000000
--- a/src/northbridge/amd/agesa/family15tn/root_complex/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 Advanced Micro Devices, 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
- */
-
-struct northbridge_amd_agesa_family15tn_root_complex_config
-{
-};
-
diff --git a/src/northbridge/amd/amdfam10/chip.h b/src/northbridge/amd/amdfam10/chip.h
deleted file mode 100644
index a8161cbb35..0000000000
--- a/src/northbridge/amd/amdfam10/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Advanced Micro Devices, 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
- */
-
-struct northbridge_amd_amdfam10_config
-{
-};
-
diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
index a30bd91791..7f05b46aa5 100644
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -37,8 +37,6 @@
#include <pc80/mc146818rtc.h>
#endif
-#include "chip.h"
-#include "root_complex/chip.h"
#include "northbridge.h"
#include "amdfam10.h"
diff --git a/src/northbridge/amd/amdfam10/root_complex/chip.h b/src/northbridge/amd/amdfam10/root_complex/chip.h
deleted file mode 100644
index 8c93020f7b..0000000000
--- a/src/northbridge/amd/amdfam10/root_complex/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Advanced Micro Devices, 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
- */
-
-struct northbridge_amd_amdfam10_root_complex_config
-{
-};
-
diff --git a/src/northbridge/amd/amdk8/chip.h b/src/northbridge/amd/amdk8/chip.h
deleted file mode 100644
index a2331f41a2..0000000000
--- a/src/northbridge/amd/amdk8/chip.h
+++ /dev/null
@@ -1,4 +0,0 @@
-struct northbridge_amd_amdk8_config
-{
-};
-
diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index eba018fa3e..4d14efabcc 100644
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -25,8 +25,6 @@
#include <pc80/mc146818rtc.h>
#endif
-#include "chip.h"
-#include "root_complex/chip.h"
#include "northbridge.h"
#include "amdk8.h"
diff --git a/src/northbridge/amd/amdk8/root_complex/chip.h b/src/northbridge/amd/amdk8/root_complex/chip.h
deleted file mode 100644
index a9b6b5b2cd..0000000000
--- a/src/northbridge/amd/amdk8/root_complex/chip.h
+++ /dev/null
@@ -1,4 +0,0 @@
-struct northbridge_amd_amdk8_root_complex_config
-{
-};
-
diff --git a/src/northbridge/amd/gx1/chip.h b/src/northbridge/amd/gx1/chip.h
deleted file mode 100644
index 0378b61f2e..0000000000
--- a/src/northbridge/amd/gx1/chip.h
+++ /dev/null
@@ -1,4 +0,0 @@
-struct northbridge_amd_gx1_config
-{
-};
-
diff --git a/src/northbridge/amd/gx1/northbridge.c b/src/northbridge/amd/gx1/northbridge.c
index 5c59f7314a..fbea3b58a3 100644
--- a/src/northbridge/amd/gx1/northbridge.c
+++ b/src/northbridge/amd/gx1/northbridge.c
@@ -7,7 +7,6 @@
#include <stdlib.h>
#include <string.h>
#include <bitops.h>
-#include "chip.h"
#include "northbridge.h"
#include <cpu/amd/gx1def.h>
#include <cpu/x86/cache.h>
diff --git a/src/northbridge/amd/gx2/chip.h b/src/northbridge/amd/gx2/chip.h
deleted file mode 100644
index 1e266c6dc5..0000000000
--- a/src/northbridge/amd/gx2/chip.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * 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
- */
-
-struct northbridge_amd_gx2_config
-{
-
-};
-
diff --git a/src/northbridge/amd/gx2/northbridge.c b/src/northbridge/amd/gx2/northbridge.c
index 8da37b4ebf..12096d85fe 100644
--- a/src/northbridge/amd/gx2/northbridge.c
+++ b/src/northbridge/amd/gx2/northbridge.c
@@ -27,7 +27,6 @@
#include <stdlib.h>
#include <string.h>
#include <bitops.h>
-#include "chip.h"
#include "northbridge.h"
#include <cpu/x86/msr.h>
#include <cpu/x86/cache.h>
diff --git a/src/northbridge/amd/gx2/northbridgeinit.c b/src/northbridge/amd/gx2/northbridgeinit.c
index 37fcf7e307..f51bcc6b36 100644
--- a/src/northbridge/amd/gx2/northbridgeinit.c
+++ b/src/northbridge/amd/gx2/northbridgeinit.c
@@ -27,7 +27,6 @@
#include <stdlib.h>
#include <string.h>
#include <bitops.h>
-#include "chip.h"
#include "northbridge.h"
#include <cpu/amd/gx2def.h>
#include <cpu/x86/msr.h>
diff --git a/src/northbridge/amd/lx/chip.h b/src/northbridge/amd/lx/chip.h
deleted file mode 100644
index 12b50fbecf..0000000000
--- a/src/northbridge/amd/lx/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Advanced Micro Devices, 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; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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
- */
-
-struct northbridge_amd_lx_config {
-};
-
diff --git a/src/northbridge/amd/lx/northbridge.c b/src/northbridge/amd/lx/northbridge.c
index 9ceceb8740..5f98b4051e 100644
--- a/src/northbridge/amd/lx/northbridge.c
+++ b/src/northbridge/amd/lx/northbridge.c
@@ -33,7 +33,6 @@
#include <cpu/x86/cache.h>
#include <cpu/amd/vr.h>
#include <cpu/cpu.h>
-#include "chip.h"
#include "northbridge.h"
#include "../../../southbridge/amd/cs5536/cs5536.h"
diff --git a/src/northbridge/amd/lx/northbridgeinit.c b/src/northbridge/amd/lx/northbridgeinit.c
index 54cc057383..6288608095 100644
--- a/src/northbridge/amd/lx/northbridgeinit.c
+++ b/src/northbridge/amd/lx/northbridgeinit.c
@@ -27,7 +27,6 @@
#include <stdlib.h>
#include <string.h>
#include <bitops.h>
-#include "chip.h"
#include "northbridge.h"
#include <cpu/amd/lxdef.h>
#include <cpu/x86/msr.h>
diff --git a/src/northbridge/intel/e7501/chip.h b/src/northbridge/intel/e7501/chip.h
deleted file mode 100644
index 112c03cdc4..0000000000
--- a/src/northbridge/intel/e7501/chip.h
+++ /dev/null
@@ -1,4 +0,0 @@
-struct northbridge_intel_e7501_config
-{
-};
-
diff --git a/src/northbridge/intel/e7501/northbridge.c b/src/northbridge/intel/e7501/northbridge.c
index 1fa77d7931..c70f032597 100644
--- a/src/northbridge/intel/e7501/northbridge.c
+++ b/src/northbridge/intel/e7501/northbridge.c
@@ -7,7 +7,6 @@
#include <stdlib.h>
#include <string.h>
#include <bitops.h>
-#include "chip.h"
#if CONFIG_WRITE_HIGH_TABLES
#include <cbmem.h>
diff --git a/src/northbridge/intel/e7505/chip.h b/src/northbridge/intel/e7505/chip.h
deleted file mode 100644
index 8fd3cdcfb0..0000000000
--- a/src/northbridge/intel/e7505/chip.h
+++ /dev/null
@@ -1,4 +0,0 @@
-struct northbridge_intel_e7505_config
-{
-};
-
diff --git a/src/northbridge/intel/e7505/northbridge.c b/src/northbridge/intel/e7505/northbridge.c
index 9046f43687..b6d24fa98b 100644
--- a/src/northbridge/intel/e7505/northbridge.c
+++ b/src/northbridge/intel/e7505/northbridge.c
@@ -7,7 +7,6 @@
#include <stdlib.h>
#include <string.h>
#include <bitops.h>
-#include "chip.h"
#include "e7505.h"
#if CONFIG_WRITE_HIGH_TABLES
diff --git a/src/northbridge/intel/i440bx/chip.h b/src/northbridge/intel/i440bx/chip.h
deleted file mode 100644
index 15ecb4d735..0000000000
--- a/src/northbridge/intel/i440bx/chip.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
- *
- * 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; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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
- */
-
-struct northbridge_intel_i440bx_config
-{
-};
-
diff --git a/src/northbridge/intel/i440bx/northbridge.c b/src/northbridge/intel/i440bx/northbridge.c
index 18e57167b4..39bd6b9aca 100644
--- a/src/northbridge/intel/i440bx/northbridge.c
+++ b/src/northbridge/intel/i440bx/northbridge.c
@@ -9,7 +9,6 @@
#include <bitops.h>
#include <cpu/cpu.h>
#include <pc80/keyboard.h>
-#include "chip.h"
#include "northbridge.h"
#include "i440bx.h"
diff --git a/src/northbridge/intel/i440lx/chip.h b/src/northbridge/intel/i440lx/chip.h
deleted file mode 100644
index 19a9b26980..0000000000
--- a/src/northbridge/intel/i440lx/chip.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2009 Maciej Pijanka <maciej.pijanka@gmail.com>
- *
- * 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; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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
- */
-
-struct northbridge_intel_i440lx_config
-{
-};
-
diff --git a/src/northbridge/intel/i440lx/northbridge.c b/src/northbridge/intel/i440lx/northbridge.c
index f34b5abaa8..57fcfcb8a7 100644
--- a/src/northbridge/intel/i440lx/northbridge.c
+++ b/src/northbridge/intel/i440lx/northbridge.c
@@ -30,7 +30,6 @@
#include <bitops.h>
#include <cpu/cpu.h>
#include <pc80/keyboard.h>
-#include "chip.h"
#include "northbridge.h"
#include "i440lx.h"
diff --git a/src/northbridge/intel/i5000/chip.h b/src/northbridge/intel/i5000/chip.h
deleted file mode 100644
index 214ffcf23b..0000000000
--- a/src/northbridge/intel/i5000/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Sven Schnelle <svens@stackframe.org>
- *
- * 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
- */
-
-struct northbridge_intel_i5000_config {
-};
-
diff --git a/src/northbridge/intel/i5000/northbridge.c b/src/northbridge/intel/i5000/northbridge.c
index ea3665caf9..1548f19366 100644
--- a/src/northbridge/intel/i5000/northbridge.c
+++ b/src/northbridge/intel/i5000/northbridge.c
@@ -29,7 +29,6 @@
#include <cpu/cpu.h>
#include <arch/acpi.h>
#include <cbmem.h>
-#include "chip.h"
#if CONFIG_WRITE_HIGH_TABLES
#include <cbmem.h>
#endif
diff --git a/src/northbridge/intel/i82810/chip.h b/src/northbridge/intel/i82810/chip.h
deleted file mode 100644
index c57167756a..0000000000
--- a/src/northbridge/intel/i82810/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Corey Osgood <corey.osgood@gmail.com>
- *
- * 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; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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
- */
-
-struct northbridge_intel_i82810_config {
-};
-
diff --git a/src/northbridge/intel/i82810/northbridge.c b/src/northbridge/intel/i82810/northbridge.c
index 5c51b9aac2..4c09d44d95 100644
--- a/src/northbridge/intel/i82810/northbridge.c
+++ b/src/northbridge/intel/i82810/northbridge.c
@@ -29,7 +29,6 @@
#include <string.h>
#include <bitops.h>
#include <cpu/cpu.h>
-#include "chip.h"
#include "northbridge.h"
#include "i82810.h"
diff --git a/src/northbridge/intel/i82830/chip.h b/src/northbridge/intel/i82830/chip.h
deleted file mode 100644
index d0360fe925..0000000000
--- a/src/northbridge/intel/i82830/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Joseph Smith <joe@smittys.pointclark.net>
- *
- * 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; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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
- */
-
-struct northbridge_intel_i82830_config {
-};
-
diff --git a/src/northbridge/intel/i82830/northbridge.c b/src/northbridge/intel/i82830/northbridge.c
index f3341d4d33..95ac2edd5d 100644
--- a/src/northbridge/intel/i82830/northbridge.c
+++ b/src/northbridge/intel/i82830/northbridge.c
@@ -28,7 +28,6 @@
#include <stdlib.h>
#include <string.h>
#include <bitops.h>
-#include "chip.h"
#include "i82830.h"
static void northbridge_init(device_t dev)
diff --git a/src/northbridge/intel/i855/chip.h b/src/northbridge/intel/i855/chip.h
deleted file mode 100644
index 40b1d38e1a..0000000000
--- a/src/northbridge/intel/i855/chip.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2006 Jon Dufresne <jon.dufresne@gmail.com>
- *
- * 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; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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
- */
-
-struct northbridge_intel_i855_config
-{
-};
-
diff --git a/src/northbridge/intel/i855/northbridge.c b/src/northbridge/intel/i855/northbridge.c
index b59ba50a8b..74e2c766a7 100644
--- a/src/northbridge/intel/i855/northbridge.c
+++ b/src/northbridge/intel/i855/northbridge.c
@@ -31,7 +31,6 @@
#include <bitops.h>
#include <cpu/x86/cache.h>
#include <cpu/cpu.h>
-#include "chip.h"
static void northbridge_init(device_t dev)
{
diff --git a/src/northbridge/intel/i945/chip.h b/src/northbridge/intel/i945/chip.h
deleted file mode 100644
index 2deb985bb0..0000000000
--- a/src/northbridge/intel/i945/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007-2008 coresystems GmbH
- *
- * 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
- */
-
-struct northbridge_intel_i945_config {
-};
-
diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c
index 41b15cfabe..684bb7195d 100644
--- a/src/northbridge/intel/i945/northbridge.c
+++ b/src/northbridge/intel/i945/northbridge.c
@@ -29,7 +29,6 @@
#include <bitops.h>
#include <cpu/cpu.h>
#include <arch/acpi.h>
-#include "chip.h"
#include "i945.h"
static int get_pcie_bar(u32 *base, u32 *len)
diff --git a/src/northbridge/intel/sch/chip.h b/src/northbridge/intel/sch/chip.h
deleted file mode 100644
index b3aebd35c8..0000000000
--- a/src/northbridge/intel/sch/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007-2010 coresystems GmbH
- *
- * 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
- */
-
-struct northbridge_intel_sch_config {
-};
-
diff --git a/src/northbridge/intel/sch/northbridge.c b/src/northbridge/intel/sch/northbridge.c
index 48556e2f92..16ada2fa6c 100644
--- a/src/northbridge/intel/sch/northbridge.c
+++ b/src/northbridge/intel/sch/northbridge.c
@@ -29,7 +29,6 @@
#include <bitops.h>
#include <cpu/cpu.h>
#include <arch/acpi.h>
-#include "chip.h"
#include "sch.h"
static int get_pcie_bar(u32 *base, u32 *len)
diff --git a/src/northbridge/rdc/r8610/chip.h b/src/northbridge/rdc/r8610/chip.h
deleted file mode 100644
index 150f032d69..0000000000
--- a/src/northbridge/rdc/r8610/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Corey Osgood <corey.osgood@gmail.com>
- *
- * 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; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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
- */
-
-struct northbridge_rdc_r8610_config {
-};
-
diff --git a/src/northbridge/rdc/r8610/northbridge.c b/src/northbridge/rdc/r8610/northbridge.c
index 250ace01ac..65fd5ebf72 100644
--- a/src/northbridge/rdc/r8610/northbridge.c
+++ b/src/northbridge/rdc/r8610/northbridge.c
@@ -30,7 +30,6 @@
#include <string.h>
#include <bitops.h>
#include <smbios.h>
-#include "chip.h"
#if CONFIG_WRITE_HIGH_TABLES
#include <cbmem.h>
diff --git a/src/northbridge/via/cn400/agp.c b/src/northbridge/via/cn400/agp.c
index a302759371..f6dbc696ee 100644
--- a/src/northbridge/via/cn400/agp.c
+++ b/src/northbridge/via/cn400/agp.c
@@ -24,7 +24,6 @@
#include <device/device.h>
#include <device/pci.h>
#include <device/pci_ids.h>
-#include "chip.h"
#include "northbridge.h"
#include "cn400.h"
diff --git a/src/northbridge/via/cn400/chip.h b/src/northbridge/via/cn400/chip.h
deleted file mode 100644
index e403d352c0..0000000000
--- a/src/northbridge/via/cn400/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Corey Osgood <corey.osgood@gmail.com>
- *
- * 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; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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
- */
-
-struct northbridge_via_cn400_config {
-};
-
diff --git a/src/northbridge/via/cn400/northbridge.c b/src/northbridge/via/cn400/northbridge.c
index 74e0edff53..61d7345d99 100644
--- a/src/northbridge/via/cn400/northbridge.c
+++ b/src/northbridge/via/cn400/northbridge.c
@@ -30,7 +30,6 @@
#include <string.h>
#include <bitops.h>
#include <cpu/cpu.h>
-#include "chip.h"
#include "northbridge.h"
#include "cn400.h"
diff --git a/src/northbridge/via/cn400/vga.c b/src/northbridge/via/cn400/vga.c
index 7641a81012..8c75a4fa30 100644
--- a/src/northbridge/via/cn400/vga.c
+++ b/src/northbridge/via/cn400/vga.c
@@ -34,7 +34,6 @@
#include <bitops.h>
#include <cpu/cpu.h>
#include <arch/interrupt.h>
-#include "chip.h"
#include "northbridge.h"
#include "cn400.h"
diff --git a/src/northbridge/via/cn400/vlink.c b/src/northbridge/via/cn400/vlink.c
index dc574c130d..85a0fc676f 100644
--- a/src/northbridge/via/cn400/vlink.c
+++ b/src/northbridge/via/cn400/vlink.c
@@ -22,7 +22,6 @@
#include <device/device.h>
#include <device/pci.h>
#include <device/pci_ids.h>
-#include "chip.h"
#include "northbridge.h"
#include "cn400.h"
diff --git a/src/northbridge/via/cn700/agp.c b/src/northbridge/via/cn700/agp.c
index 327fac4ea2..ba84f7987d 100644
--- a/src/northbridge/via/cn700/agp.c
+++ b/src/northbridge/via/cn700/agp.c
@@ -24,7 +24,6 @@
#include <device/device.h>
#include <device/pci.h>
#include <device/pci_ids.h>
-#include "chip.h"
#include "northbridge.h"
#include "cn700.h"
diff --git a/src/northbridge/via/cn700/chip.h b/src/northbridge/via/cn700/chip.h
deleted file mode 100644
index 5b1515dc8f..0000000000
--- a/src/northbridge/via/cn700/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Corey Osgood <corey.osgood@gmail.com>
- *
- * 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; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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
- */
-
-struct northbridge_via_cn700_config {
-};
-
diff --git a/src/northbridge/via/cn700/northbridge.c b/src/northbridge/via/cn700/northbridge.c
index ced4c2f740..837ec8572e 100644
--- a/src/northbridge/via/cn700/northbridge.c
+++ b/src/northbridge/via/cn700/northbridge.c
@@ -30,7 +30,6 @@
#include <string.h>
#include <bitops.h>
#include <cpu/cpu.h>
-#include "chip.h"
#include "northbridge.h"
#include "cn700.h"
diff --git a/src/northbridge/via/cn700/vga.c b/src/northbridge/via/cn700/vga.c
index 33d1fe0071..d184644fd4 100644
--- a/src/northbridge/via/cn700/vga.c
+++ b/src/northbridge/via/cn700/vga.c
@@ -34,7 +34,6 @@
#include <bitops.h>
#include <cpu/cpu.h>
#include <arch/interrupt.h>
-#include "chip.h"
#include "northbridge.h"
#include "cn700.h"
diff --git a/src/northbridge/via/cx700/chip.h b/src/northbridge/via/cx700/chip.h
deleted file mode 100644
index 0e8491bbb4..0000000000
--- a/src/northbridge/via/cx700/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007-2009 coresystems GmbH
- *
- * 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
- */
-
-struct northbridge_via_cx700_config {
-};
-
diff --git a/src/northbridge/via/cx700/northbridge.c b/src/northbridge/via/cx700/northbridge.c
index 4fca723472..1df9ce0814 100644
--- a/src/northbridge/via/cx700/northbridge.c
+++ b/src/northbridge/via/cx700/northbridge.c
@@ -29,7 +29,6 @@
#include <bitops.h>
#include <cpu/cpu.h>
#include <cpu/x86/mtrr.h>
-#include "chip.h"
#include "northbridge.h"
#if CONFIG_WRITE_HIGH_TABLES
diff --git a/src/northbridge/via/cx700/vga.c b/src/northbridge/via/cx700/vga.c
index 91dd8649e9..821edc4992 100644
--- a/src/northbridge/via/cx700/vga.c
+++ b/src/northbridge/via/cx700/vga.c
@@ -31,7 +31,6 @@
#include <cpu/x86/msr.h>
#include <arch/interrupt.h>
#include "registers.h"
-#include "chip.h"
#include "northbridge.h"
/* PCI Domain 1 Device 0 Function 0 */
diff --git a/src/northbridge/via/vt8601/chip.h b/src/northbridge/via/vt8601/chip.h
deleted file mode 100644
index c65e12e54c..0000000000
--- a/src/northbridge/via/vt8601/chip.h
+++ /dev/null
@@ -1,4 +0,0 @@
-struct northbridge_via_vt8601_config
-{
-};
-
diff --git a/src/northbridge/via/vt8601/northbridge.c b/src/northbridge/via/vt8601/northbridge.c
index 92adf3206f..f5f084c17a 100644
--- a/src/northbridge/via/vt8601/northbridge.c
+++ b/src/northbridge/via/vt8601/northbridge.c
@@ -9,7 +9,6 @@
#include <stdlib.h>
#include <string.h>
#include <bitops.h>
-#include "chip.h"
#include "northbridge.h"
/*
diff --git a/src/northbridge/via/vt8623/chip.h b/src/northbridge/via/vt8623/chip.h
deleted file mode 100644
index 5fb3f80999..0000000000
--- a/src/northbridge/via/vt8623/chip.h
+++ /dev/null
@@ -1,4 +0,0 @@
-struct northbridge_via_vt8623_config
-{
-};
-
diff --git a/src/northbridge/via/vt8623/northbridge.c b/src/northbridge/via/vt8623/northbridge.c
index 5ea2212993..76cd7a052c 100644
--- a/src/northbridge/via/vt8623/northbridge.c
+++ b/src/northbridge/via/vt8623/northbridge.c
@@ -11,7 +11,6 @@
#include <cpu/cpu.h>
#include <cpu/x86/mtrr.h>
#include <cpu/x86/msr.h>
-#include "chip.h"
#include "northbridge.h"
/*
diff --git a/src/northbridge/via/vt8623/vga.c b/src/northbridge/via/vt8623/vga.c
index 933c73381a..20857a69a8 100644
--- a/src/northbridge/via/vt8623/vga.c
+++ b/src/northbridge/via/vt8623/vga.c
@@ -30,7 +30,6 @@
#include <cpu/x86/mtrr.h>
#include <cpu/x86/msr.h>
#include <arch/interrupt.h>
-#include "chip.h"
#include "northbridge.h"
static int via_vt8623_int15_handler(struct eregs *regs)
diff --git a/src/northbridge/via/vx800/chip.h b/src/northbridge/via/vx800/chip.h
deleted file mode 100644
index 64df31af51..0000000000
--- a/src/northbridge/via/vx800/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2009 One Laptop per Child, Association, 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
- */
-
-struct northbridge_via_vx800_config {
-};
-
diff --git a/src/northbridge/via/vx800/ide.c b/src/northbridge/via/vx800/ide.c
index 9fa8f35dbe..4ed4879684 100644
--- a/src/northbridge/via/vx800/ide.c
+++ b/src/northbridge/via/vx800/ide.c
@@ -22,7 +22,6 @@
#include <device/pci_ops.h>
#include <device/pci_ids.h>
#include <console/console.h>
-#include "chip.h"
#include <arch/io.h>
#include "vx800.h"
@@ -191,10 +190,6 @@ static void ide_init(struct device *dev)
pci_write_config8(dev, PCI_INTERRUPT_PIN, 0x0);
pci_write_config8(dev, PCI_INTERRUPT_LINE, 0xff);
#if 0
-
- struct southbridge_via_vt8237r_config *sb =
- (struct southbridge_via_vt8237r_config *)dev->chip_info;
-
u8 enables;
u32 cablesel;
diff --git a/src/northbridge/via/vx800/lpc.c b/src/northbridge/via/vx800/lpc.c
index b9941d1270..b5cd5a3d1c 100644
--- a/src/northbridge/via/vx800/lpc.c
+++ b/src/northbridge/via/vx800/lpc.c
@@ -28,7 +28,6 @@
#include <pc80/keyboard.h>
#include <pc80/i8259.h>
#include "vx800.h"
-#include "chip.h"
static const unsigned char pciIrqs[4] = { 0xa, 0x9, 0xb, 0xa };
diff --git a/src/northbridge/via/vx800/northbridge.c b/src/northbridge/via/vx800/northbridge.c
index f3cfa418aa..6274e2333e 100644
--- a/src/northbridge/via/vx800/northbridge.c
+++ b/src/northbridge/via/vx800/northbridge.c
@@ -31,7 +31,6 @@
#include <string.h>
#include <bitops.h>
#include <cpu/cpu.h>
-#include "chip.h"
#include "northbridge.h"
#include "vx800.h"
diff --git a/src/northbridge/via/vx800/vga.c b/src/northbridge/via/vx800/vga.c
index e43801263e..bb7de9ec9d 100644
--- a/src/northbridge/via/vx800/vga.c
+++ b/src/northbridge/via/vx800/vga.c
@@ -33,7 +33,6 @@
#include <cpu/x86/mtrr.h>
#include <cpu/x86/msr.h>
#include <arch/interrupt.h>
-#include "chip.h"
#include "northbridge.h"
/* PCI Domain 1 Device 0 Function 0 */