GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lenovo/t60: Add CMOS defaults. 

The code for handling the invalid CMOS space in mainboard.c
is now useless and so it was removed.

Change-Id: I86ec6a7f73e32948adff9087d4af5372a49a46a5
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Reviewed-on: http://review.coreboot.org/3520
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Tested-by: build bot (Jenkins)
This commit is contained in:
Denis 'GNUtoo' Carikli 2013-06-23 19:39:03 +02:00 committed by Alexandru Gagniuc
parent 63e35f207c
commit 0bf998e34f
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mainboard/lenovo/t60/Kconfig
View File

@ -23,6 +23,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select EARLY_CBMEM_INIT select EARLY_CBMEM_INIT
select H8_DOCK_EARLY_INIT select H8_DOCK_EARLY_INIT
select HAVE_CMOS_DEFAULT
config MAINBOARD_DIR config MAINBOARD_DIR
string string
default lenovo/t60 default lenovo/t60

21
src/mainboard/lenovo/t60/cmos.default Normal file
View File

@ -0,0 +1,21 @@
boot_option=Fallback
last_boot=Fallback
baud_rate=115200
debug_level=Spew
hyper_threading=Enable
nmi=Enable
boot_devices=''
boot_default=0x41
cmos_defaults_loaded=Yes
lpt=Enable
touchpad=Enable
volume=0x3
first_battery=Primary
bluetooth=Enable
wlan=Enable
wwan=Enable
trackpoint=Enable
fn_ctrl_swap=Disable
sticky_fn=Disable
power_management_beeps=Enable
low_battery_beep=Enable

17
src/mainboard/lenovo/t60/mainboard.c
View File

@ -50,7 +50,6 @@ static void mainboard_enable(device_t dev)
{ {
struct southbridge_intel_i82801gx_config *config; struct southbridge_intel_i82801gx_config *config;
device_t dev0, idedev; device_t dev0, idedev;
u8 defaults_loaded = 0;
/* If we're resuming from suspend, blink suspend LED */ /* If we're resuming from suspend, blink suspend LED */
dev0 = dev_find_slot(0, PCI_DEVFN(0,0)); dev0 = dev_find_slot(0, PCI_DEVFN(0,0));
@ -77,22 +76,6 @@ static void mainboard_enable(device_t dev)
/* set dock status led */ /* set dock status led */
ec_write(0x0c, 0x08); ec_write(0x0c, 0x08);
ec_write(0x0c, inb(0x164c) & 8 ? 0x89 : 0x09); ec_write(0x0c, inb(0x164c) & 8 ? 0x89 : 0x09);
if (get_option(&defaults_loaded, "cmos_defaults_loaded") != CB_SUCCESS) {
printk(BIOS_INFO, "failed to get cmos_defaults_loaded");
defaults_loaded = 0;
}
if (!defaults_loaded) {
printk(BIOS_INFO, "Restoring CMOS defaults\n");
set_option("tft_brightness", &(u8[]){ 0xff });
set_option("volume", &(u8[]){ 0x03 });
/* set baudrate to 115200 baud */
set_option("baud_rate", &(u8[]){ 0x00 });
/* set default debug_level (DEFAULT_CONSOLE_LOGLEVEL starts at 1) */
set_option("debug_level", &(u8[]) { CONFIG_DEFAULT_CONSOLE_LOGLEVEL+1 });
set_option("cmos_defaults_loaded", &(u8[]){ 0x01 });
}
} }
struct chip_operations mainboard_ops = { struct chip_operations mainboard_ops = {