[coreboot-gerrit] Patch set updated for coreboot: 425dc38 baytrail: romstage: Add config option to enable RMT

[Aaron Durbin]

Aaron Durbin ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4982

-gerrit

commit 425dc38e1027a167ee53844c99309f8624218e7f
Author: Shawn Nematbakhsh 
Date:   Tue Nov 26 15:37:43 2013 -0800

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 
    Reviewed-on: https://chromium-review.googlesource.com/178095
    Reviewed-by: Aaron Durbin 
    Signed-off-by: Aaron Durbin 
---
 src/soc/intel/baytrail/Kconfig                | 4 ++++
 src/soc/intel/baytrail/baytrail/mrc_wrapper.h | 3 ++-
 src/soc/intel/baytrail/romstage/raminit.c     | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/soc/intel/baytrail/Kconfig b/src/soc/intel/baytrail/Kconfig
index eb92bf2..a17852d 100644
--- a/src/soc/intel/baytrail/Kconfig
+++ b/src/soc/intel/baytrail/Kconfig
@@ -82,6 +82,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 858aab8..2074100 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 04c0a94..9b0d892 100644
--- a/src/soc/intel/baytrail/romstage/raminit.c
+++ b/src/soc/intel/baytrail/romstage/raminit.c
@@ -123,7 +123,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)) {