Skip to content

Commit 2b01e06

Browse files
Charles E. Yousenashif
authored andcommitted
boards/up_squared: soc/apollo_lake: enable UARTs per board, not SoC
Which UARTs are broken out from the SoC on a particular board is board-specific; don't enable UARTs blindly in the SoC Kconfig. Also, the default UART options are specified in the driver Kconfig, so the same defaults specified in the SoC Kconfig are redundant. Removed. Signed-off-by: Charles E. Youse <[email protected]>
1 parent c5aa535 commit 2b01e06

File tree

2 files changed

+10
-38
lines changed

2 files changed

+10
-38
lines changed

boards/x86/up_squared/Kconfig.defconfig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@ config BOARD
88
config BUILD_OUTPUT_STRIPPED
99
default y
1010

11+
if UART_NS16550
12+
13+
config UART_NS16550_PORT_0
14+
default y
15+
16+
config UART_NS16550_PORT_1
17+
default y
18+
19+
endif # UART_NS16550
20+
1121
if I2C
1222

1323
config I2C_DW

soc/x86/apollo_lake/Kconfig.defconfig

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -26,44 +26,6 @@ config X86_DYNAMIC_IRQ_STUBS
2626

2727
endif # DYNAMIC_INTERRUPTS
2828

29-
if UART_NS16550
30-
31-
config UART_NS16550_PORT_0
32-
default y
33-
34-
if UART_NS16550_PORT_0
35-
36-
config UART_NS16550_PORT_0_OPTIONS
37-
default 0
38-
39-
endif # UART_NS16550_PORT_0
40-
41-
config UART_NS16550_PORT_1
42-
default y
43-
44-
if UART_NS16550_PORT_1
45-
46-
config UART_NS16550_PORT_1_OPTIONS
47-
default 0
48-
49-
endif # UART_NS16550_PORT_1
50-
51-
if UART_NS16550_PORT_2
52-
53-
config UART_NS16550_PORT_2_OPTIONS
54-
default 0
55-
56-
endif # UART_NS16550_PORT_2
57-
58-
if UART_NS16550_PORT_3
59-
60-
config UART_NS16550_PORT_3_OPTIONS
61-
default 0
62-
63-
endif # UART_NS16550_PORT_3
64-
65-
endif # UART_NS16550
66-
6729
if GPIO
6830

6931
config GPIO_INTEL_APL

0 commit comments

Comments
 (0)