patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

soc/x86: Clean up EHL kconfigs

Browse source 
Cleanup along the same lines as the last change to APL/up_squared.
Make sure all hardware configuration is at the board level where it
belongs and not in the soc, don't play games with defaulting timer
drivers.  Unify the configuration where possible and make it clearer
which setting goes with which driver.

Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
This commit is contained in:
Andy Ross 2021-05-06 17:57:51 -07:00 committed by Anas Nashif
parent 9d11e8f2bf
commit f35d02cef0
2 changed files with 22 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
boards/x86/ehl_crb/Kconfig.defconfig
View file

@ -1,9 +1,10 @@
# Copyright (c) 2020 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
if BOARD_EHL_CRB
if BOARD_EHL_CRB || BOARD_EHL_CRB_SBL
config BOARD
default "ehl_crb_sbl" if BOARD_EHL_CRB_SBL
default "ehl_crb"
config BUILD_OUTPUT_STRIPPED
@ -12,21 +13,28 @@ config BUILD_OUTPUT_STRIPPED
config MP_NUM_CPUS
default 2
endif # BOARD_EHL_CRB
if BOARD_EHL_CRB_SBL
config BOARD
default "ehl_crb_sbl"
config BUILD_OUTPUT_STRIPPED
default y
config MP_NUM_CPUS
default 2
config SHELL_BACKEND_SERIAL_INTERRUPT_DRIVEN
depends on SHELL_BACKEND_SERIAL
default n
endif
endif # BOARD_EHL_CRB_SBL
config HPET_TIMER
default y
# TSC on this board is 1.9 GHz, HPET and APIC are 19.2 MHz
config SYS_CLOCK_HW_CYCLES_PER_SEC
default 1900000000 if APIC_TSC_DEADLINE_TIMER
default 1900000000 if APIC_TIMER_TSC
default 19200000
if APIC_TIMER
config APIC_TIMER_IRQ
default 24
config APIC_TIMER_TSC_M
default 3
config APIC_TIMER_TSC_N
default 249
endif
endif # BOARD_EHL_CRB || BOARD_EHL_CRB_SBL

29
soc/x86/elkhart_lake/Kconfig.defconfig
View file

@ -9,38 +9,9 @@ if SOC_ELKHART_LAKE
config SOC
default "elkhart_lake"
config SYS_CLOCK_HW_CYCLES_PER_SEC
default 19200000
config HPET_TIMER
default y
config APIC_TIMER
default y if !HPET_TIMER
config PCIE_MMIO_CFG
default y
if APIC_TIMER
config APIC_TIMER_IRQ
default 24
config APIC_TIMER_TSC
default y
if APIC_TIMER_TSC
config APIC_TIMER_TSC_M
default 3
config APIC_TIMER_TSC_N
default 249
endif # APIC_TIMER_TSC
endif # APIC_TIMER
config X86_DYNAMIC_IRQ_STUBS
default 16
depends on DYNAMIC_INTERRUPTS