From f8f00629e3b5e129a5962fed1b886034f45e844a Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Sat, 5 May 2012 15:50:17 +0200 Subject: Some more #if cleanup Replace #elif (CONFIG_FOO==1) with #elif CONFIG_FOO find src -type f -exec sed -i "s,\(#.*\)(\(CONFIG_[A-Z0-9_]*\)[[:space:]]*==[[:space:]]1),\1\2,g" {} + (manual tweak since it hit a false positive) Replace #elif (CONFIG_FOO==0) with #elif !CONFIG_FOO find src -type f -exec sed -i "s,\(#.*\)(\(CONFIG_[A-Z0-9_]*\)[[:space:]]*==[[:space:]]0),\1\!\2,g" {} + Change-Id: I8f4ebf609740dfc53e79d5f1e60f9446364bb07d Signed-off-by: Patrick Georgi Reviewed-on: http://review.coreboot.org/1006 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich Reviewed-by: Martin Roth Reviewed-by: Stefan Reinauer --- src/northbridge/amd/amdmct/wrappers/mcti_d.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/northbridge/amd/amdmct/wrappers/mcti_d.c') diff --git a/src/northbridge/amd/amdmct/wrappers/mcti_d.c b/src/northbridge/amd/amdmct/wrappers/mcti_d.c index 00b15556ca..2440d2e8ed 100644 --- a/src/northbridge/amd/amdmct/wrappers/mcti_d.c +++ b/src/northbridge/amd/amdmct/wrappers/mcti_d.c @@ -66,14 +66,14 @@ static u16 mctGet_NVbits(u8 index) case NV_BYPMAX: #if !CONFIG_GFXUMA val = 4; -#elif (CONFIG_GFXUMA == 1) +#elif CONFIG_GFXUMA val = 7; #endif break; case NV_RDWRQBYP: #if !CONFIG_GFXUMA val = 2; -#elif (CONFIG_GFXUMA == 1) +#elif CONFIG_GFXUMA val = 3; #endif break; @@ -115,7 +115,7 @@ static u16 mctGet_NVbits(u8 index) case NV_BurstLen32: #if !CONFIG_GFXUMA val = 0; /* 64 byte mode */ -#elif (CONFIG_GFXUMA == 1) +#elif CONFIG_GFXUMA val = 1; /* 32 byte mode */ #endif break; @@ -134,14 +134,14 @@ static u16 mctGet_NVbits(u8 index) case NV_BottomIO: #if !CONFIG_GFXUMA val = 0xE0; /* address bits [31:24] */ -#elif (CONFIG_GFXUMA == 1) +#elif CONFIG_GFXUMA val = 0xC0; /* address bits [31:24] */ #endif break; case NV_BottomUMA: #if !CONFIG_GFXUMA val = 0xE0; /* address bits [31:24] */ -#elif (CONFIG_GFXUMA == 1) +#elif CONFIG_GFXUMA val = 0xC0; /* address bits [31:24] */ #endif break; -- cgit v1.2.3