From ffa81bf29d0e1e98207aa7bb763f78a1e61e91bd Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sat, 25 Jan 2014 14:38:51 +0100 Subject: [PATCH] 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 Reviewed-on: http://review.coreboot.org/4804 Tested-by: build bot (Jenkins) Reviewed-by: Alexandru Gagniuc Reviewed-by: Paul Menzel Reviewed-by: Christian Gmeiner --- src/mainboard/bachmann/ot200/Kconfig | 1 + src/mainboard/bachmann/ot200/cmos.default | 4 ++++ src/mainboard/bachmann/ot200/cmos.layout | 13 +++++++++---- 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 src/mainboard/bachmann/ot200/cmos.default 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