Fix technexion tim5690 board VGA handler

When dropping ramstage.a, unused functions with unresolved
symbols are not silently dropped anymore. This makes the
tim5690 compilation fail.
This fix makes sure we don't compile in the int15 handler code
when we don't set CONFIG_VGA_ROM_RUN

Change-Id: If6872c983d9fd811eb33259421f94b551f3b9b34
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/1929
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Tested-by: build bot (Jenkins)
This commit is contained in:
Stefan Reinauer 2012-11-27 12:44:18 -08:00 committed by Stefan Reinauer
parent 23023a5691
commit bdc1816b23
2 changed files with 8 additions and 2 deletions

View File

@ -23,4 +23,4 @@
ramstage-y += tn_post_code.c ramstage-y += tn_post_code.c
ramstage-y += speaker.c ramstage-y += speaker.c
ramstage-y += vgabios.c ramstage-$(CONFIG_VGA_ROM_RUN) += vgabios.c

View File

@ -188,6 +188,7 @@ static void mb_gpio_init(u16 *iobase)
it8712f_exit_conf(); it8712f_exit_conf();
} }
#if CONFIG_VGA_ROM_RUN
/* The LCD's panel id seletion. */ /* The LCD's panel id seletion. */
static void lcd_panel_id(rs690_vbios_regs *vbios_regs, u8 num_id) static void lcd_panel_id(rs690_vbios_regs *vbios_regs, u8 num_id)
{ {
@ -215,6 +216,7 @@ static void lcd_panel_id(rs690_vbios_regs *vbios_regs, u8 num_id)
break; break;
} }
} }
#endif
/************************************************* /*************************************************
* enable the dedicated function in tim5690 board. * enable the dedicated function in tim5690 board.
@ -222,14 +224,17 @@ static void lcd_panel_id(rs690_vbios_regs *vbios_regs, u8 num_id)
*************************************************/ *************************************************/
static void tim5690_enable(device_t dev) static void tim5690_enable(device_t dev)
{ {
rs690_vbios_regs vbios_regs;
u16 gpio_base = IT8712F_SIMPLE_IO_BASE; u16 gpio_base = IT8712F_SIMPLE_IO_BASE;
#if CONFIG_VGA_ROM_RUN
rs690_vbios_regs vbios_regs;
u8 port2; u8 port2;
#endif
printk(BIOS_INFO, "Mainboard tim5690 Enable. dev=0x%p\n", dev); printk(BIOS_INFO, "Mainboard tim5690 Enable. dev=0x%p\n", dev);
mb_gpio_init(&gpio_base); mb_gpio_init(&gpio_base);
#if CONFIG_VGA_ROM_RUN
/* The LCD's panel id seletion by switch. */ /* The LCD's panel id seletion by switch. */
port2 = inb(gpio_base+1); port2 = inb(gpio_base+1);
lcd_panel_id(&vbios_regs, ((~port2) & 0xf)); lcd_panel_id(&vbios_regs, ((~port2) & 0xf));
@ -237,6 +242,7 @@ static void tim5690_enable(device_t dev)
/* No support TV */ /* No support TV */
vbios_regs.int15_regs.fun05_tv_standard = TV_MODE_NO; vbios_regs.int15_regs.fun05_tv_standard = TV_MODE_NO;
vgabios_init(&vbios_regs); vgabios_init(&vbios_regs);
#endif
set_thermal_config(); set_thermal_config();
} }