You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/05/28 15:41:57 UTC
[incubator-nuttx] 01/02: Change dpends on SCHED_[L|H]PWORK to SCHED_WORKQUEUE
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 7ec6b4c7dd2d2512a1481cbce7af943a48616055
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat May 28 02:17:10 2022 +0800
Change dpends on SCHED_[L|H]PWORK to SCHED_WORKQUEUE
since the code could map the unsupported work to the
supported one and remove select SCHED_WORKQUEUE from
Kconfig since SCHED_[L|H]PWORK already do the selection
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/cxd56xx/Kconfig | 4 ++--
arch/arm/src/sama5/Kconfig | 3 +--
arch/risc-v/src/bl602/Kconfig | 5 ++---
arch/risc-v/src/litex/Kconfig | 1 -
boards/arm/sama5/giant-board/Kconfig | 3 +--
boards/arm/sama5/sama5d2-xult/Kconfig | 3 +--
drivers/usbhost/Kconfig | 9 +++------
drivers/wireless/Kconfig | 1 -
fs/aio/Kconfig | 2 +-
include/aio.h | 4 ----
net/tcp/Kconfig | 2 +-
11 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/arch/arm/src/cxd56xx/Kconfig b/arch/arm/src/cxd56xx/Kconfig
index db7777af79..76f5417de5 100644
--- a/arch/arm/src/cxd56xx/Kconfig
+++ b/arch/arm/src/cxd56xx/Kconfig
@@ -80,7 +80,7 @@ if CXD56_PMIC
config CXD56_PMIC_INT
bool "PMIC interrupt"
default n
- depends on SCHED_LPWORK
+ depends on SCHED_WORKQUEUE
---help---
Enable PMIC interrupt.
@@ -1202,7 +1202,7 @@ menuconfig CXD56_SDIO
default n
select ARCH_HAVE_SDIO
select SDIO_BLOCKSETUP
- depends on SCHED_HPWORK
+ depends on SCHED_WORKQUEUE
if CXD56_SDIO
diff --git a/arch/arm/src/sama5/Kconfig b/arch/arm/src/sama5/Kconfig
index fdcff94539..b5d583652a 100644
--- a/arch/arm/src/sama5/Kconfig
+++ b/arch/arm/src/sama5/Kconfig
@@ -5076,7 +5076,6 @@ config SAMA5_SDMMC
bool "enable SDMMC controller"
default y if SAMA5_HAVE_SDMMC
select SDIO_DMA
- select SCHED_WORKQUEUE
select SCHED_HPWORK
select MMCSD
select MMCSD_SDIO
@@ -5084,7 +5083,7 @@ config SAMA5_SDMMC
select ARCH_HAVE_SDIO
select SAMA5_SDMMC_DMA
---help---
- Enable SD Card interface SDMMC. Selects SAMA5_SDMMC SAMA5_SDMMC_DMA SDIO_DMA SCHED_WORKQUEUE SCHED_HPWORK SDIO_BLOCKSETUP
+ Enable SD Card interface SDMMC. Selects SAMA5_SDMMC SAMA5_SDMMC_DMA SDIO_DMA SCHED_HPWORK SDIO_BLOCKSETUP
choice
prompt "SDMMC maximum bus speed"
diff --git a/arch/risc-v/src/bl602/Kconfig b/arch/risc-v/src/bl602/Kconfig
index 22876d6fe6..03de245b00 100644
--- a/arch/risc-v/src/bl602/Kconfig
+++ b/arch/risc-v/src/bl602/Kconfig
@@ -78,8 +78,7 @@ endmenu # BL602_SPIFLASH
config BL602_WIRELESS
bool "Wireless & WiFi Support"
- depends on SCHED_HPWORK
- depends on SCHED_LPWORK
+ depends on SCHED_WORKQUEUE
default n
config BL602_WIRELESS_DEBUG
@@ -101,6 +100,6 @@ config BL602_BLE_CONTROLLER
bool "ble controller support"
default n
depends on !DISABLE_MQUEUE
- depends on SCHED_HPWORK
+ depends on SCHED_WORKQUEUE
depends on BL602_WIRELESS
endmenu
diff --git a/arch/risc-v/src/litex/Kconfig b/arch/risc-v/src/litex/Kconfig
index 45f5bf3d36..b678910bea 100644
--- a/arch/risc-v/src/litex/Kconfig
+++ b/arch/risc-v/src/litex/Kconfig
@@ -28,7 +28,6 @@ config LITEX_UART0
config LITEX_SDIO
bool "SDIO"
default n
- select SCHED_WORKQUEUE
select SCHED_HPWORK
select MMCSD
select MMCSD_SDIO
diff --git a/boards/arm/sama5/giant-board/Kconfig b/boards/arm/sama5/giant-board/Kconfig
index d708048476..14e2481867 100644
--- a/boards/arm/sama5/giant-board/Kconfig
+++ b/boards/arm/sama5/giant-board/Kconfig
@@ -29,7 +29,6 @@ config SAMA5_SDMMC
bool "enable SDMMC controller"
default y if SAMA5_HAVE_SDMMC
select SDIO_DMA
- select SCHED_WORKQUEUE
select SCHED_HPWORK
select MMCSD
select MMCSD_SDIO
@@ -38,7 +37,7 @@ config SAMA5_SDMMC
select SAMA5_SDMMC_DMA
---help---
Enable SD Card interface SDMMC0. Selects SAMA5_SDMMC SAMA5_SDMMC0
- SAMA5_SDMMC_DMA SDIO_DMA SCHED_WORKQUEUE SCHED_HPWORK SDIO_BLOCKSETUP
+ SAMA5_SDMMC_DMA SDIO_DMA SCHED_HPWORK SDIO_BLOCKSETUP
config SAMA5_SDMMC0
bool "Enable SDMMC0 (built-in eMMC)"
diff --git a/boards/arm/sama5/sama5d2-xult/Kconfig b/boards/arm/sama5/sama5d2-xult/Kconfig
index 0011cf6d97..4ee94b80b8 100644
--- a/boards/arm/sama5/sama5d2-xult/Kconfig
+++ b/boards/arm/sama5/sama5d2-xult/Kconfig
@@ -38,7 +38,6 @@ config SAMA5_SDMMC
bool "enable SDMMC controller"
default y if SAMA5_HAVE_SDMMC
select SDIO_DMA
- select SCHED_WORKQUEUE
select SCHED_HPWORK
select MMCSD
select MMCSD_SDIO
@@ -46,7 +45,7 @@ config SAMA5_SDMMC
select ARCH_HAVE_SDIO
select SAMA5_SDMMC_DMA
---help---
- Enable SD Card interface SDMMC0. Selects SAMA5_SDMMC SAMA5_SDMMC0 SAMA5_SDMMC_DMA SDIO_DMA SCHED_WORKQUEUE SCHED_HPWORK SDIO_BLOCKSETUP
+ Enable SD Card interface SDMMC0. Selects SAMA5_SDMMC SAMA5_SDMMC0 SAMA5_SDMMC_DMA SDIO_DMA SCHED_HPWORK SDIO_BLOCKSETUP
config SAMA5_SDMMC0
bool "Enable SDMMC0 (built-in eMMC)"
diff --git a/drivers/usbhost/Kconfig b/drivers/usbhost/Kconfig
index 7613061193..a8e575d505 100644
--- a/drivers/usbhost/Kconfig
+++ b/drivers/usbhost/Kconfig
@@ -106,8 +106,7 @@ config USBHOST_MSC
default n
depends on !BULK_DISABLE
---help---
- Enable support for the mass storage class driver. This also depends on
- SCHED_WORKQUEUE=y
+ Enable support for the mass storage class driver.
config USBHOST_MSC_NOTIFIER
bool "Support USB Mass Storage notifications"
@@ -294,8 +293,7 @@ config USBHOST_HIDKBD
default n
depends on !INT_DISABLE
---help---
- Enable support for the keyboard class driver. This also depends on
- SCHED_WORKQUEUE
+ Enable support for the keyboard class driver.
if USBHOST_HIDKBD
@@ -372,8 +370,7 @@ config USBHOST_HIDMOUSE
select INPUT
select INPUT_MOUSE
---help---
- Enable support for the mouse class driver. This also depends on
- SCHED_WORKQUEUE
+ Enable support for the mouse class driver.
NOTE: This driver checks out on a Labtec and an AOpen mouse, but
does not work correctly on a Microsoft mouse. A little more work
diff --git a/drivers/wireless/Kconfig b/drivers/wireless/Kconfig
index fd5b26c51f..a80f2526d2 100644
--- a/drivers/wireless/Kconfig
+++ b/drivers/wireless/Kconfig
@@ -16,7 +16,6 @@ config WL_CC1101
default n
select SPI
select SCHED_HPWORK
- select SCHED_LPWORK
if WL_CC1101
diff --git a/fs/aio/Kconfig b/fs/aio/Kconfig
index 0a8bfab461..3e519cdc3a 100644
--- a/fs/aio/Kconfig
+++ b/fs/aio/Kconfig
@@ -6,7 +6,7 @@
config FS_AIO
bool "Asynchronous I/O support"
default n
- depends on SCHED_LPWORK
+ depends on SCHED_WORKQUEUE
---help---
Enable support for aynchronous I/O. This selection enables the
interfaces declared in include/aio.h.
diff --git a/include/aio.h b/include/aio.h
index 768a08198b..60dab48827 100644
--- a/include/aio.h
+++ b/include/aio.h
@@ -57,10 +57,6 @@
# error Asynchronous I/O requires CONFIG_SCHED_WORKQUEUE
#endif
-#ifndef CONFIG_SCHED_LPWORK
-# error Asynchronous I/O requires CONFIG_SCHED_LPWORK
-#endif
-
/* Standard Definitions *****************************************************/
/* aio_cancel return values
diff --git a/net/tcp/Kconfig b/net/tcp/Kconfig
index d3ca9672bf..fd40395325 100644
--- a/net/tcp/Kconfig
+++ b/net/tcp/Kconfig
@@ -9,7 +9,7 @@ config NET_TCP
bool "TCP/IP Networking"
default n
select NET_READAHEAD if !NET_TCP_NO_STACK
- depends on SCHED_LPWORK
+ depends on SCHED_WORKQUEUE
---help---
Enable or disable TCP networking support.