summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNico Huber <nico.huber@secunet.com>2012-11-13 14:52:56 +0100
committerRonald G. Minnich <rminnich@gmail.com>2012-11-14 17:47:22 +0100
commitf173035ddc338fe6e26bf3e6cef0c006eca47f7d (patch)
tree14a0d1c3b9165b42b17925237fc7125fac851904
parentdb4bb435e8f9947ce005dacd84da7d7c5a5474cd (diff)
downloadcoreboot-f173035ddc338fe6e26bf3e6cef0c006eca47f7d.tar.xz
mainboard/siemens/sitemp_g1p1: Fix YABEL usage
The board was broken for use with CONFIG_PCI_OPTION_ROM_RUN_YABEL. Change-Id: Ia57d630143386fe637af83b9e7345d0d3750b089 Signed-off-by: Nico Huber <nico.huber@secunet.com> Reviewed-on: http://review.coreboot.org/1854 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
-rw-r--r--src/mainboard/siemens/sitemp_g1p1/Makefile.inc2
-rw-r--r--src/mainboard/siemens/sitemp_g1p1/mainboard.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/src/mainboard/siemens/sitemp_g1p1/Makefile.inc b/src/mainboard/siemens/sitemp_g1p1/Makefile.inc
index f93f5e0b60..5e137accdf 100644
--- a/src/mainboard/siemens/sitemp_g1p1/Makefile.inc
+++ b/src/mainboard/siemens/sitemp_g1p1/Makefile.inc
@@ -19,5 +19,5 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-ramstage-y += int15_func.c
+ramstage-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += int15_func.c
diff --git a/src/mainboard/siemens/sitemp_g1p1/mainboard.c b/src/mainboard/siemens/sitemp_g1p1/mainboard.c
index 8a63cffaa5..565ea5660a 100644
--- a/src/mainboard/siemens/sitemp_g1p1/mainboard.c
+++ b/src/mainboard/siemens/sitemp_g1p1/mainboard.c
@@ -23,6 +23,7 @@
#include <device/device.h>
#include <device/pci.h>
#include <arch/io.h>
+#include <arch/interrupt.h>
#include <delay.h>
#include <cpu/x86/msr.h>
#include <cpu/amd/mtrr.h>
@@ -807,14 +808,14 @@ static void smm_lock( void )
static void init(device_t dev)
{
-#if !CONFIG_PCI_OPTION_ROM_RUN_YABEL
+#if CONFIG_PCI_OPTION_ROM_RUN_REALMODE
INT15_function_extensions int15_func;
#endif
printk(BIOS_DEBUG, "%s %s[%x/%x] %s\n",
dev_name(dev), dev_path(dev), dev->subsystem_vendor, dev->subsystem_device, __func__);
-#if !CONFIG_PCI_OPTION_ROM_RUN_YABEL
+#if CONFIG_PCI_OPTION_ROM_RUN_REALMODE
if( get_option(&int15_func.regs.func00_LCD_panel_id, "lcd_panel_id") < 0 )
int15_func.regs.func00_LCD_panel_id = PANEL_TABLE_ID_NO;
int15_func.regs.func05_TV_standard = TV_MODE_NO;