diff --git a/src/soc/intel/baytrail/baytrail/mrc_wrapper.h b/src/soc/intel/baytrail/baytrail/mrc_wrapper.h
index 556746b..858aab8 100644
--- a/src/soc/intel/baytrail/baytrail/mrc_wrapper.h
+++ b/src/soc/intel/baytrail/baytrail/mrc_wrapper.h
@@ -32,6 +32,9 @@
 
 #define NUM_CHANNELS 2
 
+/* Provide generic x86 calling conventions. */
+#define ABI_X86 __attribute((regparm(0)))
+
 enum {
 	DRAM_INFO_SPD_SMBUS, /* Use the typical SPD smbus access. */
 	DRAM_INFO_SPD_MEM,   /* SPD info in memory. */
@@ -67,7 +70,7 @@
 
 	struct mrc_mainboard_params mainboard;
 
-	void (*console_out)(unsigned char byte);
+	void ABI_X86 (*console_out)(unsigned char byte);
 
 	int prev_sleep_state;
 
@@ -83,6 +86,6 @@
 } __attribute__((packed));
 
 /* Call into wrapper. */
-typedef int (*mrc_wrapper_entry_t)(struct mrc_params *);
+typedef int ABI_X86 (*mrc_wrapper_entry_t)(struct mrc_params *);
 
 #endif /* _MRC_WRAPPER_H_ */
diff --git a/src/soc/intel/baytrail/romstage/raminit.c b/src/soc/intel/baytrail/romstage/raminit.c
index 07267ef..4e8b9a4 100644
--- a/src/soc/intel/baytrail/romstage/raminit.c
+++ b/src/soc/intel/baytrail/romstage/raminit.c
@@ -52,6 +52,11 @@
 	score_select_func(PCU_SMB_DATA_PAD, 1);
 }
 
+static void ABI_X86 send_to_console(unsigned char b)
+{
+	console_tx_byte(b);
+}
+
 void raminit(struct mrc_params *mp, int prev_sleep_state)
 {
 	int ret;
@@ -60,7 +65,7 @@
 
 	/* Fill in default entries. */
 	mp->version = MRC_PARAMS_VER;
-	mp->console_out = &console_tx_byte;
+	mp->console_out = &send_to_console;
 	mp->prev_sleep_state = prev_sleep_state;
 
 	if (!mrc_cache_get_current(&cache)) {