Fix build

Author: tannewt

ports/zephyr-cp/boards/adafruit_feather_nrf52840_uf2.conf

@@ -6,4 +6,3 @@ CONFIG_BT_OBSERVER=y
 CONFIG_BT_EXT_ADV=y
 
 CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n
-CONFIG_BOARD_REQUIRES_SERIAL_BACKEND_CDC_ACM=n

ports/zephyr-cp/boards/frdm_rw612.conf

@@ -2,7 +2,6 @@ CONFIG_NETWORKING=y
 CONFIG_NET_IPV4=y
 CONFIG_NET_DHCPV4=y
 CONFIG_NET_SOCKETS=y
-CONFIG_NET_SOCKETS_POSIX_NAMES=y
 
 CONFIG_WIFI=y
 CONFIG_NET_L2_WIFI_MGMT=y
@@ -17,9 +16,9 @@ CONFIG_MBEDTLS=y
 CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y
 CONFIG_MBEDTLS_RSA_C=y
 CONFIG_MBEDTLS_PKCS1_V15=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_RSA_ENABLED=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED=y
 CONFIG_MBEDTLS_ENTROPY_C=y
-CONFIG_MBEDTLS_CTR_DRBG_ENABLED=y
+CONFIG_MBEDTLS_CTR_DRBG_C=y
 CONFIG_MBEDTLS_SHA1=y
 CONFIG_MBEDTLS_USE_PSA_CRYPTO=n
 

ports/zephyr-cp/boards/frdm_rw612.overlay

@@ -1,6 +1,6 @@
 &w25q512jvfiq {
     partitions {
-        /delete-node/ storage_partition;
+        /delete-node/ partition@620000;
         circuitpy_partition: partition@620000 {
             label = "circuitpy";
             reg = <0x00620000 (DT_SIZE_M(58) - DT_SIZE_K(128))>;

ports/zephyr-cp/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay

@@ -1,10 +1,10 @@
 &is25wp128 {
-    partitions{
-        /delete-node/ storage_partition;
-        circuitpy_partition: partition@E20000 {
-			label = "circuitpy";
-			reg = <0x00E20000 (DT_SIZE_M(2) - DT_SIZE_K(128))>;
-		};
+    partitions {
+        /delete-node/ partition@e20000;
+        circuitpy_partition: partition@e20000 {
+            label = "circuitpy";
+            reg = <0x00e20000 (DT_SIZE_M(2) - DT_SIZE_K(128))>;
+        };
     };
 };
 

ports/zephyr-cp/boards/stm32wba65i_dk1.overlay

@@ -47,15 +47,13 @@
 };
 
 zephyr_udc0: &usbotg_hs {
-	clocks = <&rcc STM32_CLOCK(AHB2, 14)>,
-		 <&rcc STM32_SRC_HSE OTGHS_SEL(0)>;
-	pinctrl-0 = <&usb_otg_hs_dm_pd7 &usb_otg_hs_dp_pd6>;
-	pinctrl-names = "default";
 	status = "okay";
 };
 
 &otghs_phy {
 	/* OTG HS clock source is 32 MHz HSE */
+	clocks = <&rcc STM32_CLOCK(AHB2, 15)>,
+		 <&rcc STM32_SRC_HSE OTGHS_SEL(0)>;
 	clock-reference = "SYSCFG_OTG_HS_PHY_CLK_32MHz";
 	status = "okay";
 };

ports/zephyr-cp/cptools/zephyr2cp.py

@@ -96,6 +96,19 @@
         "D12",
         "D13",
     ],
+    "nordic,expansion-board-header": [
+        "P1_04",
+        "P1_05",
+        "P1_06",
+        "P1_07",
+        "P1_08",
+        "P1_09",
+        "P1_10",
+        "P1_11",
+        "P1_12",
+        "P1_13",
+        "P1_14",
+    ],
     "arducam,dvp-20pin-connector": [
         "SCL",
         "SDA",
@@ -544,16 +557,26 @@ def zephyr_dts_to_cp_board(board_id, portdir, builddir, zephyrbuilddir):  # noqa
             all_ioports.append(node.labels[0])
             if status == "okay":
                 ioports[node.labels[0]] = set(range(0, ngpios))
-        if gpio_map and compatible[0] != "gpio-nexus":
-            i = 0
-            for offset, t, label in gpio_map._markers:
-                if not label:
-                    continue
-                num = int.from_bytes(gpio_map.value[offset + 4 : offset + 8], "big")
-                if (label, num) not in board_names:
-                    board_names[(label, num)] = []
-                board_names[(label, num)].append(CONNECTORS[compatible[0]][i])
-                i += 1
+        if gpio_map and compatible and compatible[0] != "gpio-nexus":
+            connector_pins = CONNECTORS.get(compatible[0], None)
+            if connector_pins is None:
+                logger.warning(f"Unsupported connector mapping compatible: {compatible[0]}")
+            else:
+                i = 0
+                for offset, t, label in gpio_map._markers:
+                    if not label:
+                        continue
+                    if i >= len(connector_pins):
+                        logger.warning(
+                            f"Connector mapping for {compatible[0]} has more pins than names; "
+                            f"stopping at {len(connector_pins)}"
+                        )
+                        break
+                    num = int.from_bytes(gpio_map.value[offset + 4 : offset + 8], "big")
+                    if (label, num) not in board_names:
+                        board_names[(label, num)] = []
+                    board_names[(label, num)].append(connector_pins[i])
+                    i += 1
         if "gpio-leds" in compatible:
             for led in node.nodes:
                 led = node.nodes[led]

ports/zephyr-cp/socs/stm32h7b3xx.conf

@@ -1,4 +1 @@
-CONFIG_USE_STM32_LL_USB=y
-CONFIG_USE_STM32_HAL_PCD=y
-
 CONFIG_MEMC=y

ports/zephyr-cp/socs/stm32u575xx.conf

@@ -1,2 +0,0 @@
-CONFIG_USE_STM32_LL_USB=y
-CONFIG_USE_STM32_HAL_PCD=y