diff --git a/ext/hal/qmsi/CMakeLists.txt b/ext/hal/qmsi/CMakeLists.txt
index 77cd19ec3b5..405f916723c 100644
--- a/ext/hal/qmsi/CMakeLists.txt
+++ b/ext/hal/qmsi/CMakeLists.txt
@@ -3,29 +3,16 @@ zephyr_library()
 zephyr_compile_definitions(                                  ENABLE_EXTERNAL_ISR_HANDLING)
 zephyr_compile_definitions_ifdef(CONFIG_SYS_POWER_DEEP_SLEEP ENABLE_RESTORE_CONTEXT)
 
-if(CONFIG_QMSI_LIBRARY)
-  zephyr_include_directories(
-    ${CONFIG_QMSI_INSTALL_PATH}/include
-    )
-
-  zephyr_link_libraries(
-    qmsi
-    -L${CONFIG_QMSI_INSTALL_PATH}/lib
-    )
-endif()
-
 if(CONFIG_SOC_QUARK_SE_C1000_SS)
 set(SOC_SERIES quark_se)
 endif()
 
-if(CONFIG_QMSI_BUILTIN)
-  zephyr_include_directories(
-    include
-    drivers/include
-    )
-  zephyr_include_directories_ifdef(CONFIG_ARC drivers/sensor/include)
-  zephyr_include_directories(                 soc/${SOC_SERIES}/include)
-endif()
+zephyr_include_directories(
+  include
+  drivers/include
+  )
+zephyr_include_directories_ifdef(CONFIG_ARC drivers/sensor/include)
+zephyr_include_directories(                 soc/${SOC_SERIES}/include)
 
 set_ifndef(SOC_WATCH_ENABLE 0)
 if(CONFIG_SOC_WATCH)
@@ -33,22 +20,20 @@ if(CONFIG_SOC_WATCH)
   zephyr_compile_definitions(SOC_WATCH_ENABLE)
 endif()
 
-if(CONFIG_QMSI_BUILTIN)
+zephyr_library_sources(
+  drivers/flash/qm_flash.c
+  soc/${SOC_SERIES}/drivers/power_states.c
+  soc/${SOC_SERIES}/drivers/clk.c
+  )
+if(CONFIG_SOC_QUARK_SE_C1000_SS)
   zephyr_library_sources(
-    drivers/flash/qm_flash.c
-    soc/${SOC_SERIES}/drivers/power_states.c
-    soc/${SOC_SERIES}/drivers/clk.c
+    drivers/clk/ss_clk.c
+    soc/quark_se/drivers/vreg.c
+    soc/quark_se/drivers/ss_power_states.c
     )
-  if(CONFIG_SOC_QUARK_SE_C1000_SS)
-    zephyr_library_sources(
-      drivers/clk/ss_clk.c
-      soc/quark_se/drivers/vreg.c
-      soc/quark_se/drivers/ss_power_states.c
-      )
-  endif()
-  if(CONFIG_SOC_QUARK_SE_C1000)
-    zephyr_library_sources(soc/${SOC_SERIES}/drivers/vreg.c)
-  endif()
+endif()
+if(CONFIG_SOC_QUARK_SE_C1000)
+  zephyr_library_sources(soc/${SOC_SERIES}/drivers/vreg.c)
 endif()
 
 zephyr_library_sources_ifdef(CONFIG_AIO_COMPARATOR_QMSI  drivers/comparator/qm_comparator.c)
diff --git a/ext/hal/qmsi/Kconfig b/ext/hal/qmsi/Kconfig
index 973f7b5912e..b1ed3d624bb 100644
--- a/ext/hal/qmsi/Kconfig
+++ b/ext/hal/qmsi/Kconfig
@@ -13,32 +13,5 @@ menuconfig QMSI
 	bool "QMSI driver support"
 	depends on HAS_QMSI
 	help
-	  automatically set when either of QMSI_LIBRARY or QMSI_BUILTIN
-	  is selected.
+	  Enable QMSI driver support.
 
-if HAS_QMSI
-
-config QMSI_BUILTIN
-	bool "Enable QMSI drivers through integrated sources"
-	select QMSI
-	help
-	  Link with local QMSI sources instead of external library.
-
-config QMSI_LIBRARY
-	bool "Enable QMSI drivers using external library"
-	select QMSI
-	help
-	  This option enables QMSI device drivers. These drivers are actually shim
-	  drivers based on drivers provided by QMSI BSP. The BSP provides a static
-	  library (libqmsi) which implements several drivers for peripherals from
-	  Intel MCUs (e.g. Quark SE and Quark D2000).
-
-config QMSI_INSTALL_PATH
-	depends on QMSI_LIBRARY
-	string "QMSI install path"
-	help
-	  This option holds the path where the QMSI library and headers are
-	  installed. Make sure this option is properly set when QMSI_LIBRARY
-	  is enabled otherwise the build will fail.
-
-endif
diff --git a/soc/arc/quark_se_c1000_ss/Kconfig.defconfig b/soc/arc/quark_se_c1000_ss/Kconfig.defconfig
index da0f44d62b9..302a63519ec 100644
--- a/soc/arc/quark_se_c1000_ss/Kconfig.defconfig
+++ b/soc/arc/quark_se_c1000_ss/Kconfig.defconfig
@@ -31,9 +31,6 @@ config HARVARD
 config QMSI
 	default y
 
-config QMSI_BUILTIN
-	default y
-
 if RTC
 
 config RTC_QMSI
diff --git a/soc/x86/intel_quark/quark_d2000/Kconfig.defconfig.series b/soc/x86/intel_quark/quark_d2000/Kconfig.defconfig.series
index 24ddf24cb2d..b2febce0e55 100644
--- a/soc/x86/intel_quark/quark_d2000/Kconfig.defconfig.series
+++ b/soc/x86/intel_quark/quark_d2000/Kconfig.defconfig.series
@@ -30,9 +30,6 @@ config LOAPIC_TIMER_IRQ_PRIORITY
 config QMSI
 	default y
 
-config QMSI_BUILTIN
-	default y
-
 if PINMUX
 config PINMUX_QMSI
 	default y
diff --git a/soc/x86/intel_quark/quark_se/Kconfig.defconfig.series b/soc/x86/intel_quark/quark_se/Kconfig.defconfig.series
index 44af13de22b..fcfc1f6e07b 100644
--- a/soc/x86/intel_quark/quark_se/Kconfig.defconfig.series
+++ b/soc/x86/intel_quark/quark_se/Kconfig.defconfig.series
@@ -27,9 +27,6 @@ config LOAPIC_TIMER_IRQ
 config QMSI
 	default y
 
-config QMSI_BUILTIN
-	default y
-
 if PWM
 config PWM_QMSI
 	default y