diff --git a/boards/arc/em_starterkit/Kconfig.defconfig b/boards/arc/em_starterkit/Kconfig.defconfig
index 969a1ea4302..e1aa581ae98 100644
--- a/boards/arc/em_starterkit/Kconfig.defconfig
+++ b/boards/arc/em_starterkit/Kconfig.defconfig
@@ -71,9 +71,6 @@ config SPI_DW
 
 if SPI_DW
 
-config SPI_DW_CLOCK_GATE
-	def_bool n
-
 config SPI_DW_FIFO_DEPTH
 	default 32
 
diff --git a/boards/arm/mps2_an385/Kconfig.defconfig b/boards/arm/mps2_an385/Kconfig.defconfig
index 6a9f93dd27b..fb0fe15f28e 100644
--- a/boards/arm/mps2_an385/Kconfig.defconfig
+++ b/boards/arm/mps2_an385/Kconfig.defconfig
@@ -28,13 +28,6 @@ config GPIO_CMSDK_AHB_PORT3
 
 endif # GPIO
 
-if PINMUX
-
-config PINMUX_MPS2
-	def_bool y
-
-endif # PINMUX
-
 if SERIAL
 
 config UART_CMSDK_APB
diff --git a/boards/xtensa/intel_s1000_crb/Kconfig.defconfig b/boards/xtensa/intel_s1000_crb/Kconfig.defconfig
index 5a94979b59c..23d6fb0eb20 100644
--- a/boards/xtensa/intel_s1000_crb/Kconfig.defconfig
+++ b/boards/xtensa/intel_s1000_crb/Kconfig.defconfig
@@ -7,9 +7,6 @@ if BOARD_INTEL_S1000_CRB
 config BOARD
 	default "intel_s1000_crb"
 
-config BOARD_XTENSA
-	def_bool y
-
 config CAVS_ICTL_0_OFFSET
 	default 0x06
 config CAVS_ICTL_1_OFFSET
diff --git a/tests/boards/altera_max10/sysid/prj.conf b/tests/boards/altera_max10/sysid/prj.conf
index 79f63047659..9467c292689 100644
--- a/tests/boards/altera_max10/sysid/prj.conf
+++ b/tests/boards/altera_max10/sysid/prj.conf
@@ -1,2 +1 @@
-CONFIG_ALTERA_AVALON_SYSID=y
 CONFIG_ZTEST=y