Hello HAOUAS Elyes, Julius Werner, Angel Pons, Patrick Georgi,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/32224
to review the following change.
Change subject: Replace remaining IS_ENABLED(CONFIG_*) with CONFIG() ......................................................................
Replace remaining IS_ENABLED(CONFIG_*) with CONFIG()
Another run of find src/ -type f | xargs sed -i -e 's/IS_ENABLED\s*(CONFIG_/CONFIG(/g'
Change-Id: I3243197ab852a3fbc3eb2e2e782966a350b78af2 Signed-off-by: Nico Huber nico.h@gmx.de --- M src/include/symbols.h M src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c M src/soc/intel/cannonlake/fsp_params.c M src/soc/intel/cannonlake/include/soc/serialio.h 4 files changed, 5 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/32224/1
diff --git a/src/include/symbols.h b/src/include/symbols.h index c35e191..b67286a 100644 --- a/src/include/symbols.h +++ b/src/include/symbols.h @@ -71,7 +71,7 @@ * (Does not necessarily mean that the memory is accessible.) */ static inline int preram_symbols_available(void) { - return !IS_ENABLED(CONFIG_CACHE_AS_RAM) || ENV_CACHE_AS_RAM; + return !CONFIG(CACHE_AS_RAM) || ENV_CACHE_AS_RAM; }
#endif /* __SYMBOLS_H */ diff --git a/src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c b/src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c index e345146..ec8f58b 100644 --- a/src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c +++ b/src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c @@ -264,8 +264,7 @@ /* H21 : GPPC_H_21 */ /* H22 : GPPC_H_22 */ PAD_CFG_GPI(GPP_H22, NONE, DEEP), -#if IS_ENABLED(CONFIG_BOARD_INTEL_WHISKEYLAKE_RVP) || \ - IS_ENABLED(CONFIG_BOARD_INTEL_COMETLAKE_RVP) +#if CONFIG(BOARD_INTEL_WHISKEYLAKE_RVP) || CONFIG(BOARD_INTEL_COMETLAKE_RVP) PAD_CFG_GPO(GPP_H22, 1, PLTRST), #else PAD_CFG_GPI(GPP_H22, NONE, DEEP), diff --git a/src/soc/intel/cannonlake/fsp_params.c b/src/soc/intel/cannonlake/fsp_params.c index 2688557..b8dba18 100644 --- a/src/soc/intel/cannonlake/fsp_params.c +++ b/src/soc/intel/cannonlake/fsp_params.c @@ -64,7 +64,7 @@ return PCH_SERIAL_IO_INDEX(config->SerialIoDevMode[dev_offset]); }
-#if IS_ENABLED(CONFIG_SOC_INTEL_COMETLAKE) +#if CONFIG(SOC_INTEL_COMETLAKE) static void parse_devicetree_param(const config_t *config, FSP_S_CONFIG *params) { uint32_t dev_offset = 0; @@ -254,7 +254,7 @@
/* Enable CNVi Wifi if enabled in device tree */ dev = dev_find_slot(0, PCH_DEVFN_CNViWIFI); -#if IS_ENABLED(CONFIG_SOC_INTEL_COMETLAKE) +#if CONFIG(SOC_INTEL_COMETLAKE) params->CnviMode = dev->enabled; #else params->PchCnviMode = dev->enabled; diff --git a/src/soc/intel/cannonlake/include/soc/serialio.h b/src/soc/intel/cannonlake/include/soc/serialio.h index 6c95356..c92bd2d 100644 --- a/src/soc/intel/cannonlake/include/soc/serialio.h +++ b/src/soc/intel/cannonlake/include/soc/serialio.h @@ -17,7 +17,7 @@ #ifndef _SERIALIO_H_ #define _SERIALIO_H_
-#if IS_ENABLED(CONFIG_SOC_INTEL_COMETLAKE) +#if CONFIG(SOC_INTEL_COMETLAKE) typedef enum { PchSerialIoNotInitialized, PchSerialIoDisabled,