From e660f041610e2030d85663735ebad247a1d534ae Mon Sep 17 00:00:00 2001 From: Xavi Drudis Ferran Date: Tue, 17 Aug 2010 06:12:59 +0000 Subject: [PATCH] Fix warnings (that become errors) in AMDHT for certain configurations (unused functions) Signed-off-by: Xavi Drudis Ferran Acked-by: Patrick Georgi git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5704 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/northbridge/amd/amdht/h3finit.c | 4 ++-- src/northbridge/amd/amdht/h3ncmn.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/northbridge/amd/amdht/h3finit.c b/src/northbridge/amd/amdht/h3finit.c index 038ecdcb9d..a9387186d7 100644 --- a/src/northbridge/amd/amdht/h3finit.c +++ b/src/northbridge/amd/amdht/h3finit.c @@ -845,8 +845,6 @@ static void finializeCoherentInit(sMainData *pDat) */ static void coherentInit(sMainData *pDat) { - u8 i, j; - #ifdef HT_BUILD_NC_ONLY /* Replace discovery process with: * No other nodes, no coherent links @@ -856,6 +854,8 @@ static void coherentInit(sMainData *pDat) pDat->TotalLinks = 0; pDat->nb->enableRoutingTables(0, pDat->nb); #else + u8 i, j; + pDat->NodesDiscovered = 0; pDat->TotalLinks = 0; for (i = 0; i < MAX_NODES; i++) diff --git a/src/northbridge/amd/amdht/h3ncmn.c b/src/northbridge/amd/amdht/h3ncmn.c index 1fcb07d633..4b8b4950c9 100644 --- a/src/northbridge/amd/amdht/h3ncmn.c +++ b/src/northbridge/amd/amdht/h3ncmn.c @@ -1553,6 +1553,8 @@ static void setLinkData(sMainData *pDat, cNorthBridge *nb) * * --------------------------------------------------------------------------------------- */ +#ifndef HT_BUILD_NC_ONLY + static void fam0fWriteHTLinkCmdBufferAlloc(u8 node, u8 link, u8 req, u8 preq, u8 rsp, u8 prb) { u32 temp; @@ -1574,6 +1576,7 @@ static void fam0fWriteHTLinkCmdBufferAlloc(u8 node, u8 link, u8 req, u8 preq, u8 temp = prb; AmdPCIWriteBits(currentPtr, 15, 12, &temp); } +#endif /* HT_BUILD_NC_ONLY */ /**---------------------------------------------------------------------------------------- * @@ -1594,6 +1597,8 @@ static void fam0fWriteHTLinkCmdBufferAlloc(u8 node, u8 link, u8 req, u8 preq, u8 * * --------------------------------------------------------------------------------------- */ +#ifndef HT_BUILD_NC_ONLY + static void fam0fWriteHTLinkDatBufferAlloc(u8 node, u8 link, u8 reqD, u8 preqD, u8 rspD) { u32 temp; @@ -1612,6 +1617,7 @@ static void fam0fWriteHTLinkDatBufferAlloc(u8 node, u8 link, u8 reqD, u8 preqD, temp = rspD; AmdPCIWriteBits(currentPtr, 26, 24, &temp); } +#endif /* HT_BUILD_NC_ONLY */ /**---------------------------------------------------------------------------------------- *