[commit] r6453 - in trunk/src: cpu/amd/agesa_wrapper/family14 vendorcode/amd/agesa/Include

[repository service]

Author: mjones
Date: Fri Mar 18 00:14:24 2011
New Revision: 6453
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6453

Log:
Fix breaking the build after removing files in tthe previous checkin.

Signed-off-by: Marc Jones 
Acked-by: Marc Jones

Modified:
   trunk/src/cpu/amd/agesa_wrapper/family14/Makefile.inc
   trunk/src/vendorcode/amd/agesa/Include/OptionFamily14hInstall.h
   trunk/src/vendorcode/amd/agesa/Include/OptionFamily15hInstall.h

Modified: trunk/src/cpu/amd/agesa_wrapper/family14/Makefile.inc
==============================================================================
--- trunk/src/cpu/amd/agesa_wrapper/family14/Makefile.inc	Thu Mar 17 23:19:45 2011	(r6452)
+++ trunk/src/cpu/amd/agesa_wrapper/family14/Makefile.inc	Fri Mar 18 00:14:24 2011	(r6453)
@@ -66,9 +66,6 @@
 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

Modified: trunk/src/vendorcode/amd/agesa/Include/OptionFamily14hInstall.h
==============================================================================
--- trunk/src/vendorcode/amd/agesa/Include/OptionFamily14hInstall.h	Thu Mar 17 23:19:45 2011	(r6452)
+++ trunk/src/vendorcode/amd/agesa/Include/OptionFamily14hInstall.h	Fri Mar 18 00:14:24 2011	(r6453)
@@ -324,11 +324,8 @@

#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 @@
           #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
       };

Modified: trunk/src/vendorcode/amd/agesa/Include/OptionFamily15hInstall.h
==============================================================================
--- trunk/src/vendorcode/amd/agesa/Include/OptionFamily15hInstall.h	Thu Mar 17 23:19:45 2011	(r6452)
+++ trunk/src/vendorcode/amd/agesa/Include/OptionFamily15hInstall.h	Fri Mar 18 00:14:24 2011	(r6453)
@@ -388,24 +388,18 @@

#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
       };