From 7b482c19faf474203f56f91aedbf3ce2cbd77eba Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Tue, 13 Mar 2007 16:54:26 +0000 Subject: [PATCH] trivial fixes. Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@265 f3766cd6-281f-0410-b1cd-43a5c92072e9 --- mainboard/emulation/qemu-x86/Kconfig | 2 -- northbridge/intel/Kconfig | 2 ++ superio/winbond/w83627hf/superio.c | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/mainboard/emulation/qemu-x86/Kconfig b/mainboard/emulation/qemu-x86/Kconfig index 6738bcd11f..ecf8946886 100644 --- a/mainboard/emulation/qemu-x86/Kconfig +++ b/mainboard/emulation/qemu-x86/Kconfig @@ -5,5 +5,3 @@ config MAINBOARD_NAME help This is the default mainboard name. -source northbridge/intel/i440bxemulation/Kconfig - diff --git a/northbridge/intel/Kconfig b/northbridge/intel/Kconfig index be8b6337a8..5410a8b866 100644 --- a/northbridge/intel/Kconfig +++ b/northbridge/intel/Kconfig @@ -25,3 +25,5 @@ config NORTHBRIDGE_INTEL_I440BXEMULATION This option is internally used to decide which northbridge code to use. It is set in the mainboard Kconfig file. +source northbridge/intel/i440bxemulation/Kconfig + diff --git a/superio/winbond/w83627hf/superio.c b/superio/winbond/w83627hf/superio.c index fe47830c69..a572abbf4f 100644 --- a/superio/winbond/w83627hf/superio.c +++ b/superio/winbond/w83627hf/superio.c @@ -73,7 +73,7 @@ static void init_hwm(unsigned long base) int i; unsigned hwm_reg_values[] = { -/* reg mask data */ + /* reg, mask, data */ 0x40, 0xff, 0x81, /* start HWM */ 0x48, 0xaa, 0x2a, /* set SMBus base to 0x54>>1 */ 0x4a, 0x21, 0x21, /* set T2 SMBus base to 0x92>>1 and T3 SMBus base to 0x94>>1 */ @@ -90,9 +90,9 @@ static void init_hwm(unsigned long base) value = pnp_read_index(base, reg); value &= 0xff & hwm_reg_values[i+1]; value |= 0xff & hwm_reg_values[i+2]; -#if 0 - printk_debug("base = 0x%04x, reg = 0x%02x, value = 0x%02x\r\n", base, reg,value); -#endif + + printk(BIOS_SPEW, "base = 0x%04x, reg = 0x%02x, value = 0x%02x\r\n", base, reg,value); + pnp_write_index(base, reg, value); } } @@ -104,7 +104,6 @@ static void w83627hf_init(struct device * dev) #if 1 printk(BIOS_ERR, "dummy init XXXX\n"); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); #endif if (!dev->enabled) {