diff options
author | Stefan Reinauer <reinauer@chromium.org> | 2012-07-26 12:46:48 -0700 |
---|---|---|
committer | Ronald G. Minnich <rminnich@gmail.com> | 2012-07-26 22:57:35 +0200 |
commit | 188e3c2ff06a82f61d7d71e610b32b1a250c0a45 (patch) | |
tree | 7ea1090be5c091785739b2769502ea9c8d5431df /src/mainboard/siemens/sitemp_g1p1/mainboard.c | |
parent | efff733ad83acf8502561a9cadc9202c6974e510 (diff) |
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>
Diffstat (limited to 'src/mainboard/siemens/sitemp_g1p1/mainboard.c')
-rw-r--r-- | src/mainboard/siemens/sitemp_g1p1/mainboard.c | 16 |
1 files changed, 8 insertions, 8 deletions
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"); |