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

drivers, subsys: sort the lists again, mark the blocks for checking

Browse source 
Sort the Kconfig and CMakeLists include blocks again, and mark the start
and end of the blocks so that the CI can keep them sorted.

Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
This commit is contained in:
Fabio Baltieri 2023-05-22 13:57:55 +00:00 committed by Carles Cufí
parent 26f30db8ad
commit 6ae03d98a0
4 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/CMakeLists.txt
View file

@ -5,6 +5,7 @@ add_compile_options($<TARGET_PROPERTY:compiler,warning_shadow_variables>)
add_definitions(-D__ZEPHYR_SUPERVISOR__) add_definitions(-D__ZEPHYR_SUPERVISOR__)
# zephyr-keep-sorted-start
add_subdirectory(disk) add_subdirectory(disk)
add_subdirectory(interrupt_controller) add_subdirectory(interrupt_controller)
add_subdirectory(misc) add_subdirectory(misc)
@ -13,14 +14,15 @@ add_subdirectory(usb)
add_subdirectory(usb_c) add_subdirectory(usb_c)
add_subdirectory_ifdef(CONFIG_ADC adc) add_subdirectory_ifdef(CONFIG_ADC adc)
add_subdirectory_ifdef(CONFIG_ARM_SIP_SVC_DRIVER sip_svc)
add_subdirectory_ifdef(CONFIG_AUDIO audio) add_subdirectory_ifdef(CONFIG_AUDIO audio)
add_subdirectory_ifdef(CONFIG_AUXDISPLAY auxdisplay)
add_subdirectory_ifdef(CONFIG_BBRAM bbram) add_subdirectory_ifdef(CONFIG_BBRAM bbram)
add_subdirectory_ifdef(CONFIG_XEN xen)
add_subdirectory_ifdef(CONFIG_BT_DRIVERS bluetooth) add_subdirectory_ifdef(CONFIG_BT_DRIVERS bluetooth)
add_subdirectory_ifdef(CONFIG_CACHE_MANAGEMENT cache) add_subdirectory_ifdef(CONFIG_CACHE_MANAGEMENT cache)
add_subdirectory_ifdef(CONFIG_CAN can) add_subdirectory_ifdef(CONFIG_CAN can)
add_subdirectory_ifdef(CONFIG_CLOCK_CONTROL clock_control)
add_subdirectory_ifdef(CONFIG_CHARGER charger) add_subdirectory_ifdef(CONFIG_CHARGER charger)
add_subdirectory_ifdef(CONFIG_CLOCK_CONTROL clock_control)
add_subdirectory_ifdef(CONFIG_CONSOLE console) add_subdirectory_ifdef(CONFIG_CONSOLE console)
add_subdirectory_ifdef(CONFIG_COREDUMP_DEVICE coredump) add_subdirectory_ifdef(CONFIG_COREDUMP_DEVICE coredump)
add_subdirectory_ifdef(CONFIG_COUNTER counter) add_subdirectory_ifdef(CONFIG_COUNTER counter)
@ -28,7 +30,6 @@ add_subdirectory_ifdef(CONFIG_CRYPTO crypto)
add_subdirectory_ifdef(CONFIG_DAC dac) add_subdirectory_ifdef(CONFIG_DAC dac)
add_subdirectory_ifdef(CONFIG_DAI dai) add_subdirectory_ifdef(CONFIG_DAI dai)
add_subdirectory_ifdef(CONFIG_DISPLAY display) add_subdirectory_ifdef(CONFIG_DISPLAY display)
add_subdirectory_ifdef(CONFIG_AUXDISPLAY auxdisplay)
add_subdirectory_ifdef(CONFIG_DMA dma) add_subdirectory_ifdef(CONFIG_DMA dma)
add_subdirectory_ifdef(CONFIG_EDAC edac) add_subdirectory_ifdef(CONFIG_EDAC edac)
add_subdirectory_ifdef(CONFIG_EEPROM eeprom) add_subdirectory_ifdef(CONFIG_EEPROM eeprom)
@ -40,8 +41,8 @@ add_subdirectory_ifdef(CONFIG_FUEL_GAUGE fuel_gauge)
add_subdirectory_ifdef(CONFIG_GNSS gnss) add_subdirectory_ifdef(CONFIG_GNSS gnss)
add_subdirectory_ifdef(CONFIG_GPIO gpio) add_subdirectory_ifdef(CONFIG_GPIO gpio)
add_subdirectory_ifdef(CONFIG_HWINFO hwinfo) add_subdirectory_ifdef(CONFIG_HWINFO hwinfo)
add_subdirectory_ifdef(CONFIG_HWSPINLOCK hwspinlock)
add_subdirectory_ifdef(CONFIG_I2C i2c) add_subdirectory_ifdef(CONFIG_I2C i2c)
add_subdirectory_ifdef(CONFIG_SMBUS smbus)
add_subdirectory_ifdef(CONFIG_I2S i2s) add_subdirectory_ifdef(CONFIG_I2S i2s)
add_subdirectory_ifdef(CONFIG_I3C i3c) add_subdirectory_ifdef(CONFIG_I3C i3c)
add_subdirectory_ifdef(CONFIG_IEEE802154 ieee802154) add_subdirectory_ifdef(CONFIG_IEEE802154 ieee802154)
@ -70,9 +71,11 @@ add_subdirectory_ifdef(CONFIG_PWM pwm)
add_subdirectory_ifdef(CONFIG_REGULATOR regulator) add_subdirectory_ifdef(CONFIG_REGULATOR regulator)
add_subdirectory_ifdef(CONFIG_RESET reset) add_subdirectory_ifdef(CONFIG_RESET reset)
add_subdirectory_ifdef(CONFIG_RETAINED_MEM retained_mem) add_subdirectory_ifdef(CONFIG_RETAINED_MEM retained_mem)
add_subdirectory_ifdef(CONFIG_RTC rtc)
add_subdirectory_ifdef(CONFIG_SDHC sdhc) add_subdirectory_ifdef(CONFIG_SDHC sdhc)
add_subdirectory_ifdef(CONFIG_SENSOR sensor) add_subdirectory_ifdef(CONFIG_SENSOR sensor)
add_subdirectory_ifdef(CONFIG_SERIAL serial) add_subdirectory_ifdef(CONFIG_SERIAL serial)
add_subdirectory_ifdef(CONFIG_SMBUS smbus)
add_subdirectory_ifdef(CONFIG_SPI spi) add_subdirectory_ifdef(CONFIG_SPI spi)
add_subdirectory_ifdef(CONFIG_SYSCON syscon) add_subdirectory_ifdef(CONFIG_SYSCON syscon)
add_subdirectory_ifdef(CONFIG_SYS_CLOCK_EXISTS timer) add_subdirectory_ifdef(CONFIG_SYS_CLOCK_EXISTS timer)
@ -81,6 +84,5 @@ add_subdirectory_ifdef(CONFIG_VIRTUALIZATION virtualization)
add_subdirectory_ifdef(CONFIG_W1 w1) add_subdirectory_ifdef(CONFIG_W1 w1)
add_subdirectory_ifdef(CONFIG_WATCHDOG watchdog) add_subdirectory_ifdef(CONFIG_WATCHDOG watchdog)
add_subdirectory_ifdef(CONFIG_WIFI wifi) add_subdirectory_ifdef(CONFIG_WIFI wifi)
add_subdirectory_ifdef(CONFIG_RTC rtc) add_subdirectory_ifdef(CONFIG_XEN xen)
add_subdirectory_ifdef(CONFIG_ARM_SIP_SVC_DRIVER sip_svc) # zephyr-keep-sorted-stop
add_subdirectory_ifdef(CONFIG_HWSPINLOCK hwspinlock)

10
drivers/Kconfig
View file

@ -5,9 +5,10 @@
menu "Device Drivers" menu "Device Drivers"
# zephyr-keep-sorted-start
source "drivers/adc/Kconfig" source "drivers/adc/Kconfig"
source "drivers/auxdisplay/Kconfig"
source "drivers/audio/Kconfig" source "drivers/audio/Kconfig"
source "drivers/auxdisplay/Kconfig"
source "drivers/bbram/Kconfig" source "drivers/bbram/Kconfig"
source "drivers/bluetooth/Kconfig" source "drivers/bluetooth/Kconfig"
source "drivers/cache/Kconfig" source "drivers/cache/Kconfig"
@ -34,10 +35,10 @@ source "drivers/fuel_gauge/Kconfig"
source "drivers/gnss/Kconfig" source "drivers/gnss/Kconfig"
source "drivers/gpio/Kconfig" source "drivers/gpio/Kconfig"
source "drivers/hwinfo/Kconfig" source "drivers/hwinfo/Kconfig"
source "drivers/hwspinlock/Kconfig"
source "drivers/i2c/Kconfig" source "drivers/i2c/Kconfig"
source "drivers/i2s/Kconfig" source "drivers/i2s/Kconfig"
source "drivers/i3c/Kconfig" source "drivers/i3c/Kconfig"
source "drivers/smbus/Kconfig"
source "drivers/ieee802154/Kconfig" source "drivers/ieee802154/Kconfig"
source "drivers/input/Kconfig" source "drivers/input/Kconfig"
source "drivers/interrupt_controller/Kconfig" source "drivers/interrupt_controller/Kconfig"
@ -71,6 +72,8 @@ source "drivers/rtc/Kconfig"
source "drivers/sdhc/Kconfig" source "drivers/sdhc/Kconfig"
source "drivers/sensor/Kconfig" source "drivers/sensor/Kconfig"
source "drivers/serial/Kconfig" source "drivers/serial/Kconfig"
source "drivers/sip_svc/Kconfig"
source "drivers/smbus/Kconfig"
source "drivers/spi/Kconfig" source "drivers/spi/Kconfig"
source "drivers/syscon/Kconfig" source "drivers/syscon/Kconfig"
source "drivers/timer/Kconfig" source "drivers/timer/Kconfig"
@ -82,7 +85,6 @@ source "drivers/w1/Kconfig"
source "drivers/watchdog/Kconfig" source "drivers/watchdog/Kconfig"
source "drivers/wifi/Kconfig" source "drivers/wifi/Kconfig"
source "drivers/xen/Kconfig" source "drivers/xen/Kconfig"
source "drivers/sip_svc/Kconfig" # zephyr-keep-sorted-stop
source "drivers/hwspinlock/Kconfig"
endmenu endmenu

6
subsys/CMakeLists.txt
View file

@ -11,6 +11,7 @@ add_subdirectory_ifdef(CONFIG_LORAWAN lorawan)
# FIXME: SHADOW_VARS: Remove this once we have enabled -Wshadow globally. # FIXME: SHADOW_VARS: Remove this once we have enabled -Wshadow globally.
add_compile_options($<TARGET_PROPERTY:compiler,warning_shadow_variables>) add_compile_options($<TARGET_PROPERTY:compiler,warning_shadow_variables>)
# zephyr-keep-sorted-start
add_subdirectory(canbus) add_subdirectory(canbus)
add_subdirectory(debug) add_subdirectory(debug)
add_subdirectory(fb) add_subdirectory(fb)
@ -32,6 +33,7 @@ add_subdirectory(testsuite)
add_subdirectory(tracing) add_subdirectory(tracing)
add_subdirectory(usb) add_subdirectory(usb)
add_subdirectory_ifdef(CONFIG_ARM_SIP_SVC_SUBSYS sip_svc)
add_subdirectory_ifdef(CONFIG_BINDESC bindesc) add_subdirectory_ifdef(CONFIG_BINDESC bindesc)
add_subdirectory_ifdef(CONFIG_BT bluetooth) add_subdirectory_ifdef(CONFIG_BT bluetooth)
add_subdirectory_ifdef(CONFIG_CONSOLE_SUBSYS console) add_subdirectory_ifdef(CONFIG_CONSOLE_SUBSYS console)
@ -42,8 +44,8 @@ add_subdirectory_ifdef(CONFIG_EMUL emul)
add_subdirectory_ifdef(CONFIG_IMG_MANAGER dfu) add_subdirectory_ifdef(CONFIG_IMG_MANAGER dfu)
add_subdirectory_ifdef(CONFIG_INPUT input) add_subdirectory_ifdef(CONFIG_INPUT input)
add_subdirectory_ifdef(CONFIG_JWT jwt) add_subdirectory_ifdef(CONFIG_JWT jwt)
add_subdirectory_ifdef(CONFIG_MODEM_MODULES modem)
add_subdirectory_ifdef(CONFIG_LLEXT llext) add_subdirectory_ifdef(CONFIG_LLEXT llext)
add_subdirectory_ifdef(CONFIG_MODEM_MODULES modem)
add_subdirectory_ifdef(CONFIG_NET_BUF net) add_subdirectory_ifdef(CONFIG_NET_BUF net)
add_subdirectory_ifdef(CONFIG_RETENTION retention) add_subdirectory_ifdef(CONFIG_RETENTION retention)
add_subdirectory_ifdef(CONFIG_SENSING sensing) add_subdirectory_ifdef(CONFIG_SENSING sensing)
@ -51,4 +53,4 @@ add_subdirectory_ifdef(CONFIG_SETTINGS settings)
add_subdirectory_ifdef(CONFIG_SHELL shell) add_subdirectory_ifdef(CONFIG_SHELL shell)
add_subdirectory_ifdef(CONFIG_TIMING_FUNCTIONS timing) add_subdirectory_ifdef(CONFIG_TIMING_FUNCTIONS timing)
add_subdirectory_ifdef(CONFIG_ZBUS zbus) add_subdirectory_ifdef(CONFIG_ZBUS zbus)
add_subdirectory_ifdef(CONFIG_ARM_SIP_SVC_SUBSYS sip_svc) # zephyr-keep-sorted-stop

4
subsys/Kconfig
View file

@ -6,6 +6,7 @@
menu "Subsystems and OS Services" menu "Subsystems and OS Services"
# zephyr-keep-sorted-start
source "subsys/bindesc/Kconfig" source "subsys/bindesc/Kconfig"
source "subsys/bluetooth/Kconfig" source "subsys/bluetooth/Kconfig"
source "subsys/canbus/Kconfig" source "subsys/canbus/Kconfig"
@ -38,6 +39,7 @@ source "subsys/sd/Kconfig"
source "subsys/sensing/Kconfig" source "subsys/sensing/Kconfig"
source "subsys/settings/Kconfig" source "subsys/settings/Kconfig"
source "subsys/shell/Kconfig" source "subsys/shell/Kconfig"
source "subsys/sip_svc/Kconfig"
source "subsys/stats/Kconfig" source "subsys/stats/Kconfig"
source "subsys/storage/Kconfig" source "subsys/storage/Kconfig"
source "subsys/task_wdt/Kconfig" source "subsys/task_wdt/Kconfig"
@ -49,6 +51,6 @@ source "subsys/usb/device_next/Kconfig"
source "subsys/usb/host/Kconfig" source "subsys/usb/host/Kconfig"
source "subsys/usb/usb_c/Kconfig" source "subsys/usb/usb_c/Kconfig"
source "subsys/zbus/Kconfig" source "subsys/zbus/Kconfig"
source "subsys/sip_svc/Kconfig" # zephyr-keep-sorted-stop
endmenu endmenu