diff options
Diffstat (limited to 'src/mainboard/amd/dinar')
| -rw-r--r-- | src/mainboard/amd/dinar/acpi_tables.c | 2 | ||||
| -rw-r--r-- | src/mainboard/amd/dinar/agesawrapper.c | 11 | ||||
| -rw-r--r-- | src/mainboard/amd/dinar/agesawrapper.h | 56 | ||||
| -rw-r--r-- | src/mainboard/amd/dinar/romstage.c | 2 |
4 files changed, 7 insertions, 64 deletions
diff --git a/src/mainboard/amd/dinar/acpi_tables.c b/src/mainboard/amd/dinar/acpi_tables.c index 1a72135185..27635d18a9 100644 --- a/src/mainboard/amd/dinar/acpi_tables.c +++ b/src/mainboard/amd/dinar/acpi_tables.c @@ -28,7 +28,7 @@ #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> -#include "agesawrapper.h" +#include <northbridge/amd/agesa/agesawrapper.h> #include <cpu/amd/amdfam15.h> unsigned long acpi_fill_madt(unsigned long current) diff --git a/src/mainboard/amd/dinar/agesawrapper.c b/src/mainboard/amd/dinar/agesawrapper.c index c86e430168..fd9f637771 100644 --- a/src/mainboard/amd/dinar/agesawrapper.c +++ b/src/mainboard/amd/dinar/agesawrapper.c @@ -20,7 +20,7 @@ #include <stdint.h> #include <string.h> #include <cpu/x86/mtrr.h> -#include "agesawrapper.h" +#include <northbridge/amd/agesa/agesawrapper.h> #include <northbridge/amd/agesa/BiosCallOuts.h> #include "cpuRegisters.h" #include "cpuCacheInit.h" @@ -48,8 +48,7 @@ VOID *AcpiWheaMce = NULL; VOID *AcpiWheaCmc = NULL; VOID *AcpiAlib = NULL; -extern VOID OemCustomizeInitEarly(IN OUT AMD_EARLY_PARAMS *InitEarly); -extern VOID OemCustomizeInitPost(IN AMD_POST_PARAMS *InitPost); +VOID OemCustomizeInitEarly(IN OUT AMD_EARLY_PARAMS *InitEarly); /*Get the Bus Number from CONFIG_MMCONF_BUS_NUMBER, Please reference AMD BIOS BKDG docuemt about it*/ /* @@ -80,7 +79,7 @@ GetEndBusNum ( return Index; } -static UINT32 amdinitcpuio(void) +AGESA_STATUS agesawrapper_amdinitcpuio(void) { AGESA_STATUS Status; UINT64 MsrReg; @@ -337,7 +336,7 @@ VOID OemCustomizeInitEarly(IN OUT AMD_EARLY_PARAMS *InitEarly) //InitEarly->PlatformConfig.CoreLevelingMode = CORE_LEVEL_TWO; } -VOID +static VOID OemCustomizeInitPost ( IN AMD_POST_PARAMS *InitPost ) @@ -438,7 +437,7 @@ AGESA_STATUS agesawrapper_amdinitmid(void) printk(BIOS_DEBUG, "file '%s',line %d, %s()\n", __FILE__, __LINE__, __func__); /* Enable MMIO on AMD CPU Address Map Controller */ - amdinitcpuio (); + agesawrapper_amdinitcpuio (); LibAmdMemFill (&AmdParamStruct, 0, diff --git a/src/mainboard/amd/dinar/agesawrapper.h b/src/mainboard/amd/dinar/agesawrapper.h deleted file mode 100644 index efce9c2af0..0000000000 --- a/src/mainboard/amd/dinar/agesawrapper.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2012 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 - */ - -#ifndef _AGESAWRAPPER_H_ -#define _AGESAWRAPPER_H_ - -#include <stdint.h> -#include "Porting.h" -#include "AGESA.h" - -/* Define AMD Ontario APPU SSID/SVID */ -#define AMD_APU_SVID 0x1022 -#define AMD_APU_SSID 0x1234 -#define PCIE_BASE_ADDRESS CONFIG_MMCONF_BASE_ADDRESS - -enum { - PICK_DMI, /* DMI Interface */ - PICK_PSTATE, /* Acpi Pstate SSDT Table */ - PICK_SRAT, /* SRAT Table */ - PICK_SLIT, /* SLIT Table */ - PICK_WHEA_MCE, /* WHEA MCE table */ - PICK_WHEA_CMC, /* WHEA CMV table */ - PICK_ALIB, /* SACPI SSDT table with ALIB implementation */ -}; - - -//void brazos_platform_stage(void); -AGESA_STATUS agesawrapper_amdinitreset(void); -AGESA_STATUS agesawrapper_amdinitearly(void); -AGESA_STATUS agesawrapper_amdinitenv(void); -AGESA_STATUS agesawrapper_amdinitlate(void); -AGESA_STATUS agesawrapper_amdinitpost(void); -AGESA_STATUS agesawrapper_amdinitmid(void); -AGESA_STATUS agesawrapper_amdreadeventlog(void); -AGESA_STATUS agesawrapper_amdinitmmio(void); -void *agesawrapper_getlateinitptr (int pick); -AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr); - -static inline AGESA_STATUS agesawrapper_amdS3Save(void) { return 0; } -#endif diff --git a/src/mainboard/amd/dinar/romstage.c b/src/mainboard/amd/dinar/romstage.c index 5058ebeaa8..3b13ee62ed 100644 --- a/src/mainboard/amd/dinar/romstage.c +++ b/src/mainboard/amd/dinar/romstage.c @@ -29,7 +29,7 @@ #include <console/console.h> #include <console/loglevel.h> #include <cpu/amd/car.h> -#include "agesawrapper.h" +#include <northbridge/amd/agesa/agesawrapper.h> #include <northbridge/amd/agesa/agesawrapper_call.h> #include "cpu/x86/bist.h" #include <superio/smsc/sch4037/sch4037.h> |