Update NCS

Signed-off-by: Maciej Baczmanski <[email protected]>
openthread · Jul 11, 2023 · e17ae41 · e17ae41
1 parent c196ae8
commit e17ae41
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 54 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -19,7 +19,7 @@ CHANGELOG
         * ot-br-posix commitid: 790dc77
         * ot-nrf528xx commitid: 982244f
         * ot-commisioner commitid: acb3371
-
+    * Updated NCS to `4d1c577`
 * 05/26/2023
     * Updated submodules
         * openthread commitid: 6865b83d7

diff --git a/config/ncs/overlay-cli-1_1.conf b/config/ncs/overlay-cli-1_1.conf
@@ -32,15 +32,5 @@ CONFIG_SHELL_DEFAULT_TERMINAL_WIDTH=640
 # Increase stack
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2144
 
-# Enable USB transport
-CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
-CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51
-CONFIG_UART_LINE_CTRL=y
-CONFIG_SHELL_BACKEND_SERIAL_CHECK_DTR=y
-CONFIG_USB_CDC_ACM_LOG_LEVEL_OFF=y
-CONFIG_USB_DEVICE_STACK=y
-CONFIG_USB_DEVICE_REMOTE_WAKEUP=n
-CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
-CONFIG_USB_DEVICE_PRODUCT="Thread Reference Device"
-CONFIG_USB_DEVICE_VID=0x1915
+# Set USB device PID
 CONFIG_USB_DEVICE_PID=0xCAFF
diff --git a/config/ncs/overlay-cli-1_2.conf b/config/ncs/overlay-cli-1_2.conf
@@ -35,17 +35,7 @@ CONFIG_OPENTHREAD_IP6_MAX_EXT_MCAST_ADDRS=4
 # Increase stack
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2144
 
-# Enable USB transport
-CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
-CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51
-CONFIG_UART_LINE_CTRL=y
-CONFIG_SHELL_BACKEND_SERIAL_CHECK_DTR=y
-CONFIG_USB_CDC_ACM_LOG_LEVEL_OFF=y
-CONFIG_USB_DEVICE_STACK=y
-CONFIG_USB_DEVICE_REMOTE_WAKEUP=n
-CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
-CONFIG_USB_DEVICE_PRODUCT="Thread Reference Device"
-CONFIG_USB_DEVICE_VID=0x1915
+# Set USB device PID
 CONFIG_USB_DEVICE_PID=0xCAFF
 
 # Configure Thread 1.2 features

diff --git a/config/ncs/overlay-cli-1_3.conf b/config/ncs/overlay-cli-1_3.conf
@@ -35,17 +35,7 @@ CONFIG_OPENTHREAD_IP6_MAX_EXT_MCAST_ADDRS=4
 # Increase stack
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2144
 
-# Enable USB transport
-CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
-CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51
-CONFIG_UART_LINE_CTRL=y
-CONFIG_SHELL_BACKEND_SERIAL_CHECK_DTR=y
-CONFIG_USB_CDC_ACM_LOG_LEVEL_OFF=y
-CONFIG_USB_DEVICE_STACK=y
-CONFIG_USB_DEVICE_REMOTE_WAKEUP=n
-CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
-CONFIG_USB_DEVICE_PRODUCT="Thread Reference Device"
-CONFIG_USB_DEVICE_VID=0x1915
+# Set USB device PID
 CONFIG_USB_DEVICE_PID=0xCAFF
 
 # Configure Thread 1.2 features

diff --git a/config/ncs/overlay-rcp-1_2.conf b/config/ncs/overlay-rcp-1_2.conf
@@ -14,16 +14,10 @@ CONFIG_OPENTHREAD_NORDIC_LIBRARY_MASTER=y
 # Enable RCP coprocessor
 CONFIG_OPENTHREAD_COPROCESSOR_RCP=y
 
-# Use USB-CDC-ACM for Co-Processor
-CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
-CONFIG_USB_CDC_ACM=y
-CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
-CONFIG_USB_DEVICE_PRODUCT="Thread Co-Processor"
-CONFIG_USB_DEVICE_VID=0x1915
+# Set USB device PID
 CONFIG_USB_DEVICE_PID=0xCAFF
-CONFIG_UART_LINE_CTRL=y
-CONFIG_USB_DEVICE_STACK=y
-CONFIG_USB_DEVICE_REMOTE_WAKEUP=n
+
+# Configure logging
 CONFIG_LOG_BACKEND_SPINEL=y
 CONFIG_LOG=y
 

diff --git a/config/ncs/overlay-rcp-1_3.conf b/config/ncs/overlay-rcp-1_3.conf
@@ -14,16 +14,10 @@ CONFIG_OPENTHREAD_NORDIC_LIBRARY_MASTER=y
 # Enable RCP coprocessor
 CONFIG_OPENTHREAD_COPROCESSOR_RCP=y
 
-# Use USB-CDC-ACM for Co-Processor
-CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
-CONFIG_USB_CDC_ACM=y
-CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
-CONFIG_USB_DEVICE_PRODUCT="Thread Co-Processor"
-CONFIG_USB_DEVICE_VID=0x1915
+# Set USB device PID
 CONFIG_USB_DEVICE_PID=0xCAFF
-CONFIG_UART_LINE_CTRL=y
-CONFIG_USB_DEVICE_STACK=y
-CONFIG_USB_DEVICE_REMOTE_WAKEUP=n
+
+# Configure logging
 CONFIG_LOG_BACKEND_SPINEL=y
 CONFIG_LOG=y
 

diff --git a/config/ncs/sdk-nrf-commit b/config/ncs/sdk-nrf-commit
@@ -1 +1 @@
-e434ec2f11f2fed6bd24c2f0bc2c3e98486d2a90
+4d1c577ef2cadc7f9270c575ec3808cf892c9f34
diff --git a/script/make-firmware.bash b/script/make-firmware.bash
@@ -356,7 +356,7 @@ build_ncs()
 
     cd nrf
     for variant in "${variants[@]}"; do
-        west build -d "${!variant:0:1}" -b nrf52840dongle_nrf52840 -p always "${!variant:1:1}" -- -DOVERLAY_CONFIG="${!variant:2:1}" -DDTC_OVERLAY_FILE=usb.overlay
+        west build -d "${!variant:0:1}" -b nrf52840dongle_nrf52840 -p always "${!variant:1:1}" -- -DOVERLAY_CONFIG="${!variant:2:1}"
     done
 
     package_ncs "ot-cli-ftd" "1.1"