aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Serbinenko <phcoder@gmail.com>2014-01-25 14:38:51 +0100
committerChristian Gmeiner <christian.gmeiner@gmail.com>2014-01-28 14:04:36 +0100
commitffa81bf29d0e1e98207aa7bb763f78a1e61e91bd (patch)
tree3cbd2e2d3f154701a1f21519664537b3afaf1f97
parent790e3adc7079bfa40c4932e4633096bff2863b03 (diff)
bachmann/ot200: Fix cmos.layout.
In current cmos.layout baud_rate overlaps with hardcoded reboot byte. Fix the layout and provide the default for upgrade. Change-Id: I979b8743c4aab6f17b3acf61b92a74a333203379 Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> Reviewed-on: http://review.coreboot.org/4804 Tested-by: build bot (Jenkins) Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
-rw-r--r--src/mainboard/bachmann/ot200/Kconfig1
-rw-r--r--src/mainboard/bachmann/ot200/cmos.default4
-rw-r--r--src/mainboard/bachmann/ot200/cmos.layout13
3 files changed, 14 insertions, 4 deletions
diff --git a/src/mainboard/bachmann/ot200/Kconfig b/src/mainboard/bachmann/ot200/Kconfig
index 0bf4a7068a..23b206e97f 100644
--- a/src/mainboard/bachmann/ot200/Kconfig
+++ b/src/mainboard/bachmann/ot200/Kconfig
@@ -15,6 +15,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select PLL_MANUAL_CONFIG
select CORE_GLIU_500_266
select HAVE_OPTION_TABLE
+ select HAVE_CMOS_DEFAULT
config MAINBOARD_DIR
string
diff --git a/src/mainboard/bachmann/ot200/cmos.default b/src/mainboard/bachmann/ot200/cmos.default
new file mode 100644
index 0000000000..05eadbfb5f
--- /dev/null
+++ b/src/mainboard/bachmann/ot200/cmos.default
@@ -0,0 +1,4 @@
+boot_option=Fallback
+last_boot=Fallback
+baud_rate=115200
+debug_level=Spew
diff --git a/src/mainboard/bachmann/ot200/cmos.layout b/src/mainboard/bachmann/ot200/cmos.layout
index 90ade93e05..7915af1422 100644
--- a/src/mainboard/bachmann/ot200/cmos.layout
+++ b/src/mainboard/bachmann/ot200/cmos.layout
@@ -24,10 +24,14 @@ entries
# RTC reserved
0 384 r 0 reserved_memory
+384 1 e 4 boot_option
+385 1 e 4 last_boot
+388 4 r 0 reboot_bits
+
# -----------------------------------------------------------------
# coreboot config options: console
-384 3 e 1 baud_rate
-387 4 e 2 debug_level
+392 3 e 1 baud_rate
+395 4 e 2 debug_level
# -----------------------------------------------------------------
# coreboot config options: check sums
@@ -53,9 +57,10 @@ enumerations
2 6 Info
2 7 Debug
2 8 Spew
-
+4 0 Fallback
+4 1 Normal
checksums
-checksum 400 1007 1008
+checksum 392 1007 1008