From b31eb3e4a82a8e81dbe7adf91492e80a8fd5b5f5 Mon Sep 17 00:00:00 2001 From: Sven Schnelle Date: Tue, 5 Apr 2011 13:00:14 +0000 Subject: [PATCH] X60: move ec version info code to log_ec_version() Signed-off-by: Sven Schnelle Acked-by: Sven Schnelle git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6480 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/lenovo/x60/mainboard.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c index d396b5b1d0..c2aaaa93cf 100644 --- a/src/mainboard/lenovo/x60/mainboard.c +++ b/src/mainboard/lenovo/x60/mainboard.c @@ -49,11 +49,10 @@ static void wlan_enable(void) ec_write(0x3a, 0x20); } -static void mainboard_enable(device_t dev) +static void log_ec_version(void) { unsigned char ecfw[9], c; u16 fwvh, fwvl; - device_t dev0; int i; for(i = 0; i < 8; i++) { @@ -69,9 +68,17 @@ static void mainboard_enable(device_t dev) printk(BIOS_INFO, "EC Firmware ID %s, Version %d.%d%d%c\n", ecfw, fwvh >> 4, fwvh & 0x0f, fwvl >> 4, 0x41 + (fwvl & 0xf)); +} + +static void mainboard_enable(device_t dev) +{ + device_t dev0; + + log_ec_version(); backlight_enable(); trackpoint_enable(); + /* FIXME: this should be ACPI's task * but for now, enable it here */ wlan_enable();