diff options
Diffstat (limited to 'src/soc/cavium')
| -rw-r--r-- | src/soc/cavium/cn81xx/soc.c | 4 | ||||
| -rw-r--r-- | src/soc/cavium/common/bootblock.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/soc/cavium/cn81xx/soc.c b/src/soc/cavium/cn81xx/soc.c index 2358d71c57..98166b056f 100644 --- a/src/soc/cavium/cn81xx/soc.c +++ b/src/soc/cavium/cn81xx/soc.c @@ -370,7 +370,7 @@ static void soc_init(struct device *dev) /* Init ECAM, MDIO, PEM, PHY, QLM ... */ bdk_boot(); - if (IS_ENABLED(CONFIG_PAYLOAD_FIT_SUPPORT)) { + if (CONFIG(PAYLOAD_FIT_SUPPORT)) { struct device_tree_fixup *dt_fixup; dt_fixup = malloc(sizeof(*dt_fixup)); @@ -381,7 +381,7 @@ static void soc_init(struct device *dev) } } - if (IS_ENABLED(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE)) + if (CONFIG(ARM64_USE_ARM_TRUSTED_FIRMWARE)) soc_init_atf(); } diff --git a/src/soc/cavium/common/bootblock.c b/src/soc/cavium/common/bootblock.c index a512dffa00..c3f0866859 100644 --- a/src/soc/cavium/common/bootblock.c +++ b/src/soc/cavium/common/bootblock.c @@ -38,17 +38,17 @@ void bootblock_main(const uint64_t reg_x0, init_timer(); - if (IS_ENABLED(CONFIG_COLLECT_TIMESTAMPS)) + if (CONFIG(COLLECT_TIMESTAMPS)) base_timestamp = timestamp_get(); /* Initialize timestamps if we have TIMESTAMP region in memlayout.ld. */ - if (IS_ENABLED(CONFIG_COLLECT_TIMESTAMPS) && REGION_SIZE(timestamp) > 0) + if (CONFIG(COLLECT_TIMESTAMPS) && REGION_SIZE(timestamp) > 0) timestamp_init(base_timestamp); bootblock_soc_early_init(); bootblock_mainboard_early_init(); - if (IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE)) { + if (CONFIG(BOOTBLOCK_CONSOLE)) { console_init(); exception_init(); |