diff --git a/boards/acrn/acrn/acrn_defconfig b/boards/acrn/acrn/acrn_defconfig
index fe9d1e974a2..0ec5c2b2564 100644
--- a/boards/acrn/acrn/acrn_defconfig
+++ b/boards/acrn/acrn/acrn_defconfig
@@ -9,8 +9,8 @@ CONFIG_X2APIC=y
 CONFIG_CONSOLE=y
 CONFIG_SERIAL=y
 CONFIG_UART_CONSOLE=y
+CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
 CONFIG_BUILD_OUTPUT_BIN=y
 CONFIG_SHELL_BACKEND_SERIAL_INTERRUPT_DRIVEN=n
 CONFIG_KERNEL_VM_SIZE=0x1000000
 CONFIG_BUILD_NO_GAP_FILL=y
-CONFIG_TIMER_READS_ITS_FREQUENCY_AT_RUNTIME=y
diff --git a/boards/acrn/acrn/acrn_ehl_crb_defconfig b/boards/acrn/acrn/acrn_ehl_crb_defconfig
index eca92a16244..f7b256d2c84 100644
--- a/boards/acrn/acrn/acrn_ehl_crb_defconfig
+++ b/boards/acrn/acrn/acrn_ehl_crb_defconfig
@@ -9,6 +9,7 @@ CONFIG_PCIE=y
 CONFIG_CONSOLE=y
 CONFIG_SERIAL=y
 CONFIG_UART_CONSOLE=y
+CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1900000000
 CONFIG_BUILD_OUTPUT_BIN=y
 CONFIG_SHELL_BACKEND_SERIAL_INTERRUPT_DRIVEN=n
 CONFIG_KERNEL_VM_SIZE=0x1000000
@@ -16,4 +17,3 @@ CONFIG_BUILD_NO_GAP_FILL=y
 CONFIG_APIC_TSC_DEADLINE_TIMER=y
 CONFIG_APIC_TIMER_IRQ_PRIORITY=1
 CONFIG_SMP=y
-CONFIG_TIMER_READS_ITS_FREQUENCY_AT_RUNTIME=y
diff --git a/boards/intel/adl/intel_adl_crb_defconfig b/boards/intel/adl/intel_adl_crb_defconfig
index bb46638e17d..fb9be2a4994 100644
--- a/boards/intel/adl/intel_adl_crb_defconfig
+++ b/boards/intel/adl/intel_adl_crb_defconfig
@@ -10,4 +10,3 @@ CONFIG_X2APIC=y
 CONFIG_SMP=y
 CONFIG_BUILD_OUTPUT_EFI=y
 CONFIG_BUILD_NO_GAP_FILL=y
-CONFIG_TIMER_READS_ITS_FREQUENCY_AT_RUNTIME=y
diff --git a/boards/intel/adl/intel_adl_rvp_defconfig b/boards/intel/adl/intel_adl_rvp_defconfig
index bb46638e17d..fb9be2a4994 100644
--- a/boards/intel/adl/intel_adl_rvp_defconfig
+++ b/boards/intel/adl/intel_adl_rvp_defconfig
@@ -10,4 +10,3 @@ CONFIG_X2APIC=y
 CONFIG_SMP=y
 CONFIG_BUILD_OUTPUT_EFI=y
 CONFIG_BUILD_NO_GAP_FILL=y
-CONFIG_TIMER_READS_ITS_FREQUENCY_AT_RUNTIME=y
diff --git a/boards/intel/ehl/intel_ehl_crb_defconfig b/boards/intel/ehl/intel_ehl_crb_defconfig
index 9eac9a18020..ba1c681c4cf 100644
--- a/boards/intel/ehl/intel_ehl_crb_defconfig
+++ b/boards/intel/ehl/intel_ehl_crb_defconfig
@@ -10,4 +10,3 @@ CONFIG_SMP=y
 CONFIG_BUILD_OUTPUT_EFI=y
 CONFIG_BUILD_NO_GAP_FILL=y
 CONFIG_PCIE_PRT=n
-CONFIG_TIMER_READS_ITS_FREQUENCY_AT_RUNTIME=y
diff --git a/boards/intel/rpl/intel_rpl_p_crb_defconfig b/boards/intel/rpl/intel_rpl_p_crb_defconfig
index 939e226a7cd..c94efc744f6 100644
--- a/boards/intel/rpl/intel_rpl_p_crb_defconfig
+++ b/boards/intel/rpl/intel_rpl_p_crb_defconfig
@@ -11,4 +11,3 @@ CONFIG_X2APIC=y
 CONFIG_SMP=y
 CONFIG_BUILD_OUTPUT_EFI=y
 CONFIG_BUILD_NO_GAP_FILL=y
-CONFIG_TIMER_READS_ITS_FREQUENCY_AT_RUNTIME=y
diff --git a/boards/intel/rpl/intel_rpl_s_crb_defconfig b/boards/intel/rpl/intel_rpl_s_crb_defconfig
index 939e226a7cd..c94efc744f6 100644
--- a/boards/intel/rpl/intel_rpl_s_crb_defconfig
+++ b/boards/intel/rpl/intel_rpl_s_crb_defconfig
@@ -11,4 +11,3 @@ CONFIG_X2APIC=y
 CONFIG_SMP=y
 CONFIG_BUILD_OUTPUT_EFI=y
 CONFIG_BUILD_NO_GAP_FILL=y
-CONFIG_TIMER_READS_ITS_FREQUENCY_AT_RUNTIME=y
diff --git a/boards/up-bridge-the-gap/up_squared/up_squared_defconfig b/boards/up-bridge-the-gap/up_squared/up_squared_defconfig
index f236ba13a52..608e32cdef0 100644
--- a/boards/up-bridge-the-gap/up_squared/up_squared_defconfig
+++ b/boards/up-bridge-the-gap/up_squared/up_squared_defconfig
@@ -10,4 +10,6 @@ CONFIG_X2APIC=y
 CONFIG_SMP=y
 CONFIG_BUILD_OUTPUT_EFI=y
 CONFIG_BUILD_NO_GAP_FILL=y
-CONFIG_TIMER_READS_ITS_FREQUENCY_AT_RUNTIME=y
+
+CONFIG_APIC_TSC_DEADLINE_TIMER=n
+CONFIG_HPET_TIMER=y
diff --git a/boards/up-bridge-the-gap/up_squared_pro_7000/up_squared_pro_7000_defconfig b/boards/up-bridge-the-gap/up_squared_pro_7000/up_squared_pro_7000_defconfig
index bb46638e17d..fb9be2a4994 100644
--- a/boards/up-bridge-the-gap/up_squared_pro_7000/up_squared_pro_7000_defconfig
+++ b/boards/up-bridge-the-gap/up_squared_pro_7000/up_squared_pro_7000_defconfig
@@ -10,4 +10,3 @@ CONFIG_X2APIC=y
 CONFIG_SMP=y
 CONFIG_BUILD_OUTPUT_EFI=y
 CONFIG_BUILD_NO_GAP_FILL=y
-CONFIG_TIMER_READS_ITS_FREQUENCY_AT_RUNTIME=y