Skip to content

app: move common configuration to Kconfig file #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
henrikbrixandersen merged 3 commits into from
Dec 30, 2025
Merged

app: move common configuration to Kconfig file #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
818af76
app: do not enable USB composite device option
henrikbrixandersen Dec 30, 2025
2cdfc51
tests: usb: gs_usb: host: do not enable USB composite device option
henrikbrixandersen Dec 30, 2025
6a2703a
app: move common configuration to Kconfig file
henrikbrixandersen Dec 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions app/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ module = CANNECTIVITY
module-str = CANnectivity
source "subsys/logging/Kconfig.template.log_config"

configdefault CAN_FD_MODE
default y

config CANNECTIVITY_BOOT_BANNER
bool "CANnectivity boot banner"
default y if BOOT_BANNER
Expand Down Expand Up @@ -87,6 +90,12 @@ configdefault USB_MAX_POWER
configdefault USB_DEVICE_GS_USB_MAX_CHANNELS
default CANNECTIVITY_MAX_CHANNELS

configdefault USB_DEVICE_BOS
default y

configdefault USB_DEVICE_INITIALIZE_AT_BOOT
default n

endif # USB_DEVICE_STACK

if USB_DEVICE_STACK_NEXT
Expand Down
9 changes: 2 additions & 7 deletions app/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
# This is using the deprecated USB device stack
CONFIG_DEPRECATION_TEST=y
CONFIG_USB_DEVICE_STACK=y

# Logging configuration
CONFIG_LOG=y
CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y
CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y
CONFIG_USB_DEVICE_GS_USB_LOG_LEVEL_DBG=y
CONFIG_CANNECTIVITY_LOG_LEVEL_DBG=y

CONFIG_USB_DEVICE_STACK=y
CONFIG_USB_DEVICE_BOS=y
CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n

CONFIG_CAN=y
CONFIG_CAN_FD_MODE=y
9 changes: 1 addition & 8 deletions app/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# This is using the deprecated USB device stack
CONFIG_DEPRECATION_TEST=y
CONFIG_USB_DEVICE_STACK=y

# Hardened configuration
CONFIG_BOOT_BANNER=n
Expand All @@ -10,11 +11,3 @@ CONFIG_OVERRIDE_FRAME_POINTER_DEFAULT=y

# Arm-specific hardened configuration
CONFIG_FAULT_DUMP=0

CONFIG_USB_DEVICE_STACK=y
CONFIG_USB_COMPOSITE_DEVICE=y
CONFIG_USB_DEVICE_BOS=y
CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n

CONFIG_CAN=y
CONFIG_CAN_FD_MODE=y
8 changes: 3 additions & 5 deletions app/prj_usbd_next.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# This is using the experimental USB device_next stack class
CONFIG_WARN_EXPERIMENTAL=y
CONFIG_USB_DEVICE_STACK_NEXT=y

# Logging configuration
CONFIG_LOG=y
CONFIG_UDC_DRIVER_LOG_LEVEL_WRN=y
CONFIG_USBD_LOG_LEVEL_WRN=y
CONFIG_USBD_GS_USB_LOG_LEVEL_DBG=y
CONFIG_CANNECTIVITY_LOG_LEVEL_DBG=y

CONFIG_USB_DEVICE_STACK_NEXT=y

CONFIG_CAN=y
CONFIG_CAN_FD_MODE=y
11 changes: 4 additions & 7 deletions app/prj_usbd_next_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# This is using the experimental USB device_next stack class
CONFIG_WARN_EXPERIMENTAL=y
CONFIG_USB_DEVICE_STACK_NEXT=y

# Hardened configuration
CONFIG_BOOT_BANNER=n
CONFIG_BUILD_OUTPUT_STRIPPED=y
Expand All @@ -7,10 +11,3 @@ CONFIG_OVERRIDE_FRAME_POINTER_DEFAULT=y

# Arm-specific hardened configuration
CONFIG_FAULT_DUMP=0

CONFIG_WARN_EXPERIMENTAL=y

CONFIG_USB_DEVICE_STACK_NEXT=y

CONFIG_CAN=y
CONFIG_CAN_FD_MODE=y
1 change: 0 additions & 1 deletion tests/subsys/usb/gs_usb/host/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ CONFIG_SHELL=y
CONFIG_USB_DEVICE_STACK=y
CONFIG_USB_DEVICE_BOS=y
CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
CONFIG_USB_COMPOSITE_DEVICE=y

CONFIG_CAN=y
CONFIG_CAN_FD_MODE=y
Expand Down