diff options
| author | Marc Jones <marcj303@gmail.com> | 2011-03-17 23:14:24 +0000 |
|---|---|---|
| committer | Marc Jones <marc.jones@amd.com> | 2011-03-17 23:14:24 +0000 |
| commit | 4a46e89c757c17f625505ab7cbc6c3c18751e22a (patch) | |
| tree | 3fca9fb6af07a845cf4ac9e164ecffbd73c9329d | |
| parent | 9c2fb60bfc463906ef07933d5b60f5c5b989a29c (diff) | |
| download | coreboot-4a46e89c757c17f625505ab7cbc6c3c18751e22a.tar.xz | |
Fix breaking the build after removing files in tthe previous checkin.
Signed-off-by: Marc Jones <marcj303@gmail.com>
Acked-by: Marc Jones <marcj303@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6453 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
| -rw-r--r-- | src/cpu/amd/agesa_wrapper/family14/Makefile.inc | 3 | ||||
| -rw-r--r-- | src/vendorcode/amd/agesa/Include/OptionFamily14hInstall.h | 18 | ||||
| -rw-r--r-- | src/vendorcode/amd/agesa/Include/OptionFamily15hInstall.h | 6 |
3 files changed, 0 insertions, 27 deletions
diff --git a/src/cpu/amd/agesa_wrapper/family14/Makefile.inc b/src/cpu/amd/agesa_wrapper/family14/Makefile.inc index 77249de9ec..59728b5584 100644 --- a/src/cpu/amd/agesa_wrapper/family14/Makefile.inc +++ b/src/cpu/amd/agesa_wrapper/family14/Makefile.inc @@ -66,9 +66,6 @@ agesa_lib_src += $(AGESA_ROOT)/Proc/Mem/NB/ON/mnprotoon.c agesa_lib_src += $(AGESA_ROOT)/Proc/CPU/Family/0x14/F14MicrocodePatch05000025.c agesa_lib_src += $(AGESA_ROOT)/Proc/CPU/Family/0x14/F14MicrocodePatch0500000B.c agesa_lib_src += $(AGESA_ROOT)/Proc/CPU/Family/0x14/F14MicrocodePatch0500001A.c -agesa_lib_src += $(AGESA_ROOT)/Proc/CPU/Family/0x14/F14MicrocodePatch0500000B_Unenc.c -agesa_lib_src += $(AGESA_ROOT)/Proc/CPU/Family/0x14/F14MicrocodePatch0500001A_Unenc.c -agesa_lib_src += $(AGESA_ROOT)/Proc/CPU/Family/0x14/F14MicrocodePatch05000025_Unenc.c agesa_lib_src += $(AGESA_ROOT)/Proc/GNB/PCIe/Family/0x14/F14PciePifServices.c agesa_lib_src += $(AGESA_ROOT)/Proc/CPU/Family/0x14/ON/F14OnInitEarlyTable.c agesa_lib_src += $(AGESA_ROOT)/Proc/CPU/cpuInitEarlyTable.c diff --git a/src/vendorcode/amd/agesa/Include/OptionFamily14hInstall.h b/src/vendorcode/amd/agesa/Include/OptionFamily14hInstall.h index a4468e1b16..38a287d5c0 100644 --- a/src/vendorcode/amd/agesa/Include/OptionFamily14hInstall.h +++ b/src/vendorcode/amd/agesa/Include/OptionFamily14hInstall.h @@ -324,11 +324,8 @@ extern F_IS_NB_PSTATE_ENABLED F14IsNbPstateEnabled; #if GET_PATCHES == TRUE #define F14_ON_UCODE_0B - #define F14_ON_UCODE_0B_UNENC #define F14_ON_UCODE_1A - #define F14_ON_UCODE_1A_UNENC #define F14_ON_UCODE_25 - #define F14_ON_UCODE_25_UNENC // If a patch is required for recovery mode to function properly, add a // conditional for AGESA_ENTRY_INIT_RECOVERY, and pull it in. @@ -338,35 +335,20 @@ extern F_IS_NB_PSTATE_ENABLED F14IsNbPstateEnabled; #undef F14_ON_UCODE_0B #define F14_ON_UCODE_0B &CpuF14MicrocodePatch0500000B, - extern CONST MICROCODE_PATCHES ROMDATA CpuF14MicrocodePatch0500000B_Unenc; - #undef F14_ON_UCODE_0B_UNENC - #define F14_ON_UCODE_0B_UNENC &CpuF14MicrocodePatch0500000B_Unenc, - extern CONST MICROCODE_PATCHES ROMDATA CpuF14MicrocodePatch0500001A; #undef F14_ON_UCODE_1A #define F14_ON_UCODE_1A &CpuF14MicrocodePatch0500001A, - - extern CONST MICROCODE_PATCHES ROMDATA CpuF14MicrocodePatch0500001A_Unenc; - #undef F14_ON_UCODE_1A_UNENC - #define F14_ON_UCODE_1A_UNENC &CpuF14MicrocodePatch0500001A_Unenc, #endif extern CONST MICROCODE_PATCHES ROMDATA CpuF14MicrocodePatch05000025; #undef F14_ON_UCODE_25 #define F14_ON_UCODE_25 &CpuF14MicrocodePatch05000025, - - extern CONST MICROCODE_PATCHES ROMDATA CpuF14MicrocodePatch05000025_Unenc; - #undef F14_ON_UCODE_25_UNENC - #define F14_ON_UCODE_25_UNENC &CpuF14MicrocodePatch05000025_Unenc, #endif CONST MICROCODE_PATCHES ROMDATA *CpuF14OnMicroCodePatchArray[] = { F14_ON_UCODE_0B - F14_ON_UCODE_0B_UNENC F14_ON_UCODE_1A - F14_ON_UCODE_1A_UNENC F14_ON_UCODE_25 - F14_ON_UCODE_25_UNENC NULL }; diff --git a/src/vendorcode/amd/agesa/Include/OptionFamily15hInstall.h b/src/vendorcode/amd/agesa/Include/OptionFamily15hInstall.h index 6122d91c77..b05bfe326c 100644 --- a/src/vendorcode/amd/agesa/Include/OptionFamily15hInstall.h +++ b/src/vendorcode/amd/agesa/Include/OptionFamily15hInstall.h @@ -388,24 +388,18 @@ extern F_IS_NB_PSTATE_ENABLED F15IsNbPstateEnabled; #if GET_PATCHES == TRUE #define F15_OR_UCODE_09 - #define F15_OR_UCODE_09_UNENC #if AGESA_ENTRY_INIT_EARLY == TRUE #if OPTION_EARLY_SAMPLES == TRUE extern CONST MICROCODE_PATCHES_4K ROMDATA CpuF15OrMicrocodePatch06000009; #undef F15_OR_UCODE_09 #define F15_OR_UCODE_09 &CpuF15OrMicrocodePatch06000009, - - extern CONST MICROCODE_PATCHES_4K ROMDATA CpuF15OrMicrocodePatch06000009_Unenc; - #undef F15_OR_UCODE_09_UNENC - #define F15_OR_UCODE_09_UNENC &CpuF15OrMicrocodePatch06000009_Unenc, #endif #endif CONST MICROCODE_PATCHES_4K ROMDATA *CpuF15OrMicroCodePatchArray[] = { F15_OR_UCODE_09 - F15_OR_UCODE_09_UNENC NULL }; |