From 9346d504ca31dd5df7febe14fdab8ae400cd5307 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Wed, 15 Jul 2015 18:32:43 -0600 Subject: [PATCH] Remove unused Kconfig symbols in c code The BROKEN_CAR_MIGRATE symbol was removed in commit a6371940 - x86 cache-as-ram: Remove BROKEN_CAR_MIGRATE option The symbol DISABLE_SANDYBRIDGE_HYPERTHREADING is from Sage, and was never added to the coreboot.org codebase. Change-Id: I953fe7c46106634a5a3fcdaff88b39e884f152e6 Signed-off-by: Martin Roth Reviewed-on: http://review.coreboot.org/10941 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/cpu/x86/car.c | 2 +- src/northbridge/intel/fsp_sandybridge/fsp/chipset_fsp_util.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/cpu/x86/car.c b/src/cpu/x86/car.c index b0a86b184b..b4345eae60 100644 --- a/src/cpu/x86/car.c +++ b/src/cpu/x86/car.c @@ -138,7 +138,7 @@ static void do_car_migrate_variables(void) static void car_migrate_variables(int is_recovery) { - if (!IS_ENABLED(CONFIG_BROKEN_CAR_MIGRATE) && !IS_ENABLED(PLATFORM_USES_FSP1_0)) + if (!IS_ENABLED(PLATFORM_USES_FSP1_0)) do_car_migrate_variables(); } ROMSTAGE_CBMEM_INIT_HOOK(car_migrate_variables) diff --git a/src/northbridge/intel/fsp_sandybridge/fsp/chipset_fsp_util.c b/src/northbridge/intel/fsp_sandybridge/fsp/chipset_fsp_util.c index 0930da2fb5..e9dad29f4c 100644 --- a/src/northbridge/intel/fsp_sandybridge/fsp/chipset_fsp_util.c +++ b/src/northbridge/intel/fsp_sandybridge/fsp/chipset_fsp_util.c @@ -53,11 +53,7 @@ static void ConfigureDefaultUpdData(UPD_DATA_REGION *UpdData) } #else /* IS_ENABLED(CONFIG_SOUTHBRIDGE_INTEL_FSP_I89XX) */ const PLATFORM_CONFIG DefaultPlatformConfig = { -#if IS_ENABLED(CONFIG_DISABLE_SANDYBRIDGE_HYPERTHREADING) - FALSE, /* Hyperthreading */ -#else TRUE, /* Hyperthreading */ -#endif FALSE, /* Turbo Mode */ FALSE, /* Memory Down */ #if IS_ENABLED(CONFIG_ENABLE_FSP_FAST_BOOT)