diff options
author | Timothy Pearson <tpearson@raptorengineeringinc.com> | 2015-08-11 18:38:06 -0500 |
---|---|---|
committer | Nico Huber <nico.h@gmx.de> | 2015-10-29 20:21:57 +0100 |
commit | 919d9ba633786f06963b65ec74bec1ba017f20c8 (patch) | |
tree | dcafaf889b65ffae2fc4a547b2fae8fe2b58591c | |
parent | 8f5053c6260bfe54b85ce76b3c47bccfadfd831a (diff) | |
download | coreboot-staging-919d9ba633786f06963b65ec74bec1ba017f20c8.zip coreboot-staging-919d9ba633786f06963b65ec74bec1ba017f20c8.tar.gz |
mainboard/asus/kgpe-d16: Add nvram option to enable/disable IEEE 1394
Change-Id: I4f0f6c1cb1fad5b65f196dc6b443252a0ecc70a1
Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
Reviewed-on: http://review.coreboot.org/11947
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Tested-by: build bot (Jenkins)
-rw-r--r-- | src/mainboard/asus/kgpe-d16/cmos.default | 1 | ||||
-rw-r--r-- | src/mainboard/asus/kgpe-d16/cmos.layout | 1 | ||||
-rw-r--r-- | src/mainboard/asus/kgpe-d16/romstage.c | 23 |
3 files changed, 20 insertions, 5 deletions
diff --git a/src/mainboard/asus/kgpe-d16/cmos.default b/src/mainboard/asus/kgpe-d16/cmos.default index cffdd03..38b2ddf 100644 --- a/src/mainboard/asus/kgpe-d16/cmos.default +++ b/src/mainboard/asus/kgpe-d16/cmos.default @@ -12,5 +12,6 @@ ecc_scrub_rate = 1.28us interleave_chip_selects = Enable interleave_nodes = Disable interleave_memory_channels = Enable +ieee1394_controller = Enable power_on_after_fail = On boot_option = Fallback diff --git a/src/mainboard/asus/kgpe-d16/cmos.layout b/src/mainboard/asus/kgpe-d16/cmos.layout index bcf9cd3..290c7c6 100644 --- a/src/mainboard/asus/kgpe-d16/cmos.layout +++ b/src/mainboard/asus/kgpe-d16/cmos.layout @@ -41,6 +41,7 @@ entries 456 1 e 1 ECC_memory 457 1 e 1 ECC_redirection 458 4 e 11 hypertransport_speed_limit +477 1 e 1 ieee1394_controller 728 256 h 0 user_data 984 16 h 0 check_sum # Reserve the extended AMD configuration registers diff --git a/src/mainboard/asus/kgpe-d16/romstage.c b/src/mainboard/asus/kgpe-d16/romstage.c index 9964cfe..aa0245d 100644 --- a/src/mainboard/asus/kgpe-d16/romstage.c +++ b/src/mainboard/asus/kgpe-d16/romstage.c @@ -165,10 +165,23 @@ static void set_ddr3_voltage(uint8_t node, uint8_t index) { static void set_peripheral_control_lines(void) { uint8_t byte; - - /* Enable PCICLK5 (onboard FireWire device) */ - outb(0x41, 0xcd6); - outb(0x02, 0xcd7); + uint8_t nvram; + uint8_t enable_ieee1394; + + enable_ieee1394 = 1; + + if (get_option(&nvram, "ieee1394_controller") == CB_SUCCESS) + enable_ieee1394 = nvram & 0x1; + + if (enable_ieee1394) { + /* Enable PCICLK5 (onboard FireWire device) */ + outb(0x41, 0xcd6); + outb(0x02, 0xcd7); + } else { + /* Disable PCICLK5 (onboard FireWire device) */ + outb(0x41, 0xcd6); + outb(0x00, 0xcd7); + } /* Enable the RTC AltCentury register */ outb(0x41, 0xcd6); @@ -419,4 +432,4 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) BOOL AMD_CB_ManualBUIDSwapList (u8 node, u8 link, const u8 **List) { return 0; -}
\ No newline at end of file +} |