Skip to content

Commit 0ba9bf0

Browse files
pillo79pillo79
committed
variants: fix multiple USB definition issues
Always use the new 'board_cdc_acm_uart' definition for USB CDC ACM interfaces. This is the new standard for Zephyr serial-over-USB.
1 parent 5477b89 commit 0ba9bf0

File tree

32 files changed

+61749
-61937
lines changed

32 files changed

+61749
-61937
lines changed

Diff for: ‎firmwares/zephyr-arduino_giga_r1_stm32h747xx_m7.bin

4 Bytes
Binary file not shown.

Diff for: ‎firmwares/zephyr-arduino_giga_r1_stm32h747xx_m7.elf

8 Bytes
Binary file not shown.

Diff for: ‎firmwares/zephyr-arduino_giga_r1_stm32h747xx_m7.hex

+2,384-2,383
Large diffs are not rendered by default.

Diff for: ‎firmwares/zephyr-arduino_nano_33_ble_nrf52840_sense.bin

8 Bytes
Binary file not shown.

Diff for: ‎firmwares/zephyr-arduino_nano_33_ble_nrf52840_sense.elf

8 Bytes
Binary file not shown.

Diff for: ‎firmwares/zephyr-arduino_nano_33_ble_nrf52840_sense.hex

+1,615-1,615
Large diffs are not rendered by default.

Diff for: ‎firmwares/zephyr-arduino_portenta_c33_r7fa6m5bh3cfc.bin

4 Bytes
Binary file not shown.

Diff for: ‎firmwares/zephyr-arduino_portenta_c33_r7fa6m5bh3cfc.elf

8 Bytes
Binary file not shown.

Diff for: ‎firmwares/zephyr-arduino_portenta_c33_r7fa6m5bh3cfc.hex

+2,004-2,004
Large diffs are not rendered by default.

Diff for: ‎firmwares/zephyr-arduino_portenta_h7_stm32h747xx_m7.bin

-900 Bytes
Binary file not shown.

Diff for: ‎firmwares/zephyr-arduino_portenta_h7_stm32h747xx_m7.elf

-2.19 KB
Binary file not shown.

Diff for: ‎firmwares/zephyr-arduino_portenta_h7_stm32h747xx_m7.hex

+3,853-3,908
Large diffs are not rendered by default.

Diff for: ‎firmwares/zephyr-frdm_mcxn947_mcxn947_cpu0.bin

4 Bytes
Binary file not shown.

Diff for: ‎firmwares/zephyr-frdm_mcxn947_mcxn947_cpu0.elf

0 Bytes
Binary file not shown.

Diff for: ‎firmwares/zephyr-frdm_mcxn947_mcxn947_cpu0.hex

+2,022-2,022
Large diffs are not rendered by default.

Diff for: ‎firmwares/zephyr-frdm_rw612_rw612.bin

4 Bytes
Binary file not shown.

Diff for: ‎firmwares/zephyr-frdm_rw612_rw612.elf

0 Bytes
Binary file not shown.

Diff for: ‎firmwares/zephyr-frdm_rw612_rw612.hex

+49,083-49,083
Large diffs are not rendered by default.

Diff for: ‎variants/arduino_giga_r1_stm32h747xx_m7/arduino_giga_r1_stm32h747xx_m7.overlay

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
&zephyr_udc0 {
2-
cdc_acm_uart0: cdc_acm_uart0 {
2+
board_cdc_acm_uart: board_cdc_acm_uart {
33
compatible = "zephyr,cdc-acm-uart";
4-
status = "okay";
4+
status = "okay";
55
};
66
};
77

@@ -322,7 +322,7 @@
322322
/{
323323
chosen {
324324
zephyr,camera = &dcmi;
325-
/* zephyr,console = &cdc_acm_uart0; */
325+
/* zephyr,console = &board_cdc_acm_uart; */
326326
};
327327

328328
/* used to overcome problems with _C analog pins */
@@ -491,8 +491,8 @@
491491
<&gpioa 4 0>,
492492
<&gpioa 5 0>;
493493

494-
serials = <&cdc_acm_uart0>, <&usart1>, <&usart2>, <&uart4>, <&usart6>;
495-
cdc-acm = <&cdc_acm_uart0>;
494+
serials = <&board_cdc_acm_uart>, <&usart1>, <&usart2>, <&uart4>, <&usart6>;
495+
cdc-acm = <&board_cdc_acm_uart>;
496496
i2cs = <&i2c2>, <&i2c4>, <&i2c1>;
497497
spis = <&spi1>, <&spi5>;
498498
pwms = <&pwm1 3 PWM_HZ(12000000) PWM_POLARITY_NORMAL>,

Diff for: ‎variants/arduino_giga_r1_stm32h747xx_m7/llext-edk/include/zephyr/include/generated/zephyr/devicetree_generated.h

+123-123
Large diffs are not rendered by default.

Diff for: ‎variants/arduino_nano_33_ble_nrf52840_sense/arduino_nano_33_ble_nrf52840_sense.overlay

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
&zephyr_udc0 {
2-
cdc_acm_uart0: cdc_acm_uart0 {
2+
board_cdc_acm_uart: board_cdc_acm_uart {
33
compatible = "zephyr,cdc-acm-uart";
4-
status = "okay";
4+
status = "okay";
55
};
66
};
77

@@ -118,8 +118,8 @@
118118
<&adc 4>,
119119
<&adc 1>;
120120

121-
serials = <&cdc_acm_uart0>, <&uart0>;
122-
cdc-acm = <&cdc_acm_uart0>;
121+
serials = <&board_cdc_acm_uart>, <&uart0>;
122+
cdc-acm = <&board_cdc_acm_uart>;
123123
i2cs = <&arduino_nano_i2c>, <&i2c1>;
124124
};
125125
};

Diff for: ‎variants/arduino_nano_33_ble_nrf52840_sense/llext-edk/include/zephyr/include/generated/zephyr/devicetree_generated.h

+117-117
Large diffs are not rendered by default.

Diff for: ‎variants/arduino_portenta_c33_r7fa6m5bh3cfc/arduino_portenta_c33_r7fa6m5bh3cfc.overlay

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
&zephyr_udc0 {
2-
cdc_acm_uart0: cdc_acm_uart0 {
2+
board_cdc_acm_uart: board_cdc_acm_uart {
33
compatible = "zephyr,cdc-acm-uart";
4-
status = "okay";
4+
status = "okay";
55
};
66
};
77

@@ -72,8 +72,8 @@
7272

7373
pwm-pin-gpios = <&ioport6 0 0>;
7474

75-
serials = <&cdc_acm_uart0>, <&uart9>;
76-
cdc-acm = <&cdc_acm_uart0>;
75+
serials = <&board_cdc_acm_uart>, <&uart9>;
76+
cdc-acm = <&board_cdc_acm_uart>;
7777
i2cs = <&iic1>;
7878
spis = <&spi1>;
7979
pwms = <&pwm6 1 PWM_HZ(25000000) PWM_POLARITY_NORMAL>;

Diff for: ‎variants/arduino_portenta_c33_r7fa6m5bh3cfc/llext-edk/include/zephyr/include/generated/zephyr/devicetree_generated.h

+117-117
Large diffs are not rendered by default.

Diff for: ‎variants/arduino_portenta_h7_stm32h747xx_m7/arduino_portenta_h7_stm32h747xx_m7.overlay

+4-11
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
&zephyr_udc0 {
2-
cdc_acm_uart0: cdc_acm_uart0 {
3-
compatible = "zephyr,cdc-acm-uart";
4-
status = "okay";
5-
};
1+
&board_cdc_acm_uart {
2+
status = "okay";
63
};
74

85
&usart1 {
@@ -17,10 +14,6 @@
1714
status = "okay";
1815
};
1916

20-
&cdc_acm_uart0 {
21-
status = "okay";
22-
};
23-
2417
&i2c4 {
2518
status = "okay";
2619
};
@@ -87,8 +80,8 @@
8780
<&gpiok 6 GPIO_ACTIVE_LOW>,
8881
<&gpiok 7 GPIO_ACTIVE_LOW>;
8982

90-
serials = <&cdc_acm_uart0>,<&usart6>, <&usart1>, <&uart4>;
91-
cdc-acm = <&cdc_acm_uart0>;
83+
serials = <&board_cdc_acm_uart>,<&usart6>, <&usart1>, <&uart4>;
84+
cdc-acm = <&board_cdc_acm_uart>;
9285
i2cs = <&i2c4>;
9386
};
9487
};

Diff for: ‎variants/arduino_portenta_h7_stm32h747xx_m7/llext-edk/include/zephyr/include/generated/zephyr/devicetree_generated.h

+129-255
Large diffs are not rendered by default.

Diff for: ‎variants/arduino_portenta_h7_stm32h747xx_m7/provides.ld

+39-40
Original file line numberDiff line numberDiff line change
@@ -2288,46 +2288,45 @@ PROVIDE(mbedtls_rsa_private = 0x0805f5e9);
22882288
PROVIDE(__aeabi_ul2f = 0x08040f6d);
22892289
PROVIDE(net_udp_finalize = 0x08054a6d);
22902290
PROVIDE(HAL_QSPI_IRQHandler = 0x0805ba55);
2291-
PROVIDE(kheap_llext_heap = 0x24030e00);
2291+
PROVIDE(kheap_llext_heap = 0x24030b00);
22922292
PROVIDE(kheap_llext_heap_size = 0x20000);
2293-
PROVIDE(kheap__system_heap = 0x24051120);
2293+
PROVIDE(kheap__system_heap = 0x24050e20);
22942294
PROVIDE(kheap__system_heap_size = 32768);
2295-
PROVIDE(__device_dts_ord_8 = 0x000000000807989c);
2296-
PROVIDE(__device_dts_ord_41 = 0x00000000080798c0);
2297-
PROVIDE(__device_dts_ord_107 = 0x00000000080798e4);
2298-
PROVIDE(__device_dts_ord_53 = 0x0000000008079908);
2299-
PROVIDE(__device_dts_ord_12 = 0x000000000807992c);
2300-
PROVIDE(__device_dts_ord_52 = 0x0000000008079950);
2301-
PROVIDE(__device_dts_ord_20 = 0x0000000008079974);
2302-
PROVIDE(__device_dts_ord_51 = 0x0000000008079998);
2303-
PROVIDE(__device_dts_ord_210 = 0x00000000080799bc);
2304-
PROVIDE(__device_dts_ord_209 = 0x00000000080799e0);
2305-
PROVIDE(__device_dts_ord_208 = 0x0000000008079a04);
2306-
PROVIDE(__device_dts_ord_50 = 0x0000000008079a28);
2307-
PROVIDE(__device_dts_ord_207 = 0x0000000008079a4c);
2308-
PROVIDE(__device_dts_ord_49 = 0x0000000008079a70);
2309-
PROVIDE(__device_dts_ord_68 = 0x0000000008079a94);
2310-
PROVIDE(__device_dts_ord_269 = 0x0000000008079ab8);
2311-
PROVIDE(__device_dts_ord_110 = 0x0000000008079adc);
2312-
PROVIDE(__device_dts_ord_217 = 0x0000000008079b00);
2313-
PROVIDE(__device_dts_ord_48 = 0x0000000008079b24);
2314-
PROVIDE(__device_dts_ord_42 = 0x0000000008079b48);
2315-
PROVIDE(__device_dts_ord_45 = 0x0000000008079b6c);
2316-
PROVIDE(__device_dts_ord_227 = 0x0000000008079b90);
2317-
PROVIDE(__device_dts_ord_148 = 0x0000000008079bb4);
2318-
PROVIDE(__device_dts_ord_35 = 0x0000000008079bd8);
2319-
PROVIDE(__device_dts_ord_25 = 0x0000000008079bfc);
2320-
PROVIDE(__device_dts_ord_13 = 0x0000000008079c20);
2321-
PROVIDE(__device_dts_ord_21 = 0x0000000008079c44);
2322-
PROVIDE(__device_dts_ord_143 = 0x0000000008079c68);
2323-
PROVIDE(__device_dts_ord_146 = 0x0000000008079c8c);
2324-
PROVIDE(__device_dts_ord_156 = 0x0000000008079cb0);
2325-
PROVIDE(__device_dts_ord_164 = 0x0000000008079cd4);
2326-
PROVIDE(__device_dts_ord_163 = 0x0000000008079cf8);
2327-
PROVIDE(__device_dts_ord_162 = 0x0000000008079d1c);
2328-
PROVIDE(__device_dts_ord_161 = 0x0000000008079d40);
2329-
PROVIDE(__device_dts_ord_160 = 0x0000000008079d64);
2330-
PROVIDE(__device_dts_ord_159 = 0x0000000008079d88);
2331-
PROVIDE(__device_dts_ord_158 = 0x0000000008079dac);
2332-
PROVIDE(__device_dts_ord_147 = 0x0000000008079dd0);
2295+
PROVIDE(__device_dts_ord_8 = 0x0000000008079894);
2296+
PROVIDE(__device_dts_ord_41 = 0x00000000080798b8);
2297+
PROVIDE(__device_dts_ord_107 = 0x00000000080798dc);
2298+
PROVIDE(__device_dts_ord_53 = 0x0000000008079900);
2299+
PROVIDE(__device_dts_ord_12 = 0x0000000008079924);
2300+
PROVIDE(__device_dts_ord_52 = 0x0000000008079948);
2301+
PROVIDE(__device_dts_ord_20 = 0x000000000807996c);
2302+
PROVIDE(__device_dts_ord_51 = 0x0000000008079990);
2303+
PROVIDE(__device_dts_ord_210 = 0x00000000080799b4);
2304+
PROVIDE(__device_dts_ord_209 = 0x00000000080799d8);
2305+
PROVIDE(__device_dts_ord_208 = 0x00000000080799fc);
2306+
PROVIDE(__device_dts_ord_50 = 0x0000000008079a20);
2307+
PROVIDE(__device_dts_ord_207 = 0x0000000008079a44);
2308+
PROVIDE(__device_dts_ord_49 = 0x0000000008079a68);
2309+
PROVIDE(__device_dts_ord_68 = 0x0000000008079a8c);
2310+
PROVIDE(__device_dts_ord_110 = 0x0000000008079ab0);
2311+
PROVIDE(__device_dts_ord_217 = 0x0000000008079ad4);
2312+
PROVIDE(__device_dts_ord_48 = 0x0000000008079af8);
2313+
PROVIDE(__device_dts_ord_42 = 0x0000000008079b1c);
2314+
PROVIDE(__device_dts_ord_45 = 0x0000000008079b40);
2315+
PROVIDE(__device_dts_ord_227 = 0x0000000008079b64);
2316+
PROVIDE(__device_dts_ord_148 = 0x0000000008079b88);
2317+
PROVIDE(__device_dts_ord_35 = 0x0000000008079bac);
2318+
PROVIDE(__device_dts_ord_25 = 0x0000000008079bd0);
2319+
PROVIDE(__device_dts_ord_13 = 0x0000000008079bf4);
2320+
PROVIDE(__device_dts_ord_21 = 0x0000000008079c18);
2321+
PROVIDE(__device_dts_ord_143 = 0x0000000008079c3c);
2322+
PROVIDE(__device_dts_ord_146 = 0x0000000008079c60);
2323+
PROVIDE(__device_dts_ord_156 = 0x0000000008079c84);
2324+
PROVIDE(__device_dts_ord_164 = 0x0000000008079ca8);
2325+
PROVIDE(__device_dts_ord_163 = 0x0000000008079ccc);
2326+
PROVIDE(__device_dts_ord_162 = 0x0000000008079cf0);
2327+
PROVIDE(__device_dts_ord_161 = 0x0000000008079d14);
2328+
PROVIDE(__device_dts_ord_160 = 0x0000000008079d38);
2329+
PROVIDE(__device_dts_ord_159 = 0x0000000008079d5c);
2330+
PROVIDE(__device_dts_ord_158 = 0x0000000008079d80);
2331+
PROVIDE(__device_dts_ord_147 = 0x0000000008079da4);
23332332
PROVIDE(_sketch_start = 0xe0000 );

Diff for: ‎variants/frdm_mcxn947_mcxn947_cpu0/frdm_mcxn947_mcxn947_cpu0.overlay

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
&zephyr_udc0 {
22
status = "okay";
3-
cdc_acm_uart0: cdc_acm_uart0 {
3+
board_cdc_acm_uart: board_cdc_acm_uart {
44
compatible = "zephyr,cdc-acm-uart";
55
status = "okay";
66
};
@@ -22,9 +22,9 @@
2222
zephyr,user {
2323
digital-pin-gpios = <&gpio0 10 GPIO_ACTIVE_LOW>, <&gpio0 27 GPIO_ACTIVE_LOW>, <&gpio1 2 GPIO_ACTIVE_LOW>;
2424
builtin-led-gpios = <&gpio0 10 GPIO_ACTIVE_LOW>, <&gpio0 27 GPIO_ACTIVE_LOW>, <&gpio1 2 GPIO_ACTIVE_LOW>;
25-
serials = <&cdc_acm_uart0>, <&flexcomm4_lpuart4>;
26-
cdc-acm = <&cdc_acm_uart0>;
25+
serials = <&board_cdc_acm_uart>, <&flexcomm4_lpuart4>;
26+
cdc-acm = <&board_cdc_acm_uart>;
2727
i2cs = <&flexcomm2_lpi2c2>;
2828
spis = <&flexcomm1_lpspi1>;
2929
};
30-
};
30+
};

0 commit comments

Comments
 (0)