3 files changed, 16 insertions, 1 deletions
diff --git a/src/mainboard/supermicro/x11-lga1151-series/Kconfig b/src/mainboard/supermicro/x11-lga1151-series/Kconfig
index 6fc9aed7f0..541b23d5b5 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/Kconfig
+++ b/src/mainboard/supermicro/x11-lga1151-series/Kconfig
@@ -4,6 +4,7 @@ config BOARD_SUPERMICRO_BASEBOARD_X11_LGA1151_SERIES
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
+	select HAVE_CMOS_DEFAULT
 	select SOC_INTEL_KABYLAKE
 	select SKYLAKE_SOC_PCH_H
 	select MAINBOARD_HAS_LPC_TPM
diff --git a/src/mainboard/supermicro/x11-lga1151-series/cmos.default b/src/mainboard/supermicro/x11-lga1151-series/cmos.default
new file mode 100644
index 0000000000..d56495357c
--- /dev/null
+++ b/src/mainboard/supermicro/x11-lga1151-series/cmos.default
@@ -0,0 +1,3 @@
+boot_option=Fallback
+debug_level=Debug
+power_on_after_fail=Enable
diff --git a/src/mainboard/supermicro/x11-lga1151-series/cmos.layout b/src/mainboard/supermicro/x11-lga1151-series/cmos.layout
index 201ca3320c..03aea17f8f 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/cmos.layout
+++ b/src/mainboard/supermicro/x11-lga1151-series/cmos.layout
@@ -17,7 +17,6 @@
 entries
 
 #start-bit length  config config-ID    name
-
 0          120       r       0        reserved_memory
 
 # -----------------------------------------------------------------
@@ -28,8 +27,20 @@ entries
 # -----------------------------------------------------------------
 # coreboot config options: console
 395          4       e       6        debug_level
+
+# -----------------------------------------------------------------
+# coreboot config options: cpu
+400          1       e       2        hyper_threading
+
+# -----------------------------------------------------------------
+# coreboot config options: southbridge
+409          2       e       7        power_on_after_fail
+
+# -----------------------------------------------------------------
+# coreboot config options: bootloader
 448          128      r      0        vbnv
 
+# -----------------------------------------------------------------
 # coreboot config options: check sums
 984         16       h       0        check_sum