summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Nematbakhsh <shawnn@chromium.org>2013-11-26 15:37:43 -0800
committerKyösti Mälkki <kyosti.malkki@gmail.com>2014-05-07 22:07:03 +0200
commit13d934166069de8f61a84ed111683703bdc7c78e (patch)
treebce5b703cd2a0045a4e6eb54fb77a3a76053ea00
parentae31f7dcc4eb173ca4677d3a580c736dc088c5e5 (diff)
downloadcoreboot-13d934166069de8f61a84ed111683703bdc7c78e.tar.xz
baytrail: romstage: Add config option to enable RMT
Add config option to enable RMT in the MRC. BUG=chrome-os-partner:21807 TEST=Manual. Build w/ "USE=rmt", verify RMT print seen on FW console. Build w/o USE flag, verify no RMT print. BRANCH=None. CQ-DEPEND=CL:*148655 Change-Id: Ibd3da87317a3359e797d9b43bc437e7227a85048 Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/178095 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/4982 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
-rw-r--r--src/soc/intel/baytrail/Kconfig4
-rw-r--r--src/soc/intel/baytrail/baytrail/mrc_wrapper.h3
-rw-r--r--src/soc/intel/baytrail/romstage/raminit.c4
3 files changed, 9 insertions, 2 deletions
diff --git a/src/soc/intel/baytrail/Kconfig b/src/soc/intel/baytrail/Kconfig
index e0e6c2ac84..969fa154e2 100644
--- a/src/soc/intel/baytrail/Kconfig
+++ b/src/soc/intel/baytrail/Kconfig
@@ -80,6 +80,10 @@ config MRC_BIN_ADDRESS
hex
default 0xfffa0000
+config MRC_RMT
+ bool "Enable MRC RMT training + debug prints"
+ default n
+
config CACHE_MRC_SETTINGS
bool "Save cached MRC settings"
default n
diff --git a/src/soc/intel/baytrail/baytrail/mrc_wrapper.h b/src/soc/intel/baytrail/baytrail/mrc_wrapper.h
index 858aab887c..2074100a2a 100644
--- a/src/soc/intel/baytrail/baytrail/mrc_wrapper.h
+++ b/src/soc/intel/baytrail/baytrail/mrc_wrapper.h
@@ -28,7 +28,7 @@
#ifndef _MRC_WRAPPER_H_
#define _MRC_WRAPPER_H_
-#define MRC_PARAMS_VER 1
+#define MRC_PARAMS_VER 2
#define NUM_CHANNELS 2
@@ -78,6 +78,7 @@ struct mrc_params {
const void *saved_data;
int txe_size_mb; /* TXE memory size in megabytes. */
+ int rmt_enabled; /* Enable RMT training + prints. */
/* Outputs */
void *txe_base_address;
diff --git a/src/soc/intel/baytrail/romstage/raminit.c b/src/soc/intel/baytrail/romstage/raminit.c
index 017f37d3ef..dc840b0fe8 100644
--- a/src/soc/intel/baytrail/romstage/raminit.c
+++ b/src/soc/intel/baytrail/romstage/raminit.c
@@ -118,7 +118,9 @@ void raminit(struct mrc_params *mp, int prev_sleep_state)
mp->version = MRC_PARAMS_VER;
mp->console_out = &send_to_console;
mp->prev_sleep_state = prev_sleep_state;
-
+#if CONFIG_MRC_RMT
+ mp->rmt_enabled = 1;
+#endif
if (recovery_mode_enabled()) {
printk(BIOS_DEBUG, "Recovery mode: not using MRC cache.\n");
} else if (!mrc_cache_get_current(&cache)) {