Stefan Reinauer (stefan.reinauer@coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1294
-gerrit
commit aa331657ff2fbabb32681809b6eab7d7b874deeb Author: Vadim Bendebury vbendeb@chromium.org Date: Tue Jun 19 05:25:41 2012 +0000
Rename microcode include file to be model agnostic
In preparation to support CBFS hosted microcode blobs, this change renames the wrapper include file containing the microcode to be independent of CPU model.
Change-Id: If1a4963a52e5037a3a3495b90708ffc08b23f4c1 Signed-off-by: Vadim Bendebury vbendeb@chromium.org --- src/cpu/intel/model_206ax/bootblock.c | 2 +- src/cpu/intel/model_206ax/microcode_blob.h | 31 ++++++++++++++++++++++++++ src/cpu/intel/model_206ax/model_206ax_init.c | 2 +- src/cpu/intel/model_206ax/x06_microcode.h | 31 -------------------------- 4 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/src/cpu/intel/model_206ax/bootblock.c b/src/cpu/intel/model_206ax/bootblock.c index 9549d23..62d9b4e 100644 --- a/src/cpu/intel/model_206ax/bootblock.c +++ b/src/cpu/intel/model_206ax/bootblock.c @@ -24,7 +24,7 @@ #include <cpu/x86/mtrr.h>
static const uint32_t microcode_updates[] = { - #include "x06_microcode.h" + #include "microcode_blob.h" };
#include <cpu/intel/microcode/microcode.c> diff --git a/src/cpu/intel/model_206ax/microcode_blob.h b/src/cpu/intel/model_206ax/microcode_blob.h new file mode 100644 index 0000000..d055b2e --- /dev/null +++ b/src/cpu/intel/model_206ax/microcode_blob.h @@ -0,0 +1,31 @@ +/* + * 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 + */ + + +#if CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE + #include "microcode-m12206a7_00000025.h" +#elif CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE +#else +#error "Which microcode to use?" +#endif + /* Dummy terminator */ + 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, diff --git a/src/cpu/intel/model_206ax/model_206ax_init.c b/src/cpu/intel/model_206ax/model_206ax_init.c index b88d7d4..dda7d35 100644 --- a/src/cpu/intel/model_206ax/model_206ax_init.c +++ b/src/cpu/intel/model_206ax/model_206ax_init.c @@ -116,7 +116,7 @@ static acpi_cstate_t cstate_map[] = { };
static const uint32_t microcode_updates[] = { - #include "x06_microcode.h" + #include "microcode_blob.h" };
/* Convert time in seconds to POWER_LIMIT_1_TIME MSR value */ diff --git a/src/cpu/intel/model_206ax/x06_microcode.h b/src/cpu/intel/model_206ax/x06_microcode.h deleted file mode 100644 index d055b2e..0000000 --- a/src/cpu/intel/model_206ax/x06_microcode.h +++ /dev/null @@ -1,31 +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 - */ - - -#if CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE - #include "microcode-m12206a7_00000025.h" -#elif CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE -#else -#error "Which microcode to use?" -#endif - /* Dummy terminator */ - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0,