[coreboot-gerrit] Change in ...coreboot[master]: cpu/amd/family_10h-family_15h: Fix 'if' condition identical branches

[HAOUAS Elyes (Code Review)]

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33257

Change subject: cpu/amd/family_10h-family_15h: Fix 'if' condition identical branches
......................................................................

cpu/amd/family_10h-family_15h: Fix 'if' condition identical branches

Change-Id: I1c937a62388c38090ee2cc3228973cfb8361bac7
Signed-off-by: Elyes HAOUAS 
---
M src/cpu/amd/family_10h-family_15h/init_cpus.c
1 file changed, 2 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/33257/1

diff --git a/src/cpu/amd/family_10h-family_15h/init_cpus.c b/src/cpu/amd/family_10h-family_15h/init_cpus.c
index d6a4725..f416d9c 100644
--- a/src/cpu/amd/family_10h-family_15h/init_cpus.c
+++ b/src/cpu/amd/family_10h-family_15h/init_cpus.c
@@ -504,10 +504,9 @@
    	if (is_fam15h()) {
    		/* core 1 on node 0 is special; to avoid corrupting the
    		 * BSP do not alter MTRRs on that core */
+			fam15_bsp_core1_apicid = 1;
    		if (CONFIG(ENABLE_APIC_EXT_ID) && (CONFIG_APIC_ID_OFFSET > 0))
-				fam15_bsp_core1_apicid = CONFIG_APIC_ID_OFFSET + 1;
-			else
-				fam15_bsp_core1_apicid = 1;
+				fam15_bsp_core1_apicid += CONFIG_APIC_ID_OFFSET;

if (apicid == fam15_bsp_core1_apicid)
    			set_mtrrs = 0;