Verify Kconfigs symbols are not zero for hex and int type symbols

For hex and int type kconfig symbols, IS_ENABLED() doesn't work. Instead
check to make sure they're defined and not zero.  In some cases, zero
might be a valid value, but it didn't look like zero was valid in these
cases.

Change-Id: Ib51fb31b3babffbf25ed3ae4ed11a2dc9a4be709
Signed-off-by: Martin Roth <gaumless@gmail.com>
Reviewed-on: http://review.coreboot.org/10886
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Martin Roth 2015-07-11 13:56:58 -06:00
parent ba566bdc8b
commit 46cf9f7b7a
5 changed files with 8 additions and 10 deletions

View File

@ -50,7 +50,7 @@ static void do_early_mtrr_init(const unsigned long *mtrr_msrs)
wrmsr(msr_nr, msr); wrmsr(msr_nr, msr);
} }
#if defined(CONFIG_XIP_ROM_SIZE) #if defined(CONFIG_XIP_ROM_SIZE) && CONFIG_XIP_ROM_SIZE
/* enable write through caching so we can do execute in place /* enable write through caching so we can do execute in place
* on the flash rom. * on the flash rom.
* Determine address by calculating the XIP_ROM_SIZE sized area with * Determine address by calculating the XIP_ROM_SIZE sized area with

View File

@ -34,10 +34,10 @@
# include "option_table.h" # include "option_table.h"
# define BOOT_COUNT_CMOS_OFFSET (CMOS_VSTART_boot_count_offset >> 3) # define BOOT_COUNT_CMOS_OFFSET (CMOS_VSTART_boot_count_offset >> 3)
#else #else
# if defined(CONFIG_ELOG_BOOT_COUNT_CMOS_OFFSET) # if defined(CONFIG_ELOG_BOOT_COUNT_CMOS_OFFSET) && CONFIG_ELOG_BOOT_COUNT_CMOS_OFFSET
# define BOOT_COUNT_CMOS_OFFSET CONFIG_ELOG_BOOT_COUNT_CMOS_OFFSET # define BOOT_COUNT_CMOS_OFFSET CONFIG_ELOG_BOOT_COUNT_CMOS_OFFSET
# else # else
# error "Must define CONFIG_ELOG_BOOT_COUNT_CMOS_OFFSET" # error "Must configure CONFIG_ELOG_BOOT_COUNT_CMOS_OFFSET"
# endif # endif
#endif #endif

View File

@ -87,8 +87,8 @@ void set_var_mtrr(unsigned reg, unsigned base, unsigned size, unsigned type);
(x>>6)|(x>>7)|(x>>8)|((1<<18)-1)) (x>>6)|(x>>7)|(x>>8)|((1<<18)-1))
#define _ALIGN_UP_POW2(x) ((x + _POW2_MASK(x)) & ~_POW2_MASK(x)) #define _ALIGN_UP_POW2(x) ((x + _POW2_MASK(x)) & ~_POW2_MASK(x))
#if !defined(CONFIG_RAMTOP) #if !defined(CONFIG_RAMTOP) || !CONFIG_RAMTOP
# error "CONFIG_RAMTOP not defined" # error "CONFIG_RAMTOP not configured"
#endif #endif
#if ((CONFIG_XIP_ROM_SIZE & (CONFIG_XIP_ROM_SIZE -1)) != 0) #if ((CONFIG_XIP_ROM_SIZE & (CONFIG_XIP_ROM_SIZE -1)) != 0)

View File

@ -186,10 +186,10 @@ unsigned read_option_lowlevel(unsigned start, unsigned size, unsigned def);
# include "option_table.h" # include "option_table.h"
# define CMOS_POST_OFFSET (CMOS_VSTART_cmos_post_offset >> 3) # define CMOS_POST_OFFSET (CMOS_VSTART_cmos_post_offset >> 3)
#else #else
# if defined(CONFIG_CMOS_POST_OFFSET) # if defined(CONFIG_CMOS_POST_OFFSET) && CONFIG_CMOS_POST_OFFSET
# define CMOS_POST_OFFSET CONFIG_CMOS_POST_OFFSET # define CMOS_POST_OFFSET CONFIG_CMOS_POST_OFFSET
# else # else
# error "Must define CONFIG_CMOS_POST_OFFSET" # error "Must configure CONFIG_CMOS_POST_OFFSET"
# endif # endif
#endif #endif

View File

@ -179,12 +179,10 @@ Method(_INI, 0) {
/* Determine the OS we're running on */ /* Determine the OS we're running on */
OSFL() OSFL()
#ifdef CONFIG_HUDSON_IMC_FWM #if defined(CONFIG_HUDSON_IMC_FWM) && CONFIG_HUDSON_IMC_FWM
#if CONFIG_HUDSON_IMC_FWM
#include "acpi/AmdImc.asl" /* Hudson IMC function */ #include "acpi/AmdImc.asl" /* Hudson IMC function */
ITZE() /* enable IMC Fan Control*/ ITZE() /* enable IMC Fan Control*/
#endif #endif
#endif
} /* End Method(_SB._INI) */ } /* End Method(_SB._INI) */
Method(OSFL, 0){ Method(OSFL, 0){