summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Menzel <pmenzel@molgen.mpg.de>2018-05-13 18:39:58 +0200
committerPatrick Georgi <pgeorgi@google.com>2018-05-15 11:16:08 +0000
commit2b2f89565e1298ba9dad355d2de0c943a846acbb (patch)
treecf088720505bda5d7a25aa9425da35bc905582a1 /src
parentbb0d839b6895698367d3eab31cfa01f12376ddb2 (diff)
downloadcoreboot-2b2f89565e1298ba9dad355d2de0c943a846acbb.tar.xz
mb/emulation/qemu-q35: Enable user option table support
It’s unclear why this option was commented out. Activate the line, and copy the CMOS layout and defaults from qemu-i440fx. TEST=Boot 2.11.1(Debian 1:2.11+dfsg-1ubuntu7) and see that nvramcui works. A changed value doesn’t survive a reboot though. Change-Id: Ieef86f092d323c68a6d2d0cc6c04c395f743a935 Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de> Reviewed-on: https://review.coreboot.org/26265 Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/emulation/qemu-q35/Kconfig2
-rw-r--r--src/mainboard/emulation/qemu-q35/cmos.default4
-rw-r--r--src/mainboard/emulation/qemu-q35/cmos.layout28
3 files changed, 33 insertions, 1 deletions
diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig
index 08759e2a50..6e3dc04498 100644
--- a/src/mainboard/emulation/qemu-q35/Kconfig
+++ b/src/mainboard/emulation/qemu-q35/Kconfig
@@ -5,7 +5,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select CPU_QEMU_X86
select SOUTHBRIDGE_INTEL_I82801IX
select IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS
-# select HAVE_OPTION_TABLE
+ select HAVE_OPTION_TABLE
# select HAVE_PIRQ_TABLE
select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_2048
diff --git a/src/mainboard/emulation/qemu-q35/cmos.default b/src/mainboard/emulation/qemu-q35/cmos.default
new file mode 100644
index 0000000000..82e6fabab9
--- /dev/null
+++ b/src/mainboard/emulation/qemu-q35/cmos.default
@@ -0,0 +1,4 @@
+boot_option = Fallback
+power_on_after_fail = Enable
+debug_level = Spew
+ECC_memory = Disable
diff --git a/src/mainboard/emulation/qemu-q35/cmos.layout b/src/mainboard/emulation/qemu-q35/cmos.layout
new file mode 100644
index 0000000000..b238a379d8
--- /dev/null
+++ b/src/mainboard/emulation/qemu-q35/cmos.layout
@@ -0,0 +1,28 @@
+entries
+
+0 384 r 0 reserved_memory
+384 1 e 4 boot_option
+388 4 h 0 reboot_counter
+#392 3 r 0 unused
+400 1 e 1 power_on_after_fail
+412 4 e 6 debug_level
+456 1 e 1 ECC_memory
+1008 16 h 0 check_sum
+
+enumerations
+
+#ID value text
+1 0 Disable
+1 1 Enable
+2 0 Enable
+2 1 Disable
+4 0 Fallback
+4 1 Normal
+6 5 Notice
+6 6 Info
+6 7 Debug
+6 8 Spew
+
+checksums
+
+checksum 392 1007 1008