Re: [U-Boot] [PATCH 18/38] x86: fsp: Use if() instead of #ifdef

Hi Simon,

On Tue, Aug 27, 2019 at 12:03 AM Simon Glass sjg@chromium.org wrote:

Update a few #ifdefs to if() to improve build coverage.

Signed-off-by: Simon Glass sjg@chromium.org

arch/x86/lib/fsp1/fsp_common.c | 9 ++++----- arch/x86/lib/fsp1/fsp_dram.c | 8 ++------ 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/arch/x86/lib/fsp1/fsp_common.c b/arch/x86/lib/fsp1/fsp_common.c index 591eef7b81..bfd76dccba 100644 --- a/arch/x86/lib/fsp1/fsp_common.c +++ b/arch/x86/lib/fsp1/fsp_common.c @@ -116,11 +116,10 @@ int arch_fsp_init(void) #endif

    if (!gd->arch.hob_list) {

-#ifdef CONFIG_ENABLE_MRC_CACHE

•           nvs = fsp_prepare_mrc_cache();
  

-#else

•           nvs = NULL;
  

-#endif

•           if (IS_ENABLED(CONFIG_ENABLE_MRC_CACHE))
  

•                   nvs = fsp_prepare_mrc_cache();
  

•           else
  

•                   nvs = NULL;
  
  

#ifdef CONFIG_HAVE_ACPI_RESUME if (prev_sleep_state == ACPI_S3) { diff --git a/arch/x86/lib/fsp1/fsp_dram.c b/arch/x86/lib/fsp1/fsp_dram.c index 3bf65b495c..961e963362 100644 --- a/arch/x86/lib/fsp1/fsp_dram.c +++ b/arch/x86/lib/fsp1/fsp_dram.c @@ -29,13 +29,9 @@ int dram_init(void) hdr = get_next_hob(hdr); }

•   gd->ram_size = ram_size;
  

•   post_code(POST_DRAM);
  

This does not look right.

-#ifdef CONFIG_ENABLE_MRC_CACHE

•   gd->arch.mrc_output = fsp_get_nvs_data(gd->arch.hob_list,
  

•   if (IS_ENABLED(CONFIG_ENABLE_MRC_CACHE))
  

•           gd->arch.mrc_output = fsp_get_nvs_data(gd->arch.hob_list,
                                           &gd->arch.mrc_output_len);
  

-#endif

    return 0;

}

Regards, Bin