[coreboot-gerrit] Change in coreboot[master]: soc/inte/common: Replace #if macro with if C-language constuct

[Sridhar Siricilla (Code Review)]

Sridhar Siricilla has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/48494 )

Change subject: soc/inte/common: Replace #if macro with if C-language constuct
......................................................................

soc/inte/common: Replace #if macro with if C-language constuct

This patch modifies CSE Lite driver to use 'if' C-lanugage construct
instead of #if macro.

TEST=Built the code for drawcia

Signed-off-by: Sridhar Siricilla 
Change-Id: Iecd5cf56ecd280de920f479e174762fe6b4164b0
---
M src/soc/intel/common/block/cse/Kconfig
M src/soc/intel/common/block/cse/cse_lite.c
2 files changed, 6 insertions(+), 10 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/94/48494/1

diff --git a/src/soc/intel/common/block/cse/Kconfig b/src/soc/intel/common/block/cse/Kconfig
index d3b7288..c562ea3 100644
--- a/src/soc/intel/common/block/cse/Kconfig
+++ b/src/soc/intel/common/block/cse/Kconfig
@@ -29,7 +29,6 @@
     This config will enable CSE RW firmware update feature and also will be used ensure
     all the required configs are provided by mainboard.

-if SOC_INTEL_CSE_RW_UPDATE
 config SOC_INTEL_CSE_FMAP_NAME
    string "Name of CSE Region in FMAP"
    default "SI_ME"
@@ -75,4 +74,3 @@
     This config contains the Intel CSE RW version of the blob that is provided by
     SOC_INTEL_CSE_RW_FILE config and the version must be set in the format
     major.minor.hotfix.build (ex: 14.0.40.1209).
-endif
diff --git a/src/soc/intel/common/block/cse/cse_lite.c b/src/soc/intel/common/block/cse/cse_lite.c
index d173b6a..c7dac38 100644
--- a/src/soc/intel/common/block/cse/cse_lite.c
+++ b/src/soc/intel/common/block/cse/cse_lite.c
@@ -429,7 +429,6 @@
    return cse_boot_to_rw(cse_bp_info);
 }

-#if CONFIG(SOC_INTEL_CSE_RW_UPDATE)
 static const struct fw_version *cse_get_bp_entry_version(enum boot_partition_id bp,
    	const struct cse_bp_info *bp_info)
 {
@@ -772,7 +771,6 @@

return 0;
 }
-#endif

void cse_fw_sync(void *unused)
 {
@@ -801,12 +799,12 @@
     * If SOC_INTEL_CSE_RW_UPDATE is defined , then trigger CSE firmware update. The driver
     * triggers recovery if CSE CBFS RW metadata or CSE CBFS RW blob is not available.
     */
-#if CONFIG(SOC_INTEL_CSE_RW_UPDATE)
-	uint8_t rv;
-	rv = cse_fw_update(&cse_bp_info.bp_info);
-	if (rv)
-		cse_trigger_recovery(rv);
-#endif
+	if (CONFIG(SOC_INTEL_CSE_RW_UPDATE)) {
+		uint8_t rv;
+		rv = cse_fw_update(&cse_bp_info.bp_info);
+		if (rv)
+			cse_trigger_recovery(rv);
+	}

if (!cse_boot_to_rw(&cse_bp_info.bp_info)) {
    	printk(BIOS_ERR, "cse_lite: Failed to switch to RW\n");