From df0c8222398f3e0f4334777fb14c6a344c069813 Mon Sep 17 00:00:00 2001 From: Vadim Bendebury Date: Tue, 19 Jun 2012 05:25:41 +0000 Subject: 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 Reviewed-on: http://review.coreboot.org/1294 Tested-by: build bot (Jenkins) --- 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(-) create mode 100644 src/cpu/intel/model_206ax/microcode_blob.h delete mode 100644 src/cpu/intel/model_206ax/x06_microcode.h (limited to 'src/cpu') diff --git a/src/cpu/intel/model_206ax/bootblock.c b/src/cpu/intel/model_206ax/bootblock.c index 9549d23c75..62d9b4edeb 100644 --- a/src/cpu/intel/model_206ax/bootblock.c +++ b/src/cpu/intel/model_206ax/bootblock.c @@ -24,7 +24,7 @@ #include static const uint32_t microcode_updates[] = { - #include "x06_microcode.h" + #include "microcode_blob.h" }; #include 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 0000000000..d055b2e385 --- /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 b88d7d4f36..dda7d354b7 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 d055b2e385..0000000000 --- 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, -- cgit v1.2.3