michaelh/zephyr
1
0
Fork 0
Code Releases Activity

qmsi: remove handling of qmsi library

Browse source 
Use built-in by default. We do not use external library of QMSI anymore
and rely on integrated HAL. Remove this option and simplify HAL
configuration.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2019-01-17 09:00:11 -05:00
commit 15a5fedca7
5 changed files with 19 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

29
ext/hal/qmsi/CMakeLists.txt
View file

@ -3,29 +3,16 @@ zephyr_library()
zephyr_compile_definitions( ENABLE_EXTERNAL_ISR_HANDLING)
zephyr_compile_definitions_ifdef(CONFIG_SYS_POWER_DEEP_SLEEP ENABLE_RESTORE_CONTEXT)
if(CONFIG_QMSI_LIBRARY)
zephyr_include_directories(
${CONFIG_QMSI_INSTALL_PATH}/include
)
zephyr_link_libraries(
qmsi
-L${CONFIG_QMSI_INSTALL_PATH}/lib
)
endif()
if(CONFIG_SOC_QUARK_SE_C1000_SS)
set(SOC_SERIES quark_se)
endif()
if(CONFIG_QMSI_BUILTIN)
zephyr_include_directories(
zephyr_include_directories(
include
drivers/include
)
zephyr_include_directories_ifdef(CONFIG_ARC drivers/sensor/include)
zephyr_include_directories( soc/${SOC_SERIES}/include)
endif()
zephyr_include_directories_ifdef(CONFIG_ARC drivers/sensor/include)
zephyr_include_directories( soc/${SOC_SERIES}/include)
set_ifndef(SOC_WATCH_ENABLE 0)
if(CONFIG_SOC_WATCH)
@ -33,22 +20,20 @@ if(CONFIG_SOC_WATCH)
zephyr_compile_definitions(SOC_WATCH_ENABLE)
endif()
if(CONFIG_QMSI_BUILTIN)
zephyr_library_sources(
zephyr_library_sources(
drivers/flash/qm_flash.c
soc/${SOC_SERIES}/drivers/power_states.c
soc/${SOC_SERIES}/drivers/clk.c
)
if(CONFIG_SOC_QUARK_SE_C1000_SS)
if(CONFIG_SOC_QUARK_SE_C1000_SS)
zephyr_library_sources(
drivers/clk/ss_clk.c
soc/quark_se/drivers/vreg.c
soc/quark_se/drivers/ss_power_states.c
)
endif()
if(CONFIG_SOC_QUARK_SE_C1000)
endif()
if(CONFIG_SOC_QUARK_SE_C1000)
zephyr_library_sources(soc/${SOC_SERIES}/drivers/vreg.c)
endif()
endif()
zephyr_library_sources_ifdef(CONFIG_AIO_COMPARATOR_QMSI drivers/comparator/qm_comparator.c)

29
ext/hal/qmsi/Kconfig
View file

@ -13,32 +13,5 @@ menuconfig QMSI
bool "QMSI driver support"
depends on HAS_QMSI
help
automatically set when either of QMSI_LIBRARY or QMSI_BUILTIN
is selected.
Enable QMSI driver support.
if HAS_QMSI
config QMSI_BUILTIN
bool "Enable QMSI drivers through integrated sources"
select QMSI
help
Link with local QMSI sources instead of external library.
config QMSI_LIBRARY
bool "Enable QMSI drivers using external library"
select QMSI
help
This option enables QMSI device drivers. These drivers are actually shim
drivers based on drivers provided by QMSI BSP. The BSP provides a static
library (libqmsi) which implements several drivers for peripherals from
Intel MCUs (e.g. Quark SE and Quark D2000).
config QMSI_INSTALL_PATH
depends on QMSI_LIBRARY
string "QMSI install path"
help
This option holds the path where the QMSI library and headers are
installed. Make sure this option is properly set when QMSI_LIBRARY
is enabled otherwise the build will fail.
endif

3
soc/arc/quark_se_c1000_ss/Kconfig.defconfig
View file

@ -31,9 +31,6 @@ config HARVARD
config QMSI
default y
config QMSI_BUILTIN
default y
if RTC
config RTC_QMSI

3
soc/x86/intel_quark/quark_d2000/Kconfig.defconfig.series
View file

@ -30,9 +30,6 @@ config LOAPIC_TIMER_IRQ_PRIORITY
config QMSI
default y
config QMSI_BUILTIN
default y
if PINMUX
config PINMUX_QMSI
default y

3
soc/x86/intel_quark/quark_se/Kconfig.defconfig.series
View file

@ -27,9 +27,6 @@ config LOAPIC_TIMER_IRQ
config QMSI
default y
config QMSI_BUILTIN
default y
if PWM
config PWM_QMSI
default y