Emulation/switch-coreboot
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-coreboot.git synced 2025-05-04 01:39:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

UPSTREAM: src/vendorcode/amd/agesa: Fix casting

Browse source 
When IDSOPT_TRACING_ENABLED is TRUE build fails with
"cast from pointer to integer of different size"
Use "UINTN" as is done in Family 16h.

BUG=None
BRANCH=None
TEST=None

Signed-off-by: ukasz Dobrowolski <lukasz@dobrowolski.io>
Reviewed-on: https://review.coreboot.org/17406
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Nico Huber <nico.h@gmx.de>

Change-Id: I362e67fc83aa609155f959535f33be9c150c7636
Reviewed-on: https://chromium-review.googlesource.com/415058
Commit-Ready: Aaron Durbin <adurbin@chromium.org>
Tested-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Łukasz Dobrowolski 2016-11-21 17:35:18 +01:00 • committed by chrome-bot
parent a029ea8cd8
commit a19eb959db
3 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/vendorcode/amd/agesa/f10/Include/OptionIdsInstall.h
View file

@ -74,22 +74,22 @@ CONST PF_HtIdsGetPortOverride ROMDATA pf_HtIdsGetPortOverride = M_HTIDS_PORT_OVE
#if (AGESA_ENTRY_INIT_POST == TRUE) #if (AGESA_ENTRY_INIT_POST == TRUE)
#include <mu.h> #include <mu.h>
CONST SCRIPT_FUNCTION ROMDATA ScriptFuncList[] = { CONST SCRIPT_FUNCTION ROMDATA ScriptFuncList[] = {
{ (UINT32) MemUWriteCachelines, "WriteCl(PhyAddrLo,BufferAddr,ClCnt)"}, { (UINTN) MemUWriteCachelines, "WriteCl(PhyAddrLo,BufferAddr,ClCnt)"},
{ (UINT32) MemUReadCachelines, "ReadCl(BufferAddr,PhyAddrLo,ClCnt)"}, { (UINTN) MemUReadCachelines, "ReadCl(BufferAddr,PhyAddrLo,ClCnt)"},
{ (UINT32) MemUFlushPattern, "FlushCl(PhyAddrLo,ClCnt)"} { (UINTN) MemUFlushPattern, "FlushCl(PhyAddrLo,ClCnt)"}
}; };
#elif (AGESA_ENTRY_INIT_RECOVERY == TRUE) #elif (AGESA_ENTRY_INIT_RECOVERY == TRUE)
#include <mru.h> #include <mru.h>
CONST SCRIPT_FUNCTION ROMDATA ScriptFuncList[] = { CONST SCRIPT_FUNCTION ROMDATA ScriptFuncList[] = {
{ (UINT32) MemRecUWrite1CL, "Write1Cl(PhyAddrLo,BufferAddr)"}, { (UINTN) MemRecUWrite1CL, "Write1Cl(PhyAddrLo,BufferAddr)"},
{ (UINT32) MemRecURead1CL, "Read1Cl(BufferAddr,PhyAddrLo)"}, { (UINTN) MemRecURead1CL, "Read1Cl(BufferAddr,PhyAddrLo)"},
{ (UINT32) MemRecUFlushPattern, "Flush1Cl(PhyAddrLo)"} { (UINTN) MemRecUFlushPattern, "Flush1Cl(PhyAddrLo)"}
}; };
#else #else
CONST SCRIPT_FUNCTION ROMDATA ScriptFuncList[] = { CONST SCRIPT_FUNCTION ROMDATA ScriptFuncList[] = {
{ (UINT32) CommonReturnFalse, "DefRet()"}, { (UINTN) CommonReturnFalse, "DefRet()"},
{ (UINT32) CommonReturnFalse, "DefRet()"}, { (UINTN) CommonReturnFalse, "DefRet()"},
{ (UINT32) CommonReturnFalse, "DefRet()"} { (UINTN) CommonReturnFalse, "DefRet()"}
}; };
#endif #endif
#endif #endif

18
src/vendorcode/amd/agesa/f12/Include/OptionIdsInstall.h
View file

@ -73,22 +73,22 @@ CONST PF_HtIdsGetPortOverride ROMDATA pf_HtIdsGetPortOverride = M_HTIDS_PORT_OVE
#if (AGESA_ENTRY_INIT_POST == TRUE) #if (AGESA_ENTRY_INIT_POST == TRUE)
#include <mu.h> #include <mu.h>
CONST SCRIPT_FUNCTION ROMDATA ScriptFuncList[] = { CONST SCRIPT_FUNCTION ROMDATA ScriptFuncList[] = {
{ (UINT32) (UINT64) MemUWriteCachelines, "WriteCl(PhyAddrLo,BufferAddr,ClCnt)"}, { (UINTN) MemUWriteCachelines, "WriteCl(PhyAddrLo,BufferAddr,ClCnt)"},
{ (UINT32) (UINT64) MemUReadCachelines, "ReadCl(BufferAddr,PhyAddrLo,ClCnt)"}, { (UINTN) MemUReadCachelines, "ReadCl(BufferAddr,PhyAddrLo,ClCnt)"},
{ (UINT32) (UINT64) MemUFlushPattern, "FlushCl(PhyAddrLo,ClCnt)"} { (UINTN) MemUFlushPattern, "FlushCl(PhyAddrLo,ClCnt)"}
}; };
#elif (AGESA_ENTRY_INIT_RECOVERY == TRUE) #elif (AGESA_ENTRY_INIT_RECOVERY == TRUE)
#include <mru.h> #include <mru.h>
CONST SCRIPT_FUNCTION ROMDATA ScriptFuncList[] = { CONST SCRIPT_FUNCTION ROMDATA ScriptFuncList[] = {
{ (UINT32) (UINT64) MemRecUWrite1CL, "Write1Cl(PhyAddrLo,BufferAddr)"}, { (UINTN) MemRecUWrite1CL, "Write1Cl(PhyAddrLo,BufferAddr)"},
{ (UINT32) (UINT64) MemRecURead1CL, "Read1Cl(BufferAddr,PhyAddrLo)"}, { (UINTN) MemRecURead1CL, "Read1Cl(BufferAddr,PhyAddrLo)"},
{ (UINT32) (UINT64) MemRecUFlushPattern, "Flush1Cl(PhyAddrLo)"} { (UINTN) MemRecUFlushPattern, "Flush1Cl(PhyAddrLo)"}
}; };
#else #else
CONST SCRIPT_FUNCTION ROMDATA ScriptFuncList[] = { CONST SCRIPT_FUNCTION ROMDATA ScriptFuncList[] = {
{ (UINT32) (UINT64) CommonReturnFalse, "DefRet()"}, { (UINTN) CommonReturnFalse, "DefRet()"},
{ (UINT32) (UINT64) CommonReturnFalse, "DefRet()"}, { (UINTN) CommonReturnFalse, "DefRet()"},
{ (UINT32) (UINT64) CommonReturnFalse, "DefRet()"} { (UINTN) CommonReturnFalse, "DefRet()"}
}; };
#endif #endif
#endif #endif

18
src/vendorcode/amd/agesa/f14/Include/OptionIdsInstall.h
View file

@ -76,22 +76,22 @@ CONST PF_HtIdsGetPortOverride ROMDATA pf_HtIdsGetPortOverride = M_HTIDS_PORT_OVE
#if (AGESA_ENTRY_INIT_POST == TRUE) #if (AGESA_ENTRY_INIT_POST == TRUE)
#include <mu.h> #include <mu.h>
CONST SCRIPT_FUNCTION ROMDATA ScriptFuncList[] = { CONST SCRIPT_FUNCTION ROMDATA ScriptFuncList[] = {
{ (UINT32) (UINT64) MemUWriteCachelines, "WriteCl(PhyAddrLo,BufferAddr,ClCnt)"}, { (UINTN) MemUWriteCachelines, "WriteCl(PhyAddrLo,BufferAddr,ClCnt)"},
{ (UINT32) (UINT64) MemUReadCachelines, "ReadCl(BufferAddr,PhyAddrLo,ClCnt)"}, { (UINTN) MemUReadCachelines, "ReadCl(BufferAddr,PhyAddrLo,ClCnt)"},
{ (UINT32) (UINT64) MemUFlushPattern, "FlushCl(PhyAddrLo,ClCnt)"} { (UINTN) MemUFlushPattern, "FlushCl(PhyAddrLo,ClCnt)"}
}; };
#elif (AGESA_ENTRY_INIT_RECOVERY == TRUE) #elif (AGESA_ENTRY_INIT_RECOVERY == TRUE)
#include <mru.h> #include <mru.h>
CONST SCRIPT_FUNCTION ROMDATA ScriptFuncList[] = { CONST SCRIPT_FUNCTION ROMDATA ScriptFuncList[] = {
{ (UINT32) (UINT64) MemRecUWrite1CL, "Write1Cl(PhyAddrLo,BufferAddr)"}, { (UINTN) MemRecUWrite1CL, "Write1Cl(PhyAddrLo,BufferAddr)"},
{ (UINT32) (UINT64) MemRecURead1CL, "Read1Cl(BufferAddr,PhyAddrLo)"}, { (UINTN) MemRecURead1CL, "Read1Cl(BufferAddr,PhyAddrLo)"},
{ (UINT32) (UINT64) MemRecUFlushPattern, "Flush1Cl(PhyAddrLo)"} { (UINTN) MemRecUFlushPattern, "Flush1Cl(PhyAddrLo)"}
}; };
#else #else
CONST SCRIPT_FUNCTION ROMDATA ScriptFuncList[] = { CONST SCRIPT_FUNCTION ROMDATA ScriptFuncList[] = {
{ (UINT32) (UINT64) CommonReturnFalse, "DefRet()"}, { (UINTN) CommonReturnFalse, "DefRet()"},
{ (UINT32) (UINT64) CommonReturnFalse, "DefRet()"}, { (UINTN) CommonReturnFalse, "DefRet()"},
{ (UINT32) (UINT64) CommonReturnFalse, "DefRet()"} { (UINTN) CommonReturnFalse, "DefRet()"}
}; };
#endif #endif
#endif #endif