michaelh/zephyr
1
0
Fork 0
Code Releases Activity

build: sort and compact drivers and subsys CMakeLists and Kconfig

Browse source 
There are just list of child files to include, right now there's a hint
of that trying to be alphabetical but then entries have been added with
various logic, so one has to figure where stuff has to be added.

Rewrite these to:
- keep the list alphabetical, for CMakeLists unconditional first,
  conditional after so one just has to select and sort
- drop the spaces in the Kconfig
- use a single space between  target and directory
- rename from "Sub Systems" to "Subsystems" (single word)

Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
This commit is contained in:
Fabio Baltieri 2023-02-21 19:18:37 +00:00 • committed by Fabio Baltieri
commit 8c6137d7a7
4 changed files with 167 additions and 273 deletions
Download patch file Download diff file Expand all files Collapse all files

90
drivers/CMakeLists.txt
View file

@ -2,75 +2,75 @@
add_definitions(-D__ZEPHYR_SUPERVISOR__) add_definitions(-D__ZEPHYR_SUPERVISOR__)
add_subdirectory(disk)
add_subdirectory(interrupt_controller) add_subdirectory(interrupt_controller)
add_subdirectory(misc) add_subdirectory(misc)
add_subdirectory(pcie) add_subdirectory(pcie)
add_subdirectory(disk)
add_subdirectory(usb) 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_AUDIO audio)
add_subdirectory_ifdef(CONFIG_BBRAM bbram)
add_subdirectory_ifdef(CONFIG_BOARD_XENVM xen)
add_subdirectory_ifdef(CONFIG_BT_DRIVERS bluetooth)
add_subdirectory_ifdef(CONFIG_CACHE_MANAGEMENT cache)
add_subdirectory_ifdef(CONFIG_CAN can)
add_subdirectory_ifdef(CONFIG_CLOCK_CONTROL clock_control) add_subdirectory_ifdef(CONFIG_CLOCK_CONTROL clock_control)
add_subdirectory_ifdef(CONFIG_COUNTER counter)
add_subdirectory_ifdef(CONFIG_CONSOLE console) add_subdirectory_ifdef(CONFIG_CONSOLE console)
add_subdirectory_ifdef(CONFIG_COREDUMP_DEVICE coredump)
add_subdirectory_ifdef(CONFIG_COUNTER counter)
add_subdirectory_ifdef(CONFIG_CRYPTO crypto) 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_DISPLAY display) add_subdirectory_ifdef(CONFIG_DISPLAY display)
add_subdirectory_ifdef(CONFIG_DMA dma) add_subdirectory_ifdef(CONFIG_DMA dma)
add_subdirectory_ifdef(CONFIG_GPIO gpio)
add_subdirectory_ifdef(CONFIG_EC_HOST_CMD_PERIPH ec_host_cmd_periph) add_subdirectory_ifdef(CONFIG_EC_HOST_CMD_PERIPH ec_host_cmd_periph)
add_subdirectory_ifdef(CONFIG_EDAC edac)
add_subdirectory_ifdef(CONFIG_EEPROM eeprom)
add_subdirectory_ifdef(CONFIG_ENTROPY_HAS_DRIVER entropy)
add_subdirectory_ifdef(CONFIG_ESPI espi)
add_subdirectory_ifdef(CONFIG_FLASH_HAS_DRIVER_ENABLED flash)
add_subdirectory_ifdef(CONFIG_FPGA fpga)
add_subdirectory_ifdef(CONFIG_FUEL_GAUGE fuel_gauge)
add_subdirectory_ifdef(CONFIG_GPIO gpio)
add_subdirectory_ifdef(CONFIG_HWINFO hwinfo)
add_subdirectory_ifdef(CONFIG_I2C i2c) add_subdirectory_ifdef(CONFIG_I2C i2c)
add_subdirectory_ifdef(CONFIG_I3C i3c)
add_subdirectory_ifdef(CONFIG_I2S i2s) add_subdirectory_ifdef(CONFIG_I2S i2s)
add_subdirectory_ifdef(CONFIG_MDIO mdio) add_subdirectory_ifdef(CONFIG_I3C i3c)
add_subdirectory_ifdef(CONFIG_IEEE802154 ieee802154) add_subdirectory_ifdef(CONFIG_IEEE802154 ieee802154)
add_subdirectory_ifdef(CONFIG_IPM ipm) add_subdirectory_ifdef(CONFIG_IPM ipm)
add_subdirectory_ifdef(CONFIG_KSCAN kscan)
add_subdirectory_ifdef(CONFIG_LED led) add_subdirectory_ifdef(CONFIG_LED led)
add_subdirectory_ifdef(CONFIG_LED_STRIP led_strip) add_subdirectory_ifdef(CONFIG_LED_STRIP led_strip)
add_subdirectory_ifdef(CONFIG_LORA lora)
add_subdirectory_ifdef(CONFIG_MBOX mbox)
add_subdirectory_ifdef(CONFIG_MDIO mdio)
add_subdirectory_ifdef(CONFIG_MEMC memc)
add_subdirectory_ifdef(CONFIG_MIPI_DSI mipi_dsi)
add_subdirectory_ifdef(CONFIG_MM_DRV mm)
add_subdirectory_ifdef(CONFIG_MODEM modem) add_subdirectory_ifdef(CONFIG_MODEM modem)
add_subdirectory_ifdef(CONFIG_NET_DRIVERS net)
add_subdirectory_ifdef(CONFIG_NET_L2_ETHERNET ethernet)
add_subdirectory_ifdef(CONFIG_NEURAL_NET_ACCEL neural_net)
add_subdirectory_ifdef(CONFIG_PECI peci)
add_subdirectory_ifdef(CONFIG_PINCTRL pinctrl)
add_subdirectory_ifdef(CONFIG_PINMUX pinmux) add_subdirectory_ifdef(CONFIG_PINMUX pinmux)
add_subdirectory_ifdef(CONFIG_PM_CPU_OPS pm_cpu_ops)
add_subdirectory_ifdef(CONFIG_POWER_DOMAIN power_domain)
add_subdirectory_ifdef(CONFIG_PS2 ps2)
add_subdirectory_ifdef(CONFIG_PTP_CLOCK ptp_clock)
add_subdirectory_ifdef(CONFIG_PWM pwm) add_subdirectory_ifdef(CONFIG_PWM pwm)
add_subdirectory_ifdef(CONFIG_SENSOR sensor) add_subdirectory_ifdef(CONFIG_REGULATOR regulator)
add_subdirectory_ifdef(CONFIG_SPI spi) add_subdirectory_ifdef(CONFIG_RESET reset)
add_subdirectory_ifdef(CONFIG_SDHC sdhc) add_subdirectory_ifdef(CONFIG_SDHC sdhc)
add_subdirectory_ifdef(CONFIG_SENSOR sensor)
add_subdirectory_ifdef(CONFIG_SERIAL_HAS_DRIVER serial)
add_subdirectory_ifdef(CONFIG_SPI spi)
add_subdirectory_ifdef(CONFIG_SYSCON syscon)
add_subdirectory_ifdef(CONFIG_SYS_CLOCK_EXISTS timer)
add_subdirectory_ifdef(CONFIG_VIDEO video)
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_CAN can)
add_subdirectory_ifdef(CONFIG_AUDIO audio)
add_subdirectory_ifdef(CONFIG_HWINFO hwinfo)
add_subdirectory_ifdef(CONFIG_ESPI espi)
add_subdirectory_ifdef(CONFIG_PS2 ps2)
add_subdirectory_ifdef(CONFIG_KSCAN kscan)
add_subdirectory_ifdef(CONFIG_VIDEO video)
add_subdirectory_ifdef(CONFIG_EEPROM eeprom)
add_subdirectory_ifdef(CONFIG_LORA lora)
add_subdirectory_ifdef(CONFIG_PECI peci)
add_subdirectory_ifdef(CONFIG_REGULATOR regulator)
add_subdirectory_ifdef(CONFIG_MEMC memc)
add_subdirectory_ifdef(CONFIG_VIRTUALIZATION virtualization)
add_subdirectory_ifdef(CONFIG_PM_CPU_OPS pm_cpu_ops)
add_subdirectory_ifdef(CONFIG_POWER_DOMAIN power_domain)
add_subdirectory_ifdef(CONFIG_DAI dai)
add_subdirectory_ifdef(CONFIG_MIPI_DSI mipi_dsi)
add_subdirectory_ifdef(CONFIG_FLASH_HAS_DRIVER_ENABLED flash)
add_subdirectory_ifdef(CONFIG_SERIAL_HAS_DRIVER serial)
add_subdirectory_ifdef(CONFIG_BT_DRIVERS bluetooth)
add_subdirectory_ifdef(CONFIG_NET_DRIVERS net)
add_subdirectory_ifdef(CONFIG_NET_L2_ETHERNET ethernet)
add_subdirectory_ifdef(CONFIG_ENTROPY_HAS_DRIVER entropy)
add_subdirectory_ifdef(CONFIG_SYS_CLOCK_EXISTS timer)
add_subdirectory_ifdef(CONFIG_NEURAL_NET_ACCEL neural_net)
add_subdirectory_ifdef(CONFIG_PTP_CLOCK ptp_clock)
add_subdirectory_ifdef(CONFIG_EDAC edac)
add_subdirectory_ifdef(CONFIG_CACHE_MANAGEMENT cache)
add_subdirectory_ifdef(CONFIG_SYSCON syscon)
add_subdirectory_ifdef(CONFIG_BBRAM bbram)
add_subdirectory_ifdef(CONFIG_FPGA fpga)
add_subdirectory_ifdef(CONFIG_PINCTRL pinctrl)
add_subdirectory_ifdef(CONFIG_MBOX mbox)
add_subdirectory_ifdef(CONFIG_BOARD_XENVM xen)
add_subdirectory_ifdef(CONFIG_MM_DRV mm)
add_subdirectory_ifdef(CONFIG_RESET reset)
add_subdirectory_ifdef(CONFIG_COREDUMP_DEVICE coredump)
add_subdirectory_ifdef(CONFIG_FUEL_GAUGE fuel_gauge)

208
drivers/Kconfig
View file

@ -5,150 +5,78 @@
menu "Device Drivers" menu "Device Drivers"
source "drivers/bluetooth/Kconfig"
source "drivers/ieee802154/Kconfig"
source "drivers/lora/Kconfig"
source "drivers/console/Kconfig"
source "drivers/debug/Kconfig"
source "drivers/ec_host_cmd_periph/Kconfig"
source "drivers/ethernet/Kconfig"
source "drivers/mdio/Kconfig"
source "drivers/net/Kconfig"
source "drivers/serial/Kconfig"
source "drivers/interrupt_controller/Kconfig"
source "drivers/timer/Kconfig"
source "drivers/entropy/Kconfig"
source "drivers/pcie/Kconfig"
source "drivers/gpio/Kconfig"
source "drivers/interrupt_controller/Kconfig.shared_irq"
source "drivers/spi/Kconfig"
source "drivers/sdhc/Kconfig"
source "drivers/i2c/Kconfig"
source "drivers/i3c/Kconfig"
source "drivers/i2s/Kconfig"
source "drivers/dai/Kconfig"
source "drivers/pwm/Kconfig"
source "drivers/pinmux/Kconfig"
source "drivers/adc/Kconfig" source "drivers/adc/Kconfig"
source "drivers/dac/Kconfig"
source "drivers/watchdog/Kconfig"
source "drivers/w1/Kconfig"
source "drivers/clock_control/Kconfig"
source "drivers/ptp_clock/Kconfig"
source "drivers/ipm/Kconfig"
source "drivers/flash/Kconfig"
source "drivers/sensor/Kconfig"
source "drivers/counter/Kconfig"
source "drivers/dma/Kconfig"
source "drivers/usb/Kconfig"
source "drivers/crypto/Kconfig"
source "drivers/display/Kconfig"
source "drivers/led_strip/Kconfig"
source "drivers/wifi/Kconfig"
source "drivers/led/Kconfig"
source "drivers/can/Kconfig"
source "drivers/modem/Kconfig"
source "drivers/audio/Kconfig" source "drivers/audio/Kconfig"
source "drivers/neural_net/Kconfig"
source "drivers/hwinfo/Kconfig"
source "drivers/espi/Kconfig"
source "drivers/ps2/Kconfig"
source "drivers/kscan/Kconfig"
source "drivers/video/Kconfig"
source "drivers/eeprom/Kconfig"
source "drivers/peci/Kconfig"
source "drivers/regulator/Kconfig"
source "drivers/memc/Kconfig"
source "drivers/virtualization/Kconfig"
source "drivers/edac/Kconfig"
source "drivers/pm_cpu_ops/Kconfig"
source "drivers/misc/Kconfig"
source "drivers/disk/Kconfig"
source "drivers/cache/Kconfig"
source "drivers/syscon/Kconfig"
source "drivers/bbram/Kconfig" source "drivers/bbram/Kconfig"
source "drivers/bluetooth/Kconfig"
source "drivers/fpga/Kconfig" source "drivers/cache/Kconfig"
source "drivers/can/Kconfig"
source "drivers/pinctrl/Kconfig" source "drivers/clock_control/Kconfig"
source "drivers/console/Kconfig"
source "drivers/mbox/Kconfig"
source "drivers/mm/Kconfig"
source "drivers/power_domain/Kconfig"
source "drivers/usb_c/Kconfig"
source "drivers/reset/Kconfig"
source "drivers/mipi_dsi/Kconfig"
source "drivers/coredump/Kconfig" source "drivers/coredump/Kconfig"
source "drivers/counter/Kconfig"
source "drivers/crypto/Kconfig"
source "drivers/dac/Kconfig"
source "drivers/dai/Kconfig"
source "drivers/debug/Kconfig"
source "drivers/disk/Kconfig"
source "drivers/display/Kconfig"
source "drivers/dma/Kconfig"
source "drivers/ec_host_cmd_periph/Kconfig"
source "drivers/edac/Kconfig"
source "drivers/eeprom/Kconfig"
source "drivers/entropy/Kconfig"
source "drivers/espi/Kconfig"
source "drivers/ethernet/Kconfig"
source "drivers/flash/Kconfig"
source "drivers/fpga/Kconfig"
source "drivers/fuel_gauge/Kconfig"
source "drivers/gpio/Kconfig"
source "drivers/hwinfo/Kconfig"
source "drivers/i2c/Kconfig"
source "drivers/i2s/Kconfig"
source "drivers/i3c/Kconfig"
source "drivers/ieee802154/Kconfig"
source "drivers/interrupt_controller/Kconfig"
source "drivers/interrupt_controller/Kconfig.shared_irq"
source "drivers/ipm/Kconfig"
source "drivers/kscan/Kconfig"
source "drivers/led/Kconfig"
source "drivers/led_strip/Kconfig"
source "drivers/lora/Kconfig"
source "drivers/mbox/Kconfig"
source "drivers/mdio/Kconfig"
source "drivers/memc/Kconfig"
source "drivers/mipi_dsi/Kconfig"
source "drivers/misc/Kconfig"
source "drivers/mm/Kconfig"
source "drivers/modem/Kconfig"
source "drivers/net/Kconfig"
source "drivers/neural_net/Kconfig"
source "drivers/pcie/Kconfig"
source "drivers/peci/Kconfig"
source "drivers/pinctrl/Kconfig"
source "drivers/pinmux/Kconfig"
source "drivers/pm_cpu_ops/Kconfig"
source "drivers/power_domain/Kconfig"
source "drivers/ps2/Kconfig"
source "drivers/ptp_clock/Kconfig"
source "drivers/pwm/Kconfig"
source "drivers/regulator/Kconfig"
source "drivers/reset/Kconfig"
source "drivers/sdhc/Kconfig"
source "drivers/sensor/Kconfig"
source "drivers/serial/Kconfig"
source "drivers/spi/Kconfig"
source "drivers/syscon/Kconfig"
source "drivers/timer/Kconfig"
source "drivers/usb/Kconfig"
source "drivers/usb_c/Kconfig"
source "drivers/video/Kconfig"
source "drivers/virtualization/Kconfig"
source "drivers/w1/Kconfig"
source "drivers/watchdog/Kconfig"
source "drivers/wifi/Kconfig"
source "drivers/xen/Kconfig" source "drivers/xen/Kconfig"
source "drivers/fuel_gauge/Kconfig"
endmenu endmenu

45
subsys/CMakeLists.txt
View file

@ -1,35 +1,36 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
add_subdirectory(canbus)
add_subdirectory(debug) add_subdirectory(debug)
add_subdirectory(logging) add_subdirectory(fb)
add_subdirectory_ifdef(CONFIG_LORAWAN lorawan)
add_subdirectory_ifdef(CONFIG_BT bluetooth)
add_subdirectory_ifdef(CONFIG_CONSOLE_SUBSYS console)
add_subdirectory_ifdef(CONFIG_SHELL shell)
add_subdirectory_ifdef(CONFIG_DISK_ACCESS disk)
add_subdirectory_ifdef(CONFIG_EMUL emul)
add_subdirectory(fs) add_subdirectory(fs)
add_subdirectory(ipc) add_subdirectory(ipc)
add_subdirectory(logging)
add_subdirectory(mgmt) add_subdirectory(mgmt)
add_subdirectory_ifdef(CONFIG_IMG_MANAGER dfu) add_subdirectory(modbus)
add_subdirectory_ifdef(CONFIG_NET_BUF net)
add_subdirectory(usb)
add_subdirectory(random)
add_subdirectory(storage)
add_subdirectory_ifdef(CONFIG_SETTINGS settings)
add_subdirectory(fb)
add_subdirectory_ifdef(CONFIG_DSP dsp)
add_subdirectory(portability)
add_subdirectory(pm) add_subdirectory(pm)
add_subdirectory(portability)
add_subdirectory(random)
add_subdirectory(rtio)
add_subdirectory(sd)
add_subdirectory(stats) add_subdirectory(stats)
add_subdirectory(storage)
add_subdirectory(task_wdt) add_subdirectory(task_wdt)
add_subdirectory(testsuite) add_subdirectory(testsuite)
add_subdirectory(tracing) add_subdirectory(tracing)
add_subdirectory_ifdef(CONFIG_JWT jwt) add_subdirectory(usb)
add_subdirectory(canbus)
add_subdirectory_ifdef(CONFIG_TIMING_FUNCTIONS timing) add_subdirectory_ifdef(CONFIG_BT bluetooth)
add_subdirectory_ifdef(CONFIG_CONSOLE_SUBSYS console)
add_subdirectory_ifdef(CONFIG_DEMAND_PAGING demand_paging) add_subdirectory_ifdef(CONFIG_DEMAND_PAGING demand_paging)
add_subdirectory(modbus) add_subdirectory_ifdef(CONFIG_DISK_ACCESS disk)
add_subdirectory(sd) add_subdirectory_ifdef(CONFIG_DSP dsp)
add_subdirectory(rtio) add_subdirectory_ifdef(CONFIG_EMUL emul)
add_subdirectory_ifdef(CONFIG_IMG_MANAGER dfu)
add_subdirectory_ifdef(CONFIG_JWT jwt)
add_subdirectory_ifdef(CONFIG_LORAWAN lorawan)
add_subdirectory_ifdef(CONFIG_NET_BUF net)
add_subdirectory_ifdef(CONFIG_SETTINGS settings)
add_subdirectory_ifdef(CONFIG_SHELL shell)
add_subdirectory_ifdef(CONFIG_TIMING_FUNCTIONS timing)
add_subdirectory_ifdef(CONFIG_ZBUS zbus) add_subdirectory_ifdef(CONFIG_ZBUS zbus)

95
subsys/Kconfig
View file

@ -4,78 +4,43 @@
# Copyright (c) 2021 Nordic Semiconductor # Copyright (c) 2021 Nordic Semiconductor
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
menu "Sub Systems and OS Services" menu "Subsystems and OS Services"
source "subsys/bluetooth/Kconfig" source "subsys/bluetooth/Kconfig"
source "subsys/canbus/Kconfig" source "subsys/canbus/Kconfig"
source "subsys/console/Kconfig" source "subsys/console/Kconfig"
source "subsys/debug/Kconfig" source "subsys/debug/Kconfig"
source "subsys/disk/Kconfig"
source "subsys/emul/Kconfig"
source "subsys/fb/Kconfig"
source "subsys/fs/Kconfig"
source "subsys/ipc/Kconfig"
source "subsys/jwt/Kconfig"
source "subsys/logging/Kconfig"
source "subsys/lorawan/Kconfig"
source "subsys/dsp/Kconfig"
source "subsys/mgmt/Kconfig"
source "subsys/modbus/Kconfig"
source "subsys/net/Kconfig"
source "subsys/portability/Kconfig"
source "subsys/pm/Kconfig"
source "subsys/shell/Kconfig"
source "subsys/stats/Kconfig"
source "subsys/usb/device/Kconfig"
source "subsys/usb/usb_c/Kconfig"
source "subsys/sd/Kconfig"
source "subsys/usb/device_next/Kconfig"
source "subsys/usb/host/Kconfig"
source "subsys/dfu/Kconfig"
source "subsys/random/Kconfig"
source "subsys/storage/Kconfig"
source "subsys/settings/Kconfig"
source "subsys/task_wdt/Kconfig"
source "subsys/testsuite/Kconfig"
source "subsys/timing/Kconfig"
source "subsys/tracing/Kconfig"
source "subsys/demand_paging/Kconfig" source "subsys/demand_paging/Kconfig"
source "subsys/dfu/Kconfig"
source "subsys/disk/Kconfig"
source "subsys/dsp/Kconfig"
source "subsys/emul/Kconfig"
source "subsys/fb/Kconfig"
source "subsys/fs/Kconfig"
source "subsys/ipc/Kconfig"
source "subsys/jwt/Kconfig"
source "subsys/logging/Kconfig"
source "subsys/lorawan/Kconfig"
source "subsys/mgmt/Kconfig"
source "subsys/modbus/Kconfig"
source "subsys/net/Kconfig"
source "subsys/pm/Kconfig"
source "subsys/portability/Kconfig"
source "subsys/random/Kconfig"
source "subsys/rtio/Kconfig" source "subsys/rtio/Kconfig"
source "subsys/sd/Kconfig"
source "subsys/settings/Kconfig"
source "subsys/shell/Kconfig"
source "subsys/stats/Kconfig"
source "subsys/storage/Kconfig"
source "subsys/task_wdt/Kconfig"
source "subsys/testsuite/Kconfig"
source "subsys/timing/Kconfig"
source "subsys/tracing/Kconfig"
source "subsys/usb/device/Kconfig"
source "subsys/usb/device_next/Kconfig"
source "subsys/usb/host/Kconfig"
source "subsys/usb/usb_c/Kconfig"
source "subsys/zbus/Kconfig" source "subsys/zbus/Kconfig"
endmenu endmenu