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> Reviewed-on: https://review.coreboot.org/c/coreboot/+/32224 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr> Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
parent
3d25430b84
commit
1dde7ccfa8
|
@ -71,7 +71,7 @@ DECLARE_REGION(bl31)
|
||||||
* (Does not necessarily mean that the memory is accessible.) */
|
* (Does not necessarily mean that the memory is accessible.) */
|
||||||
static inline int preram_symbols_available(void)
|
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 */
|
#endif /* __SYMBOLS_H */
|
||||||
|
|
|
@ -264,8 +264,7 @@ static const struct pad_config gpio_table[] = {
|
||||||
/* H21 : GPPC_H_21 */
|
/* H21 : GPPC_H_21 */
|
||||||
/* H22 : GPPC_H_22 */
|
/* H22 : GPPC_H_22 */
|
||||||
PAD_CFG_GPI(GPP_H22, NONE, DEEP),
|
PAD_CFG_GPI(GPP_H22, NONE, DEEP),
|
||||||
#if IS_ENABLED(CONFIG_BOARD_INTEL_WHISKEYLAKE_RVP) || \
|
#if CONFIG(BOARD_INTEL_WHISKEYLAKE_RVP) || CONFIG(BOARD_INTEL_COMETLAKE_RVP)
|
||||||
IS_ENABLED(CONFIG_BOARD_INTEL_COMETLAKE_RVP)
|
|
||||||
PAD_CFG_GPO(GPP_H22, 1, PLTRST),
|
PAD_CFG_GPO(GPP_H22, 1, PLTRST),
|
||||||
#else
|
#else
|
||||||
PAD_CFG_GPI(GPP_H22, NONE, DEEP),
|
PAD_CFG_GPI(GPP_H22, NONE, DEEP),
|
||||||
|
|
|
@ -64,7 +64,7 @@ static uint8_t get_param_value(const config_t *config, uint32_t dev_offset)
|
||||||
return PCH_SERIAL_IO_INDEX(config->SerialIoDevMode[dev_offset]);
|
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)
|
static void parse_devicetree_param(const config_t *config, FSP_S_CONFIG *params)
|
||||||
{
|
{
|
||||||
uint32_t dev_offset = 0;
|
uint32_t dev_offset = 0;
|
||||||
|
@ -254,7 +254,7 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd)
|
||||||
|
|
||||||
/* Enable CNVi Wifi if enabled in device tree */
|
/* Enable CNVi Wifi if enabled in device tree */
|
||||||
dev = dev_find_slot(0, PCH_DEVFN_CNViWIFI);
|
dev = dev_find_slot(0, PCH_DEVFN_CNViWIFI);
|
||||||
#if IS_ENABLED(CONFIG_SOC_INTEL_COMETLAKE)
|
#if CONFIG(SOC_INTEL_COMETLAKE)
|
||||||
params->CnviMode = dev->enabled;
|
params->CnviMode = dev->enabled;
|
||||||
#else
|
#else
|
||||||
params->PchCnviMode = dev->enabled;
|
params->PchCnviMode = dev->enabled;
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
#ifndef _SERIALIO_H_
|
#ifndef _SERIALIO_H_
|
||||||
#define _SERIALIO_H_
|
#define _SERIALIO_H_
|
||||||
|
|
||||||
#if IS_ENABLED(CONFIG_SOC_INTEL_COMETLAKE)
|
#if CONFIG(SOC_INTEL_COMETLAKE)
|
||||||
typedef enum {
|
typedef enum {
|
||||||
PchSerialIoNotInitialized,
|
PchSerialIoNotInitialized,
|
||||||
PchSerialIoDisabled,
|
PchSerialIoDisabled,
|
||||||
|
|
Loading…
Reference in New Issue