diff --git a/hw/usb/tinyusb/cdc_console/pkg.yml b/hw/usb/tinyusb/cdc_console/pkg.yml index c1a3374df7..13ab96facc 100755 --- a/hw/usb/tinyusb/cdc_console/pkg.yml +++ b/hw/usb/tinyusb/cdc_console/pkg.yml @@ -32,4 +32,4 @@ pkg.deps: - "@apache-mynewt-core/hw/usb/tinyusb/cdc" pkg.init: - usb_cdc_console_pkg_init: 'MYNEWT_VAL(CONSOLE_SYSINIT_STAGE)' + usb_cdc_console_pkg_init: 'MYNEWT_VAL(CONSOLE_USB_CDC_SYSINIT_STAGE)' diff --git a/hw/usb/tinyusb/cdc_console/syscfg.yml b/hw/usb/tinyusb/cdc_console/syscfg.yml index 7c64373bdc..b04d0a2ce1 100755 --- a/hw/usb/tinyusb/cdc_console/syscfg.yml +++ b/hw/usb/tinyusb/cdc_console/syscfg.yml @@ -25,5 +25,12 @@ syscfg.defs: syscfg.vals: USBD_CDC_CONSOLE: 1 +syscfg.defs: + CONSOLE_USB_CDC_SYSINIT_STAGE: + description: > + Initialize USB CDC Console at the specified sysinit level + value: 502 + syscfg.restrictions: - "USBD_CDC_CONSOLE" + - CONSOLE_USB_CDC_SYSINIT_STAGE > USBD_SYSINIT_STAGE diff --git a/hw/usb/tinyusb/syscfg.yml b/hw/usb/tinyusb/syscfg.yml index dac44d396b..b0e9d0c467 100644 --- a/hw/usb/tinyusb/syscfg.yml +++ b/hw/usb/tinyusb/syscfg.yml @@ -34,6 +34,8 @@ syscfg.defs: description: > Sysinit stage for USB device functionality. value: 500 + restrictions: + - CONSOLE_USB_CDC_SYSINIT_STAGE > USBD_SYSINIT_STAGE USBD_STD_DESCRIPTORS: description: > Include descriptor support. This allows to easily use CDC, MSC, HID device