diff --git a/boards/x86/up_squared/Kconfig.defconfig b/boards/x86/up_squared/Kconfig.defconfig
index 2512b763716..d89538d11d5 100644
--- a/boards/x86/up_squared/Kconfig.defconfig
+++ b/boards/x86/up_squared/Kconfig.defconfig
@@ -8,6 +8,16 @@ config BOARD
 config BUILD_OUTPUT_STRIPPED
 	default y
 
+if UART_NS16550
+
+config UART_NS16550_PORT_0
+	default y
+
+config UART_NS16550_PORT_1
+	default y
+
+endif # UART_NS16550
+
 if I2C
 
 config I2C_DW
diff --git a/soc/x86/apollo_lake/Kconfig.defconfig b/soc/x86/apollo_lake/Kconfig.defconfig
index bb87fdff1c9..4ba5118fc77 100644
--- a/soc/x86/apollo_lake/Kconfig.defconfig
+++ b/soc/x86/apollo_lake/Kconfig.defconfig
@@ -26,44 +26,6 @@ config X86_DYNAMIC_IRQ_STUBS
 
 endif # DYNAMIC_INTERRUPTS
 
-if UART_NS16550
-
-config UART_NS16550_PORT_0
-	default y
-
-if UART_NS16550_PORT_0
-
-config UART_NS16550_PORT_0_OPTIONS
-	default 0
-
-endif # UART_NS16550_PORT_0
-
-config UART_NS16550_PORT_1
-	default y
-
-if UART_NS16550_PORT_1
-
-config UART_NS16550_PORT_1_OPTIONS
-	default 0
-
-endif # UART_NS16550_PORT_1
-
-if UART_NS16550_PORT_2
-
-config UART_NS16550_PORT_2_OPTIONS
-	default 0
-
-endif # UART_NS16550_PORT_2
-
-if UART_NS16550_PORT_3
-
-config UART_NS16550_PORT_3_OPTIONS
-	default 0
-
-endif # UART_NS16550_PORT_3
-
-endif # UART_NS16550
-
 if GPIO
 
 config GPIO_INTEL_APL