Frank Vibrans III (frank.vibrans@amd.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/138
-gerrit
commit 420bc1d7f04d484c6471b05ecafd6ce1e14c6b9f Author: efdesign98 efdesign98@gmail.com Date: Thu Aug 4 22:04:27 2011 -0600
AMD Torpedo platform updates
This update fixes warnings and supports as necessary the Agesa infrastructure changes required to support the AMD Family 14 cpu update to rev C0.
Change-Id: Ib08b49695b925b81f796bf299141fe6f845fdef8 Signed-off-by: Frank Vibrans frank.vibrans@amd.com Signed-off-by: efdesign98 efdesign98@gmail.com --- src/mainboard/amd/torpedo/BiosCallOuts.c | 24 ++++++---- src/mainboard/amd/torpedo/Kconfig | 18 ++++---- src/mainboard/amd/torpedo/Oem.h | 72 +++++++---------------------- src/mainboard/amd/torpedo/agesawrapper.h | 1 - src/mainboard/amd/torpedo/get_bus_conf.c | 1 + 5 files changed, 43 insertions(+), 73 deletions(-)
diff --git a/src/mainboard/amd/torpedo/BiosCallOuts.c b/src/mainboard/amd/torpedo/BiosCallOuts.c index 083bc25..cfc988a 100755 --- a/src/mainboard/amd/torpedo/BiosCallOuts.c +++ b/src/mainboard/amd/torpedo/BiosCallOuts.c @@ -525,6 +525,7 @@ AGESA_STATUS BiosHookBeforeDramInit (UINT32 Func, UINT32 Data, VOID *ConfigPtr) UINT32 GpioMmioAddr; UINT8 Data8; UINT16 Data16; + UINT8 TempData8;
FcnData = Data; MemData = ConfigPtr; @@ -539,25 +540,30 @@ AGESA_STATUS BiosHookBeforeDramInit (UINT32 Func, UINT32 Data, VOID *ConfigPtr) Data16 |= Data8; AcpiMmioAddr = (UINT32)Data16 << 16; GpioMmioAddr = AcpiMmioAddr + GPIO_BASE; - if(MemData->ParameterListPtr->DDR3Voltage == VOLT1_5) { - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG178); - Data8 |= BIT6; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG178, Data8); - } else if(MemData->ParameterListPtr->DDR3Voltage == VOLT1_35) { + + switch(MemData->ParameterListPtr->DDR3Voltage){ + case VOLT1_35: Data8 = Read64Mem8 (GpioMmioAddr+SB_GPIO_REG178); Data8 &= ~(UINT8)BIT6; Write64Mem8(GpioMmioAddr+SB_GPIO_REG178, Data8); Data8 = Read64Mem8 (GpioMmioAddr+SB_GPIO_REG179); - Data8 |= BIT6; + Data8 |= (UINT8)BIT6; Write64Mem8(GpioMmioAddr+SB_GPIO_REG179, Data8); - } else if(MemData->ParameterListPtr->DDR3Voltage == VOLT1_25) { + break; + case VOLT1_25: Data8 = Read64Mem8 (GpioMmioAddr+SB_GPIO_REG178); Data8 &= ~(UINT8)BIT6; Write64Mem8(GpioMmioAddr+SB_GPIO_REG178, Data8); Data8 = Read64Mem8 (GpioMmioAddr+SB_GPIO_REG179); Data8 &= ~(UINT8)BIT6; Write64Mem8(GpioMmioAddr+SB_GPIO_REG179, Data8); - } else {} + break; + case VOLT1_5: + default: + Data8 = Read64Mem8 (GpioMmioAddr+SB_GPIO_REG178); + Data8 |= (UINT8)BIT6; + Write64Mem8(GpioMmioAddr+SB_GPIO_REG178, Data8); + } return Status; }
@@ -597,7 +603,7 @@ AGESA_STATUS BiosGnbPcieSlotReset (UINT32 Func, UINT32 Data, VOID *ConfigPtr) GpioMmioAddr = AcpiMmioAddr + GPIO_BASE;
if (ResetInfo->ResetControl == DeassertSlotReset) { - if (ResetInfo->ResetId & (BIT2+BIT3)) { //de-assert + if (ResetInfo->ResetId & BIT2+BIT3) { //de-assert // [GPIO] GPIO45: PE_GPIO1 MXM_POWER_ENABLE, SET HIGH Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG45); if (Data8 & BIT7) { diff --git a/src/mainboard/amd/torpedo/Kconfig b/src/mainboard/amd/torpedo/Kconfig index 57d8c05..16d4cd0 100755 --- a/src/mainboard/amd/torpedo/Kconfig +++ b/src/mainboard/amd/torpedo/Kconfig @@ -1,7 +1,7 @@ # # This file is part of the coreboot project. # -# Copyright (C) 2010 Advanced Micro Devices, Inc. +# Copyright (C) 2011 Advanced Micro Devices, 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 @@ -126,14 +126,6 @@ config SIO_PORT hex default 0x2e
-config DRIVERS_PS2_KEYBOARD - bool - default y - -config WARNINGS_ARE_ERRORS - bool - default n - config ONBOARD_VGA_IS_PRIMARY bool default y @@ -180,6 +172,14 @@ config XHC_BIOS_ID depends on XHC_BIOS default "1022,7812"
+config DRIVERS_PS2_KEYBOARD + bool + default y + +config WARNINGS_ARE_ERRORS + bool + default n + config CONSOLE_POST bool depends on !NO_POST diff --git a/src/mainboard/amd/torpedo/Oem.h b/src/mainboard/amd/torpedo/Oem.h index 50bb506..a7109dc 100755 --- a/src/mainboard/amd/torpedo/Oem.h +++ b/src/mainboard/amd/torpedo/Oem.h @@ -1,57 +1,21 @@ -/*;******************************************************************************** -; -; Copyright 2011 ADVANCED MICRO DEVICES, INC. All Rights Reserved. -; -; AMD is granting you permission to use this software (the Materials) -; pursuant to the terms and conditions of your Software License Agreement -; with AMD. This header does *NOT* give you permission to use the Materials -; or any rights under AMD's intellectual property. Your use of any portion -; of these Materials shall constitute your acceptance of those terms and -; conditions. If you do not agree to the terms and conditions of the Software -; License Agreement, please do not use any portion of these Materials. -; -; CONFIDENTIALITY: The Materials and all other information, identified as -; confidential and provided to you by AMD shall be kept confidential in -; accordance with the terms and conditions of the Software License Agreement. -; -; LIMITATION OF LIABILITY: THE MATERIALS AND ANY OTHER RELATED INFORMATION -; PROVIDED TO YOU BY AMD ARE PROVIDED "AS IS" WITHOUT ANY EXPRESS OR IMPLIED -; WARRANTY OF ANY KIND, INCLUDING BUT NOT LIMITED TO WARRANTIES OF -; MERCHANTABILITY, NONINFRINGEMENT, TITLE, FITNESS FOR ANY PARTICULAR PURPOSE, -; OR WARRANTIES ARISING FROM CONDUCT, COURSE OF DEALING, OR USAGE OF TRADE. -; IN NO EVENT SHALL AMD OR ITS LICENSORS BE LIABLE FOR ANY DAMAGES WHATSOEVER -; (INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF PROFITS, BUSINESS -; INTERRUPTION, OR LOSS OF INFORMATION) ARISING OUT OF AMD'S NEGLIGENCE, -; GROSS NEGLIGENCE, THE USE OF OR INABILITY TO USE THE MATERIALS OR ANY OTHER -; RELATED INFORMATION PROVIDED TO YOU BY AMD, EVEN IF AMD HAS BEEN ADVISED OF -; THE POSSIBILITY OF SUCH DAMAGES. BECAUSE SOME JURISDICTIONS PROHIBIT THE -; EXCLUSION OR LIMITATION OF LIABILITY FOR CONSEQUENTIAL OR INCIDENTAL DAMAGES, -; THE ABOVE LIMITATION MAY NOT APPLY TO YOU. -; -; AMD does not assume any responsibility for any errors which may appear in -; the Materials or any other related information provided to you by AMD, or -; result from use of the Materials or any related information. -; -; You agree that you will not reverse engineer or decompile the Materials. -; -; NO SUPPORT OBLIGATION: AMD is not obligated to furnish, support, or make any -; further information, software, technical information, know-how, or show-how -; available to you. Additionally, AMD retains the right to modify the -; Materials at any time, without notice, and is not obligated to provide such -; modified Materials to you. -; -; U.S. GOVERNMENT RESTRICTED RIGHTS: The Materials are provided with -; "RESTRICTED RIGHTS." Use, duplication, or disclosure by the Government is -; subject to the restrictions as set forth in FAR 52.227-14 and -; DFAR252.227-7013, et seq., or its successor. Use of the Materials by the -; Government constitutes acknowledgement of AMD's proprietary rights in them. -; -; EXPORT ASSURANCE: You agree and certify that neither the Materials, nor any -; direct product thereof will be exported directly or indirectly, into any -; country prohibited by the United States Export Administration Act and the -; regulations thereunder, without the required authorization from the U.S. -; government nor will be used for any purpose prohibited by the same. -;*********************************************************************************/ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2011 Advanced Micro Devices, 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 + */
#define BIOS_SIZE 0x04 //04 - 1MB #define LEGACY_FREE 0x00 diff --git a/src/mainboard/amd/torpedo/agesawrapper.h b/src/mainboard/amd/torpedo/agesawrapper.h index 979f743..c3209f5 100755 --- a/src/mainboard/amd/torpedo/agesawrapper.h +++ b/src/mainboard/amd/torpedo/agesawrapper.h @@ -118,7 +118,6 @@ typedef struct { *--------------------------------------------------------------------------------------- */
-//void brazos_platform_stage(void); UINT32 agesawrapper_amdinitreset (void); UINT32 agesawrapper_amdinitearly (void); UINT32 agesawrapper_amdinitenv (void); diff --git a/src/mainboard/amd/torpedo/get_bus_conf.c b/src/mainboard/amd/torpedo/get_bus_conf.c index 436f6a8..f9b4c84 100755 --- a/src/mainboard/amd/torpedo/get_bus_conf.c +++ b/src/mainboard/amd/torpedo/get_bus_conf.c @@ -24,6 +24,7 @@ #include <stdint.h> #include <stdlib.h> #include <cpu/amd/amdfam12.h> +#include "SbEarly.h" #include "agesawrapper.h"