From 77a58b92e8d44d17b9aa06710ed728a697722b4a Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Sat, 24 Jun 2017 14:45:48 -0600 Subject: nb/amd: add IS_ENABLED() around Kconfig symbol references MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some of these can be changed from #if to if(), but that will happen in a follow-on commmit. Change-Id: I763cbbc31dcd4cdd128c04793a742ab6daaf5f0c Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/20345 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer Reviewed-by: Kyösti Mälkki --- src/northbridge/amd/amdmct/wrappers/mcti_d.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/northbridge/amd/amdmct') diff --git a/src/northbridge/amd/amdmct/wrappers/mcti_d.c b/src/northbridge/amd/amdmct/wrappers/mcti_d.c index 0b08c203b8..306f3a7429 100644 --- a/src/northbridge/amd/amdmct/wrappers/mcti_d.c +++ b/src/northbridge/amd/amdmct/wrappers/mcti_d.c @@ -128,16 +128,16 @@ u16 mctGet_NVbits(u8 index) //val = 2; /* S4 (Unbuffered SO-DIMMS) */ break; case NV_BYPMAX: -#if !CONFIG_GFXUMA +#if !IS_ENABLED(CONFIG_GFXUMA) val = 4; -#elif CONFIG_GFXUMA +#elif IS_ENABLED(CONFIG_GFXUMA) val = 7; #endif break; case NV_RDWRQBYP: -#if !CONFIG_GFXUMA +#if !IS_ENABLED(CONFIG_GFXUMA) val = 2; -#elif CONFIG_GFXUMA +#elif IS_ENABLED(CONFIG_GFXUMA) val = 3; #endif break; @@ -191,9 +191,9 @@ u16 mctGet_NVbits(u8 index) val = !!nvram; break; case NV_BurstLen32: -#if !CONFIG_GFXUMA +#if !IS_ENABLED(CONFIG_GFXUMA) val = 0; /* 64 byte mode */ -#elif CONFIG_GFXUMA +#elif IS_ENABLED(CONFIG_GFXUMA) val = 1; /* 32 byte mode */ #endif break; @@ -212,9 +212,9 @@ u16 mctGet_NVbits(u8 index) case NV_BottomIO: case NV_BottomUMA: /* address bits [31:24] */ -#if !CONFIG_GFXUMA +#if !IS_ENABLED(CONFIG_GFXUMA) val = (CONFIG_MMCONF_BASE_ADDRESS >> 24); -#elif CONFIG_GFXUMA +#elif IS_ENABLED(CONFIG_GFXUMA) #if (CONFIG_MMCONF_BASE_ADDRESS < (MAXIMUM_GFXUMA_SIZE + MINIMUM_DRAM_BELOW_4G)) #error "MMCONF_BASE_ADDRESS is too small" #endif -- cgit v1.2.3