diff options
Diffstat (limited to 'src/soc/intel/common/block/cpu/car')
| -rw-r--r-- | src/soc/intel/common/block/cpu/car/cache_as_ram.S | 12 | ||||
| -rw-r--r-- | src/soc/intel/common/block/cpu/car/exit_car.S | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/soc/intel/common/block/cpu/car/cache_as_ram.S b/src/soc/intel/common/block/cpu/car/cache_as_ram.S index 17b8dc063c..d3ee671bef 100644 --- a/src/soc/intel/common/block/cpu/car/cache_as_ram.S +++ b/src/soc/intel/common/block/cpu/car/cache_as_ram.S @@ -167,11 +167,11 @@ clear_var_mtrr: invd mov %eax, %cr0 -#if IS_ENABLED(CONFIG_INTEL_CAR_NEM) +#if CONFIG(INTEL_CAR_NEM) jmp car_nem -#elif IS_ENABLED(CONFIG_INTEL_CAR_CQOS) +#elif CONFIG(INTEL_CAR_CQOS) jmp car_cqos -#elif IS_ENABLED(CONFIG_INTEL_CAR_NEM_ENHANCED) +#elif CONFIG(INTEL_CAR_NEM_ENHANCED) jmp car_nem_enhanced #else jmp .halt_forever /* In case nothing has selected */ @@ -221,7 +221,7 @@ fixed_mtrr_list: .word MTRR_FIX_4K_F8000 fixed_mtrr_list_size = . - fixed_mtrr_list -#if IS_ENABLED(CONFIG_INTEL_CAR_NEM) +#if CONFIG(INTEL_CAR_NEM) .global car_nem car_nem: /* Disable cache eviction (setup stage) */ @@ -252,7 +252,7 @@ car_nem: jmp car_init_done -#elif IS_ENABLED(CONFIG_INTEL_CAR_CQOS) +#elif CONFIG(INTEL_CAR_CQOS) .global car_cqos car_cqos: /* @@ -356,7 +356,7 @@ car_cqos: jmp car_init_done -#elif IS_ENABLED(CONFIG_INTEL_CAR_NEM_ENHANCED) +#elif CONFIG(INTEL_CAR_NEM_ENHANCED) .global car_nem_enhanced car_nem_enhanced: /* Disable cache eviction (setup stage) */ diff --git a/src/soc/intel/common/block/cpu/car/exit_car.S b/src/soc/intel/common/block/cpu/car/exit_car.S index a4d16e8022..ab7886cb36 100644 --- a/src/soc/intel/common/block/cpu/car/exit_car.S +++ b/src/soc/intel/common/block/cpu/car/exit_car.S @@ -23,7 +23,7 @@ .global chipset_teardown_car chipset_teardown_car: -#if IS_ENABLED(CONFIG_PAGING_IN_CACHE_AS_RAM) +#if CONFIG(PAGING_IN_CACHE_AS_RAM) /* * Since Page table is located in CAR, disable paging before CAR * teardown. Also clear CR3 and CR4.PAE. @@ -50,7 +50,7 @@ chipset_teardown_car: and $(~(MTRR_DEF_TYPE_EN | MTRR_DEF_TYPE_FIX_EN)), %eax wrmsr -#if IS_ENABLED(CONFIG_INTEL_CAR_NEM) +#if CONFIG(INTEL_CAR_NEM) .global car_nem_teardown car_nem_teardown: @@ -65,7 +65,7 @@ car_nem_teardown: and $(~(1 << 0)), %eax wrmsr -#elif IS_ENABLED(CONFIG_INTEL_CAR_CQOS) +#elif CONFIG(INTEL_CAR_CQOS) .global car_cqos_teardown car_cqos_teardown: @@ -86,7 +86,7 @@ car_cqos_teardown: and $~IA32_PQR_ASSOC_MASK, %edx wrmsr -#elif IS_ENABLED(CONFIG_INTEL_CAR_NEM_ENHANCED) +#elif CONFIG(INTEL_CAR_NEM_ENHANCED) .global car_nem_enhanced_teardown car_nem_enhanced_teardown: |