Drop mainboard chip.h

mainboard_config never worked right, at least not since we've had sconfig.
Hence, drop mainboard/<vendor>/<device>/chip.h and fix up the mainboards that
tried to use it anyways.

Change-Id: I7cd403ea188d8a9fd4c1ad15479fa88e02ab8e83
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/1359
Tested-by: build bot (Jenkins)
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>

2 files changed, 8 insertions, 37 deletions

diff --git a/src/mainboard/siemens/sitemp_g1p1/chip.h b/src/mainboard/siemens/sitemp_g1p1/chip.h
deleted file mode 100644
index ff426e0125..0000000000
--- a/src/mainboard/siemens/sitemp_g1p1/chip.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Advanced Micro Devices, Inc.
- * Copyright (C) 2010 Siemens AG, Inc.
- * (Written by Josef Kellermann <joseph.kellermann@heitec.de> for Siemens AG, 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
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config
-{
-	u32 uma_size;			/* How many UMA should be used in memory for TOP. */
-	unsigned int plx_present : 1;
-};
-
diff --git a/src/mainboard/siemens/sitemp_g1p1/mainboard.c b/src/mainboard/siemens/sitemp_g1p1/mainboard.c
index 05435d8583..905d23f58d 100644
--- a/src/mainboard/siemens/sitemp_g1p1/mainboard.c
+++ b/src/mainboard/siemens/sitemp_g1p1/mainboard.c
@@ -34,7 +34,6 @@
 #include <southbridge/amd/rs690/chip.h>
 #include <southbridge/amd/rs690/rs690.h>
 #include <superio/ite/it8712f/it8712f.h>
-#include "chip.h"
 #if CONFIG_PCI_OPTION_ROM_RUN_YABEL
 #include <x86emu/x86emu.h>
 #endif
@@ -673,13 +672,14 @@ struct {
 };
 
 
-static void update_subsystemid( device_t dev ) {
+unsigned int plx_present = 0;
 
+static void update_subsystemid( device_t dev )
+{
 	int i;
-	struct mainboard_config *mb = dev->chip_info;
 
 	dev->subsystem_vendor = 0x110a;
-	if( mb->plx_present ){
+	if( plx_present ){
 		dev->subsystem_device = 0x4076; // U1P1 = 0x4076, U1P0 = 0x4077
 	} else {
 		dev->subsystem_device = 0x4077; // U1P0 = 0x4077
@@ -701,12 +701,12 @@ static void update_subsystemid( device_t dev ) {
  * @param
  */
 
-static void detect_hw_variant( device_t dev ) {
+static void detect_hw_variant( device_t dev )
+{
 
 	device_t nb_dev =0, dev2 = 0;
 	struct southbridge_amd_rs690_config *cfg;
 	u32 lc_state, id = 0;
-	struct mainboard_config *mb = dev->chip_info;
 
 	printk(BIOS_INFO, "Scan for PLX device ...\n");
 	nb_dev = dev_find_slot(0, PCI_DEVFN(0, 0));
@@ -782,10 +782,10 @@ static void detect_hw_variant( device_t dev ) {
 		break;
 	}
 
-	mb->plx_present = 0;
+	plx_present = 0;
 	if( id == PLX_VIDDID ){
 		printk(BIOS_INFO, "found PLX device\n");
-		mb->plx_present = 1;
+		plx_present = 1;
 		cfg = (struct southbridge_amd_rs690_config *)dev2->chip_info;
 		if( cfg->gfx_tmds ) {
 			printk(BIOS_INFO, "Disable 'gfx_tmds' support\n");