From ee89435798022021026f511deddf0e3b401ad031 Mon Sep 17 00:00:00 2001 From: Alexandru Gagniuc Date: Fri, 13 Dec 2013 16:50:28 -0600 Subject: cpu/intel (non-FSP): Use microcode from blobs repository MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that microcode has been added to blobs, use that one instead of the one included in the tree. Microcode from the tree will be removed in a subsequent patch. Since the microcode updates are blobs, they belong in the blobs repository. This change may introduce a build failure if the "Generate from tree" microcode option is selected, but the blobs repository is not enabled. We have to live with this for now, until microcode is moved to blobs for all CPUs, at which point we may adjust Kconfig accordingly. Leave the FSP cpu alone for now, as that will need approval from SAGE. Change-Id: Ia77ba2e26c083da092449b04ab2323b91a2ca15b Signed-off-by: Alexandru Gagniuc Reviewed-on: http://review.coreboot.org/4530 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Kyösti Mälkki Reviewed-by: Patrick Georgi --- src/cpu/intel/model_206ax/microcode_blob.c | 2 +- src/cpu/intel/model_206ax/microcode_blob.h | 21 --------------------- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 src/cpu/intel/model_206ax/microcode_blob.h (limited to 'src/cpu/intel/model_206ax') diff --git a/src/cpu/intel/model_206ax/microcode_blob.c b/src/cpu/intel/model_206ax/microcode_blob.c index c2538e8ede..197daf2bf9 100644 --- a/src/cpu/intel/model_206ax/microcode_blob.c +++ b/src/cpu/intel/model_206ax/microcode_blob.c @@ -18,5 +18,5 @@ */ unsigned microcode[] = { -#include "microcode_blob.h" + #include "../../../../3rdparty/cpu/intel/model_206ax/microcode.h" }; diff --git a/src/cpu/intel/model_206ax/microcode_blob.h b/src/cpu/intel/model_206ax/microcode_blob.h deleted file mode 100644 index ae24daff8a..0000000000 --- a/src/cpu/intel/model_206ax/microcode_blob.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2011 Google Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - #include "microcode-m12206a7_00000029.h" - #include "microcode-m12306a9_0000001b.h" -- cgit v1.2.3