diff options
author | Edward O'Callaghan <eocallaghan@alterapraxis.com> | 2014-11-18 18:27:29 +1100 |
---|---|---|
committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2016-02-03 03:50:05 +0100 |
commit | e3f47eada383defcc31b41cc4931c3cf3234c37d (patch) | |
tree | c83d98943cc347d01419fd31204ea7bd60625423 /src/vendorcode/amd/agesa/f10 | |
parent | c389635f6e5618b40279e823a46ae2ff50e620d1 (diff) |
vendorcode/amd/agesa/f1{4,2,0} Sync Include directory
Sync and merge useless differences.
Change-Id: I4eea66c35af66d473dd56db9ccf105c878266f22
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: https://review.coreboot.org/7513
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/vendorcode/amd/agesa/f10')
13 files changed, 104 insertions, 88 deletions
diff --git a/src/vendorcode/amd/agesa/f10/Include/AdvancedApi.h b/src/vendorcode/amd/agesa/f10/Include/AdvancedApi.h index fd7e15757c..53b57d8bbd 100644 --- a/src/vendorcode/amd/agesa/f10/Include/AdvancedApi.h +++ b/src/vendorcode/amd/agesa/f10/Include/AdvancedApi.h @@ -1,3 +1,4 @@ +/* $NoKeywords:$ */ /** * @file * @@ -9,11 +10,11 @@ * @xrefitem bom "File Content Label" "Release Content" * @e project: AGESA * @e sub-project: Include - * @e \$Revision: 44323 $ @e \$Date: 2010-12-22 01:24:58 -0700 (Wed, 22 Dec 2010) $ + * @e \$Revision: 63425 $ @e \$Date: 2011-12-22 11:24:10 -0600 (Thu, 22 Dec 2011) $ */ /***************************************************************************** * - * Copyright (c) 2011, Advanced Micro Devices, Inc. + * Copyright (c) 2008 - 2012, Advanced Micro Devices, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -148,8 +149,18 @@ AmdMemInitDataStructDef ( ); VOID -memDefRet ( - IN VOID - ); +memDefRet ( VOID ); + +BOOLEAN +memDefTrue ( VOID ); + +BOOLEAN +memDefFalse ( VOID ); + +VOID +MemRecDefRet ( VOID ); + +BOOLEAN +MemRecDefTrue ( VOID ); #endif // _ADVANCED_API_H_ diff --git a/src/vendorcode/amd/agesa/f10/Include/CommonReturns.h b/src/vendorcode/amd/agesa/f10/Include/CommonReturns.h index 6a807cbc98..1bf9f85779 100644 --- a/src/vendorcode/amd/agesa/f10/Include/CommonReturns.h +++ b/src/vendorcode/amd/agesa/f10/Include/CommonReturns.h @@ -1,3 +1,4 @@ +/* $NoKeywords:$ */ /** * @file * @@ -9,52 +10,59 @@ * @xrefitem bom "File Content Label" "Release Content" * @e project: AGESA * @e sub-project: Common - * @e \$Revision: 44323 $ @e \$Date: 2010-12-22 01:24:58 -0700 (Wed, 22 Dec 2010) $ + * @e \$Revision: 63425 $ @e \$Date: 2011-12-22 11:24:10 -0600 (Thu, 22 Dec 2011) $ * */ /* ***************************************************************************** * -* Copyright (c) 2011, Advanced Micro Devices, Inc. -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of Advanced Micro Devices, Inc. nor the names of -* its contributors may be used to endorse or promote products derived -* from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL ADVANCED MICRO DEVICES, INC. BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * Copyright (c) 2008 - 2012, Advanced Micro Devices, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Advanced Micro Devices, Inc. nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL ADVANCED MICRO DEVICES, INC. BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +* *************************************************************************** * - *************************************************************************** */ #ifndef _COMMON_RETURNS_H_ #define _COMMON_RETURNS_H_ + +/** +* Return True +* +* @retval True Default case, no special action +*/ +BOOLEAN +CommonReturnTrue ( VOID ); + /** * Return False. * * @retval FALSE Default case, no special action */ BOOLEAN -CommonReturnFalse ( - IN VOID -); +CommonReturnFalse ( VOID ); /** * Return (UINT8)zero. @@ -63,9 +71,7 @@ CommonReturnFalse ( * @retval zero None, or only case zero. */ UINT8 -CommonReturnZero8 ( - IN VOID -); +CommonReturnZero8 ( VOID ); /** * Return (UINT32)zero. @@ -74,9 +80,7 @@ CommonReturnZero8 ( * @retval zero None, or only case zero. */ UINT32 -CommonReturnZero32 ( - IN VOID -); +CommonReturnZero32 ( VOID ); /** * Return (UINT64)zero. @@ -85,9 +89,7 @@ CommonReturnZero32 ( * @retval zero None, or only case zero. */ UINT64 -CommonReturnZero64 ( - IN VOID -); +CommonReturnZero64 ( VOID ); /** * Return NULL @@ -95,9 +97,7 @@ CommonReturnZero64 ( * @retval NULL pointer to nothing */ VOID * -CommonReturnNULL ( - IN VOID -); +CommonReturnNULL ( VOID ); /** * Return AGESA_SUCCESS. @@ -105,26 +105,20 @@ CommonReturnNULL ( * @retval AGESA_SUCCESS Success. */ AGESA_STATUS -CommonReturnAgesaSuccess ( - IN VOID -); +CommonReturnAgesaSuccess ( VOID ); /** * Do Nothing. * */ VOID -CommonVoid ( - IN VOID -); +CommonVoid ( VOID ); /** * ASSERT if this routine is called. * */ VOID -CommonAssert ( - IN VOID -); +CommonAssert ( VOID ); #endif // _COMMON_RETURNS_H_ diff --git a/src/vendorcode/amd/agesa/f10/Include/IdsHt.h b/src/vendorcode/amd/agesa/f10/Include/IdsHt.h index 07291e3c79..64dff08683 100644 --- a/src/vendorcode/amd/agesa/f10/Include/IdsHt.h +++ b/src/vendorcode/amd/agesa/f10/Include/IdsHt.h @@ -1,3 +1,4 @@ +/* $NoKeywords:$ */ /** * @file * @@ -8,11 +9,11 @@ * @xrefitem bom "File Content Label" "Release Content" * @e project: AGESA * @e sub-project: IDS - * @e \$Revision: 44323 $ @e \$Date: 2010-12-22 01:24:58 -0700 (Wed, 22 Dec 2010) $ + * @e \$Revision: 63425 $ @e \$Date: 2011-12-22 11:24:10 -0600 (Thu, 22 Dec 2011) $ */ /***************************************************************************** * - * Copyright (c) 2011, Advanced Micro Devices, Inc. + * Copyright (c) 2008 - 2012, Advanced Micro Devices, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -37,7 +38,6 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * ***************************************************************************/ #ifndef _IDS_HT_H_ diff --git a/src/vendorcode/amd/agesa/f10/Include/OptionDmi.h b/src/vendorcode/amd/agesa/f10/Include/OptionDmi.h index df419d5441..6dba872b04 100644 --- a/src/vendorcode/amd/agesa/f10/Include/OptionDmi.h +++ b/src/vendorcode/amd/agesa/f10/Include/OptionDmi.h @@ -1,3 +1,4 @@ +/* $NoKeywords:$ */ /** * @file * @@ -8,12 +9,12 @@ * @xrefitem bom "File Content Label" "Release Content" * @e project: AGESA * @e sub-project: OPTION - * @e \$Revision: 44323 $ @e \$Date: 2010-12-22 01:24:58 -0700 (Wed, 22 Dec 2010) $ + * @e \$Revision: 63425 $ @e \$Date: 2011-12-22 11:24:10 -0600 (Thu, 22 Dec 2011) $ * */ /***************************************************************************** * - * Copyright (c) 2011, Advanced Micro Devices, Inc. + * Copyright (c) 2008 - 2012, Advanced Micro Devices, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -37,7 +38,6 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * ****************************************************************************** */ diff --git a/src/vendorcode/amd/agesa/f10/Include/OptionMemoryRecovery.h b/src/vendorcode/amd/agesa/f10/Include/OptionMemoryRecovery.h index b406f7dd4a..713e73d65f 100644 --- a/src/vendorcode/amd/agesa/f10/Include/OptionMemoryRecovery.h +++ b/src/vendorcode/amd/agesa/f10/Include/OptionMemoryRecovery.h @@ -1,3 +1,4 @@ +/* $NoKeywords:$ */ /** * @file * @@ -8,12 +9,12 @@ * @xrefitem bom "File Content Label" "Release Content" * @e project: AGESA * @e sub-project: OPTION - * @e \$Revision: 5937 $ @e \$Date: 2008-04-25 03:59:36 -0700 (Fri, 25 Apr 2008) $ + * @e \$Revision: 63425 $ @e \$Date: 2011-12-22 11:24:10 -0600 (Thu, 22 Dec 2011) $ * */ /***************************************************************************** * - * Copyright (c) 2011, Advanced Micro Devices, Inc. + * Copyright (c) 2008 - 2012, Advanced Micro Devices, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -37,7 +38,6 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * ****************************************************************************** */ diff --git a/src/vendorcode/amd/agesa/f10/Include/OptionS3ScriptInstall.h b/src/vendorcode/amd/agesa/f10/Include/OptionS3ScriptInstall.h index 4713e2bced..5b62bdf6dc 100644 --- a/src/vendorcode/amd/agesa/f10/Include/OptionS3ScriptInstall.h +++ b/src/vendorcode/amd/agesa/f10/Include/OptionS3ScriptInstall.h @@ -1,3 +1,4 @@ +/* $NoKeywords:$ */ /** * @file * @@ -9,11 +10,11 @@ * @xrefitem bom "File Content Label" "Release Content" * @e project: AGESA * @e sub-project: Options - * @e \$Revision: 6049 $ @e \$Date: 2008-05-14 01:58:02 -0500 (Wed, 14 May 2008) $ + * @e \$Revision: 63425 $ @e \$Date: 2011-12-22 11:24:10 -0600 (Thu, 22 Dec 2011) $ */ /***************************************************************************** * - * Copyright (c) 2011, Advanced Micro Devices, Inc. + * Copyright (c) 2008 - 2012, Advanced Micro Devices, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -38,7 +39,6 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * ***************************************************************************/ #ifndef _OPTION_S3SCRIPT_INSTALL_H_ @@ -71,6 +71,11 @@ #ifndef P_S3_SCRIPT_RESTORE #define P_S3_SCRIPT_RESTORE S3ScriptInitStateStub + #undef GNB_S3_DISPATCH_FUNCTION_TABLE +#endif + +#ifndef GNB_S3_DISPATCH_FUNCTION_TABLE + #define GNB_S3_DISPATCH_FUNCTION_TABLE #endif /* Declare the instance of the S3SCRIPT option configuration structure */ @@ -79,4 +84,8 @@ S3_SCRIPT_CONFIGURATION OptionS3ScriptConfiguration = { P_S3_SCRIPT_RESTORE }; +S3_DISPATCH_FUNCTION_ENTRY S3DispatchFunctionTable [] = { + GNB_S3_DISPATCH_FUNCTION_TABLE + {0, NULL} +}; #endif // _OPTION_S3SCRIPT_INSTALL_H_ diff --git a/src/vendorcode/amd/agesa/f10/Include/OptionSlit.h b/src/vendorcode/amd/agesa/f10/Include/OptionSlit.h index e86fb26d45..1dfc95718f 100644 --- a/src/vendorcode/amd/agesa/f10/Include/OptionSlit.h +++ b/src/vendorcode/amd/agesa/f10/Include/OptionSlit.h @@ -1,3 +1,4 @@ +/* $NoKeywords:$ */ /** * @file * @@ -8,12 +9,12 @@ * @xrefitem bom "File Content Label" "Release Content" * @e project: AGESA * @e sub-project: OPTION - * @e \$Revision: 5937 $ @e \$Date: 2008-04-25 03:59:36 -0700 (Fri, 25 Apr 2008) $ + * @e \$Revision: 63425 $ @e \$Date: 2011-12-22 11:24:10 -0600 (Thu, 22 Dec 2011) $ * */ /***************************************************************************** * - * Copyright (c) 2011, Advanced Micro Devices, Inc. + * Copyright (c) 2008 - 2012, Advanced Micro Devices, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -37,7 +38,6 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * ****************************************************************************** */ diff --git a/src/vendorcode/amd/agesa/f10/Include/OptionSlitInstall.h b/src/vendorcode/amd/agesa/f10/Include/OptionSlitInstall.h index 3fc795acdd..915e5302c4 100644 --- a/src/vendorcode/amd/agesa/f10/Include/OptionSlitInstall.h +++ b/src/vendorcode/amd/agesa/f10/Include/OptionSlitInstall.h @@ -1,3 +1,4 @@ +/* $NoKeywords:$ */ /** * @file * @@ -9,11 +10,11 @@ * @xrefitem bom "File Content Label" "Release Content" * @e project: AGESA * @e sub-project: Options - * @e \$Revision: 6049 $ @e \$Date: 2008-05-14 01:58:02 -0500 (Wed, 14 May 2008) $ + * @e \$Revision: 63425 $ @e \$Date: 2011-12-22 11:24:10 -0600 (Thu, 22 Dec 2011) $ */ /***************************************************************************** * - * Copyright (c) 2011, Advanced Micro Devices, Inc. + * Copyright (c) 2008 - 2012, Advanced Micro Devices, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -38,7 +39,6 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * ***************************************************************************/ #ifndef _OPTION_SLIT_INSTALL_H_ diff --git a/src/vendorcode/amd/agesa/f10/Include/OptionSrat.h b/src/vendorcode/amd/agesa/f10/Include/OptionSrat.h index 29ff590783..890ea34853 100644 --- a/src/vendorcode/amd/agesa/f10/Include/OptionSrat.h +++ b/src/vendorcode/amd/agesa/f10/Include/OptionSrat.h @@ -1,3 +1,4 @@ +/* $NoKeywords:$ */ /** * @file * @@ -8,12 +9,12 @@ * @xrefitem bom "File Content Label" "Release Content" * @e project: AGESA * @e sub-project: OPTION - * @e \$Revision: 5937 $ @e \$Date: 2008-04-25 03:59:36 -0700 (Fri, 25 Apr 2008) $ + * @e \$Revision: 63425 $ @e \$Date: 2011-12-22 11:24:10 -0600 (Thu, 22 Dec 2011) $ * */ /***************************************************************************** * - * Copyright (c) 2011, Advanced Micro Devices, Inc. + * Copyright (c) 2008 - 2012, Advanced Micro Devices, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -37,7 +38,6 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * ****************************************************************************** */ diff --git a/src/vendorcode/amd/agesa/f10/Include/OptionSratInstall.h b/src/vendorcode/amd/agesa/f10/Include/OptionSratInstall.h index b230080721..273874753f 100644 --- a/src/vendorcode/amd/agesa/f10/Include/OptionSratInstall.h +++ b/src/vendorcode/amd/agesa/f10/Include/OptionSratInstall.h @@ -1,3 +1,4 @@ +/* $NoKeywords:$ */ /** * @file * @@ -9,11 +10,11 @@ * @xrefitem bom "File Content Label" "Release Content" * @e project: AGESA * @e sub-project: Options - * @e \$Revision: 44323 $ @e \$Date: 2010-12-22 01:24:58 -0700 (Wed, 22 Dec 2010) $ + * @e \$Revision: 63425 $ @e \$Date: 2011-12-22 11:24:10 -0600 (Thu, 22 Dec 2011) $ */ /***************************************************************************** * - * Copyright (c) 2011, Advanced Micro Devices, Inc. + * Copyright (c) 2008 - 2012, Advanced Micro Devices, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -38,7 +39,6 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * ***************************************************************************/ #ifndef _OPTION_SRAT_INSTALL_H_ diff --git a/src/vendorcode/amd/agesa/f10/Include/OptionWhea.h b/src/vendorcode/amd/agesa/f10/Include/OptionWhea.h index 495c0aac42..fcaa23e8af 100644 --- a/src/vendorcode/amd/agesa/f10/Include/OptionWhea.h +++ b/src/vendorcode/amd/agesa/f10/Include/OptionWhea.h @@ -1,3 +1,4 @@ +/* $NoKeywords:$ */ /** * @file * @@ -8,12 +9,12 @@ * @xrefitem bom "File Content Label" "Release Content" * @e project: AGESA * @e sub-project: OPTION - * @e \$Revision: 5937 $ @e \$Date: 2008-04-25 03:59:36 -0700 (Fri, 25 Apr 2008) $ + * @e \$Revision: 63425 $ @e \$Date: 2011-12-22 11:24:10 -0600 (Thu, 22 Dec 2011) $ * */ /***************************************************************************** * - * Copyright (c) 2011, Advanced Micro Devices, Inc. + * Copyright (c) 2008 - 2012, Advanced Micro Devices, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -37,7 +38,6 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * ****************************************************************************** */ diff --git a/src/vendorcode/amd/agesa/f10/Include/OptionWheaInstall.h b/src/vendorcode/amd/agesa/f10/Include/OptionWheaInstall.h index 82f417a5f9..5facece353 100644 --- a/src/vendorcode/amd/agesa/f10/Include/OptionWheaInstall.h +++ b/src/vendorcode/amd/agesa/f10/Include/OptionWheaInstall.h @@ -1,3 +1,4 @@ +/* $NoKeywords:$ */ /** * @file * @@ -9,11 +10,11 @@ * @xrefitem bom "File Content Label" "Release Content" * @e project: AGESA * @e sub-project: Options - * @e \$Revision: 6049 $ @e \$Date: 2008-05-14 01:58:02 -0500 (Wed, 14 May 2008) $ + * @e \$Revision: 63425 $ @e \$Date: 2011-12-22 11:24:10 -0600 (Thu, 22 Dec 2011) $ */ /***************************************************************************** * - * Copyright (c) 2011, Advanced Micro Devices, Inc. + * Copyright (c) 2008 - 2012, Advanced Micro Devices, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -38,7 +39,6 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * ***************************************************************************/ #ifndef _OPTION_WHEA_INSTALL_H_ diff --git a/src/vendorcode/amd/agesa/f10/Include/Topology.h b/src/vendorcode/amd/agesa/f10/Include/Topology.h index a7633e7c3f..340c5c3139 100644 --- a/src/vendorcode/amd/agesa/f10/Include/Topology.h +++ b/src/vendorcode/amd/agesa/f10/Include/Topology.h @@ -1,3 +1,4 @@ +/* $NoKeywords:$ */ /** * @file * @@ -10,11 +11,11 @@ * @xrefitem bom "File Content Label" "Release Content" * @e project: AGESA * @e sub-project: Core - * @e \$Revision: 44323 $ @e \$Date: 2010-12-22 01:24:58 -0700 (Wed, 22 Dec 2010) $ + * @e \$Revision: 63425 $ @e \$Date: 2011-12-22 11:24:10 -0600 (Thu, 22 Dec 2011) $ */ /***************************************************************************** * - * Copyright (c) 2011, Advanced Micro Devices, Inc. + * Copyright (c) 2008 - 2012, Advanced Micro Devices, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -39,7 +40,6 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * ***************************************************************************/ #ifndef _TOPOLOGY_H_ @@ -73,6 +73,8 @@ typedef struct { UINT8 Node; ///< The module's Node id. UINT8 LowCore; ///< The lowest processor core id for this module. UINT8 HighCore; ///< The highest processor core id for this module. + UINT8 EnabledComputeUnits; ///< The value of Enabled for this processor module. + UINT8 DualCoreComputeUnits; ///< The value of DualCore for this processor module. } SOCKET_DIE_TO_NODE_ITEM; /** |