diff options
Diffstat (limited to 'src/vendorcode/cavium')
-rw-r--r-- | src/vendorcode/cavium/bdk/libdram/libdram.c | 6 | ||||
-rw-r--r-- | src/vendorcode/cavium/include/bdk/libbdk-arch/bdk-warn.h | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/vendorcode/cavium/bdk/libdram/libdram.c b/src/vendorcode/cavium/bdk/libdram/libdram.c index 9b2f2e871e..214aa05b24 100644 --- a/src/vendorcode/cavium/bdk/libdram/libdram.c +++ b/src/vendorcode/cavium/bdk/libdram/libdram.c @@ -149,9 +149,9 @@ static void bdk_dram_disable_ecc_reporting(bdk_node_t node) static int bdk_libdram_tune_node(int node) { int errs, tot_errs; - int do_dllro_hw = IS_ENABLED(CONFIG_CAVIUM_BDK_DDR_TUNE_HW_OFFSETS); - int do_dllwo = IS_ENABLED(CONFIG_CAVIUM_BDK_DDR_TUNE_WRITE_OFFSETS); - int do_eccdll = IS_ENABLED(CONFIG_CAVIUM_BDK_DDR_TUNE_ECC_ENABLE); + int do_dllro_hw = CONFIG(CAVIUM_BDK_DDR_TUNE_HW_OFFSETS); + int do_dllwo = CONFIG(CAVIUM_BDK_DDR_TUNE_WRITE_OFFSETS); + int do_eccdll = CONFIG(CAVIUM_BDK_DDR_TUNE_ECC_ENABLE); BDK_CSR_INIT(lmc_config, node, BDK_LMCX_CONFIG(0)); // FIXME: probe LMC0 do_eccdll = (lmc_config.s.ecc_ena != 0); // change to ON if ECC enabled diff --git a/src/vendorcode/cavium/include/bdk/libbdk-arch/bdk-warn.h b/src/vendorcode/cavium/include/bdk/libbdk-arch/bdk-warn.h index 84f9c3b55a..82b8ea0b11 100644 --- a/src/vendorcode/cavium/include/bdk/libbdk-arch/bdk-warn.h +++ b/src/vendorcode/cavium/include/bdk/libbdk-arch/bdk-warn.h @@ -103,19 +103,19 @@ typedef enum */ #define BDK_TRACE(area, format, ...) do { \ if ((BDK_TRACE_ENABLE_INIT == BDK_TRACE_ENABLE_##area && \ - IS_ENABLED(CONFIG_CAVIUM_BDK_VERBOSE_INIT)) || \ + CONFIG(CAVIUM_BDK_VERBOSE_INIT)) || \ (BDK_TRACE_ENABLE_DRAM == BDK_TRACE_ENABLE_##area && \ - IS_ENABLED(CONFIG_CAVIUM_BDK_VERBOSE_DRAM)) || \ + CONFIG(CAVIUM_BDK_VERBOSE_DRAM)) || \ (BDK_TRACE_ENABLE_DRAM_TEST == BDK_TRACE_ENABLE_##area && \ - IS_ENABLED(CONFIG_CAVIUM_BDK_VERBOSE_DRAM_TEST)) || \ + CONFIG(CAVIUM_BDK_VERBOSE_DRAM_TEST)) || \ (BDK_TRACE_ENABLE_QLM == BDK_TRACE_ENABLE_##area && \ - IS_ENABLED(CONFIG_CAVIUM_BDK_VERBOSE_QLM)) || \ + CONFIG(CAVIUM_BDK_VERBOSE_QLM)) || \ (BDK_TRACE_ENABLE_PCIE_CONFIG == BDK_TRACE_ENABLE_##area && \ - IS_ENABLED(CONFIG_CAVIUM_BDK_VERBOSE_PCIE_CONFIG)) || \ + CONFIG(CAVIUM_BDK_VERBOSE_PCIE_CONFIG)) || \ (BDK_TRACE_ENABLE_PCIE == BDK_TRACE_ENABLE_##area && \ - IS_ENABLED(CONFIG_CAVIUM_BDK_VERBOSE_PCIE)) || \ + CONFIG(CAVIUM_BDK_VERBOSE_PCIE)) || \ (BDK_TRACE_ENABLE_PHY == BDK_TRACE_ENABLE_##area && \ - IS_ENABLED(CONFIG_CAVIUM_BDK_VERBOSE_PHY))) \ + CONFIG(CAVIUM_BDK_VERBOSE_PHY))) \ printk(BIOS_DEBUG, #area ": " format, ##__VA_ARGS__); \ } while (0) |