From 279d8b5f3d31fe95c9c403dd12b4d5d02551b6ea Mon Sep 17 00:00:00 2001
From: Rizwan Qureshi <rizwan.qureshi@intel.com>
Date: Thu, 5 Sep 2019 20:06:20 +0530
Subject: [PATCH] cpu/intel/microcode: Make microcode lib available in
 bootblock

Make microcode lib available in bootblock. Now that microcode.c is compiled
in bootlock no need to include it explicitly, hence remove its references.

Change-Id: I419da6af70222902e3ca39fc2133d5dc8558e053
Signed-off-by: Rizwan Qureshi <rizwan.qureshi@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35278
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/cpu/intel/haswell/bootblock.c    | 1 -
 src/cpu/intel/microcode/Makefile.inc | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cpu/intel/haswell/bootblock.c b/src/cpu/intel/haswell/bootblock.c
index 37ce574f35..94e5d36e18 100644
--- a/src/cpu/intel/haswell/bootblock.c
+++ b/src/cpu/intel/haswell/bootblock.c
@@ -18,7 +18,6 @@
 #include <arch/io.h>
 #include <halt.h>
 
-#include <cpu/intel/microcode/microcode.c>
 #include "haswell.h"
 
 #include <southbridge/intel/lynxpoint/pch.h>
diff --git a/src/cpu/intel/microcode/Makefile.inc b/src/cpu/intel/microcode/Makefile.inc
index 2df1d5eb6f..b13172ee16 100644
--- a/src/cpu/intel/microcode/Makefile.inc
+++ b/src/cpu/intel/microcode/Makefile.inc
@@ -1,5 +1,6 @@
 bootblock-$(CONFIG_MICROCODE_UPDATE_PRE_RAM) += microcode_asm.S
 romstage-$(CONFIG_MICROCODE_UPDATE_PRE_RAM) += microcode_asm.S
 
+bootblock-$(CONFIG_SUPPORT_CPU_UCODE_IN_CBFS) += microcode.c
 ramstage-$(CONFIG_SUPPORT_CPU_UCODE_IN_CBFS) += microcode.c
 romstage-$(CONFIG_SUPPORT_CPU_UCODE_IN_CBFS) += microcode.c