From 0eb9c57049c091b767f5fe65a8c6886567b0700e Mon Sep 17 00:00:00 2001
From: Arthur Heymans <arthur@aheymans.xyz>
Date: Sat, 5 Jan 2019 18:21:47 +0100
Subject: arch/x86: Link walkcbfs.S instead of including it
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Link walkfcbfs.S in the C_ENVIRONMENT_BOOTBLOCK case and also in the
romstage.

This is useful for cbfs access in pre-CAR environments.

Change-Id: I9a17cdf01c7cbc3c9ac45ed1f075731f3e32f64b
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/30681
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
---
 src/cpu/intel/microcode/microcode_asm.S | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/cpu/intel')

diff --git a/src/cpu/intel/microcode/microcode_asm.S b/src/cpu/intel/microcode/microcode_asm.S
index ef85760269..039e02a2b7 100644
--- a/src/cpu/intel/microcode/microcode_asm.S
+++ b/src/cpu/intel/microcode/microcode_asm.S
@@ -20,7 +20,12 @@
 
 #include <cpu/x86/post_code.h>
 #include <cpu/x86/msr.h>
-#include <arch/x86/walkcbfs.S>
+
+#define CBFS_FILE_MAGIC 0
+#define CBFS_FILE_LEN (CBFS_FILE_MAGIC + 8)
+#define CBFS_FILE_TYPE (CBFS_FILE_LEN + 4)
+#define CBFS_FILE_CHECKSUM (CBFS_FILE_TYPE + 4)
+#define CBFS_FILE_OFFSET (CBFS_FILE_CHECKSUM + 4)
 
 #define HEADER_VER_OFFSET 0
 #define UPDATE_VER_OFFSET 4
-- 
cgit v1.2.3