Skip to content

Commit b8ea7c8

Browse files
nashifgalak
nashif
authored and
galak
committed
x86: remove HAS_DTS checking
All X86 boards are now DTS enabled. Signed-off-by: Anas Nashif <[email protected]>
1 parent 5656489 commit b8ea7c8

File tree

5 files changed

+6
-116
lines changed

5 files changed

+6
-116
lines changed

‎arch/x86/core/Kconfig

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,6 @@ config MAX_IRQ_LINES
4848
to program to the PIC the association between vectors and
4949
interrupts.
5050

51-
if !HAS_DTS
52-
config PHYS_LOAD_ADDR
53-
hex "Physical load address"
54-
# Default value must be supplied by platform
55-
help
56-
This option specifies the physical address where the kernel is loaded.
57-
endif
58-
59-
if !HAS_DTS
60-
config PHYS_RAM_ADDR
61-
hex "Physical RAM address"
62-
# Default value must be supplied by platform
63-
help
64-
This option specifies the physical RAM address of the selected SoC.
65-
endif
66-
6751
config RAM_SIZE
6852
int "Amount of RAM given to the kernel (in kB)"
6953
help

‎arch/x86/soc/atom/Kconfig.defconfig

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,6 @@ if SOC_ATOM
1111
config SOC
1212
default atom
1313

14-
if !HAS_DTS
15-
config PHYS_LOAD_ADDR
16-
default 0x00100000
17-
18-
config PHYS_RAM_ADDR
19-
default 0x00400000
20-
endif
21-
2214
config RAM_SIZE
2315
default 128 if XIP
2416
default 256
@@ -43,16 +35,9 @@ config UART_NS16550_PORT_0
4335

4436
if UART_NS16550_PORT_0
4537

46-
if !HAS_DTS
47-
config UART_NS16550_PORT_0_NAME
48-
default "UART_0"
49-
endif
5038
config UART_NS16550_PORT_0_IRQ_PRI
5139
default 3
52-
if !HAS_DTS
53-
config UART_NS16550_PORT_0_BAUD_RATE
54-
default 115200
55-
endif
40+
5641
config UART_NS16550_PORT_0_OPTIONS
5742
default 0
5843

@@ -63,16 +48,9 @@ config UART_NS16550_PORT_1
6348

6449
if UART_NS16550_PORT_1
6550

66-
if !HAS_DTS
67-
config UART_NS16550_PORT_1_NAME
68-
default "UART_1"
69-
endif
7051
config UART_NS16550_PORT_1_IRQ_PRI
7152
default 3
72-
if !HAS_DTS
73-
config UART_NS16550_PORT_1_BAUD_RATE
74-
default 115200
75-
endif
53+
7654
config UART_NS16550_PORT_1_OPTIONS
7755
default 0
7856

@@ -82,12 +60,6 @@ endif # UART_NS16550
8260

8361
if BT_UART
8462

85-
if !HAS_DTS
86-
config BT_UART_ON_DEV_NAME
87-
default "UART_1"
88-
89-
endif
90-
9163
if UART_PIPE
9264

9365
config UART_PIPE_ON_DEV_NAME

‎arch/x86/soc/intel_quark/quark_d2000/Kconfig.defconfig.series

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ config TOOLCHAIN_VARIANT
1919
config SYS_CLOCK_HW_CYCLES_PER_SEC
2020
default 32000000
2121

22-
if !HAS_DTS
23-
config PHYS_LOAD_ADDR
24-
default 0x00180000 if XIP
25-
default 0x00280000 if !XIP
26-
endif
27-
2822
config RAM_SIZE
2923
default 8
3024

@@ -43,13 +37,6 @@ config LOAPIC_TIMER_IRQ
4337
config LOAPIC_TIMER_IRQ_PRIORITY
4438
default 2
4539

46-
if !HAS_DTS
47-
config PHYS_RAM_ADDR
48-
default 0x00280000
49-
help
50-
This option specifies the physical SRAM address of this Soc.
51-
endif
52-
5340
config QMSI
5441
def_bool y
5542

‎arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.series

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,6 @@ config TOOLCHAIN_VARIANT
1919
default "iamcu" if X86_IAMCU
2020
default "" if !X86_IAMCU
2121

22-
if !HAS_DTS
23-
config PHYS_RAM_ADDR
24-
default 0xA8006400
25-
endif
26-
27-
if !HAS_DTS
28-
config PHYS_LOAD_ADDR
29-
default 0x40030000 if XIP
30-
endif
31-
3222
config RAM_SIZE
3323
default 52
3424

@@ -201,19 +191,9 @@ endif # RTC
201191

202192
if BT_H4
203193

204-
if !HAS_DTS
205-
config BT_UART_ON_DEV_NAME
206-
default UART_QMSI_0_NAME
207-
endif
208-
209194
config UART_QMSI_0
210195
def_bool y
211196

212-
if !HAS_DTS
213-
config UART_QMSI_0_BAUDRATE
214-
default 1000000
215-
endif
216-
217197
config UART_QMSI_0_HW_FC
218198
def_bool y
219199

@@ -240,14 +220,6 @@ endif # UART_QMSI_1
240220

241221
endif # UART_QMSI
242222

243-
if UART_CONSOLE && !HAS_DTS
244-
245-
config UART_CONSOLE_ON_DEV_NAME
246-
default "UART_1" if USB_UART_CONSOLE = n
247-
default "CDC_ACM" if USB_UART_CONSOLE
248-
249-
endif
250-
251223
if SOC_FLASH_QMSI
252224
config SOC_FLASH_QMSI_SYS_SIZE
253225
default 0x60000

‎arch/x86/soc/intel_quark/quark_x1000/Kconfig.defconfig.series

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,6 @@ if SOC_SERIES_QUARK_X1000
1212
config SOC_SERIES
1313
default quark_x1000
1414

15-
if !HAS_DTS
16-
config PHYS_LOAD_ADDR
17-
default 0x00100000
18-
19-
config PHYS_RAM_ADDR
20-
default 0x00400000
21-
endif
22-
2315
config RAM_SIZE
2416
default 32768
2517

@@ -202,18 +194,12 @@ config UART_NS16550_PORT_0
202194

203195
if UART_NS16550_PORT_0
204196

205-
if !HAS_DTS
206-
config UART_NS16550_PORT_0_NAME
207-
default "UART_0"
208-
endif
209197
config UART_NS16550_PORT_0_IRQ_PRI
210198
default 0
211-
if !HAS_DTS
212-
config UART_NS16550_PORT_0_BAUD_RATE
213-
default 115200
214-
endif
199+
215200
config UART_NS16550_PORT_0_OPTIONS
216201
default 0
202+
217203
config UART_NS16550_PORT_0_PCI
218204
def_bool y if UART_NS16550_PCI
219205

@@ -224,18 +210,12 @@ config UART_NS16550_PORT_1
224210

225211
if UART_NS16550_PORT_1
226212

227-
if !HAS_DTS
228-
config UART_NS16550_PORT_1_NAME
229-
default "UART_1"
230-
endif
231213
config UART_NS16550_PORT_1_IRQ_PRI
232214
default 3
233-
if !HAS_DTS
234-
config UART_NS16550_PORT_1_BAUD_RATE
235-
default 115200
236-
endif
215+
237216
config UART_NS16550_PORT_1_OPTIONS
238217
default 0
218+
239219
config UART_NS16550_PORT_1_PCI
240220
def_bool y if UART_NS16550_PCI
241221

@@ -270,11 +250,6 @@ config PINMUX_INIT_PRIORITY
270250

271251
if UART_CONSOLE
272252

273-
if !HAS_DTS
274-
config UART_CONSOLE_ON_DEV_NAME
275-
default "UART_1"
276-
endif
277-
278253
endif
279254

280255
if BT_UART

0 commit comments

Comments
 (0)