Skip to content

Commit 5a4a6fb

Browse files
committed
zephyr: update to zephyr-arduino-20250520
- add missing cmsis_6 submodule - fix DCMI overlays - fix merged shield name
1 parent b933577 commit 5a4a6fb

File tree

5 files changed

+18
-21
lines changed

5 files changed

+18
-21
lines changed

boards.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ giga.menu.debug.false.postbuild_debug=
1313
giga.menu.debug.true.postbuild_debug=-debug
1414

1515
giga.build.zephyr_target=arduino_giga_r1//m7
16-
giga.build.zephyr_args=--shield giga_display_shield
16+
giga.build.zephyr_args=--shield arduino_giga_display_shield
1717
giga.build.variant=arduino_giga_r1_stm32h747xx_m7
1818
giga.build.mcu=cortex-m7
1919
giga.build.fpu=-mfpu=fpv5-d16

loader/llext_exports.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ FORCE_EXPORT_SYM(net_mgmt_NET_REQUEST_WIFI_AP_ENABLE);
112112

113113
#if defined(CONFIG_BT)
114114
FORCE_EXPORT_SYM(bt_enable_raw);
115-
FORCE_EXPORT_SYM(bt_hci_raw_set_mode);
116115
FORCE_EXPORT_SYM(bt_send);
117116
FORCE_EXPORT_SYM(bt_buf_get_tx);
118117
FORCE_EXPORT_SYM(net_buf_simple_pull);

variants/arduino_giga_r1_stm32h747xx_m7/arduino_giga_r1_stm32h747xx_m7.overlay

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -148,24 +148,22 @@
148148

149149
&dcmi {
150150
status = "okay";
151-
sensor = <&gc2145>;
152151
/* ext-sdram = <&sdram1>; */
153152
pinctrl-0 = <&dcmi_hsync_ph8 &dcmi_pixclk_pa6 &dcmi_vsync_pi5
154153
&dcmi_d0_ph9 &dcmi_d1_ph10 &dcmi_d2_ph11 &dcmi_d3_pg11
155154
&dcmi_d4_ph14 &dcmi_d5_pi4 &dcmi_d6_pi6 &dcmi_d7_pi7>;
156155
pinctrl-names = "default";
157-
bus-width = <8>;
158-
hsync-active = <0>;
159-
vsync-active = <0>;
160-
pixelclk-active = <0>;
161-
capture-rate = <1>;
162156
dmas = <&dma1 0 75 (STM32_DMA_PERIPH_TO_MEMORY | STM32_DMA_PERIPH_NO_INC |
163157
STM32_DMA_MEM_INC | STM32_DMA_PERIPH_32BITS | STM32_DMA_MEM_32BITS |
164158
STM32_DMA_PRIORITY_HIGH) STM32_DMA_FIFO_1_4>;
165159

166160
port {
167161
dcmi_ep_in: endpoint {
168-
remote-endpoint = <&gc2145_ep_out>;
162+
remote-endpoint-label = "gc2145_ep_out";
163+
bus-width = <8>;
164+
hsync-active = <0>;
165+
vsync-active = <0>;
166+
pclk-sample = <0>;
169167
};
170168
};
171169
};

variants/arduino_portenta_h7_stm32h747xx_m7/arduino_portenta_h7_stm32h747xx_m7.overlay

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
port {
2929
gc2145_ep_out: endpoint {
30-
remote-endpoint = <&dcmi_ep_in>;
30+
remote-endpoint-label = "dcmi_ep_in";
3131
};
3232
};
3333
};
@@ -41,7 +41,7 @@
4141

4242
port {
4343
ov7670_ep_out: endpoint {
44-
remote-endpoint = <&dcmi_ep_in>;
44+
remote-endpoint-label = "dcmi_ep_in";
4545
};
4646
};
4747
};
@@ -132,26 +132,23 @@
132132

133133
&dcmi {
134134
status = "okay";
135-
sensor = <&gc2145>;
136-
/* sensor = <&ov7670>; */
137135
/* ext-sdram = <&sdram1>; */
138136
pinctrl-0 = <&dcmi_hsync_pa4 &dcmi_pixclk_pa6 &dcmi_vsync_pi5
139137
&dcmi_d0_ph9 &dcmi_d1_ph10 &dcmi_d2_ph11 &dcmi_d3_ph12
140138
&dcmi_d4_ph14 &dcmi_d5_pi4 &dcmi_d6_pi6 &dcmi_d7_pi7>;
141139
pinctrl-names = "default";
142-
bus-width = <8>;
143-
hsync-active = <0>;
144-
vsync-active = <0>;
145-
pixelclk-active = <0>;
146-
capture-rate = <1>;
147140
dmas = <&dma1 0 75 (STM32_DMA_PERIPH_TO_MEMORY | STM32_DMA_PERIPH_NO_INC |
148141
STM32_DMA_MEM_INC | STM32_DMA_PERIPH_32BITS | STM32_DMA_MEM_32BITS |
149142
STM32_DMA_PRIORITY_HIGH) STM32_DMA_FIFO_FULL>; //FULL for 7670, default FIFO_1_4
150143

151144
port {
152145
dcmi_ep_in: endpoint {
153-
remote-endpoint = <&gc2145_ep_out>;
154-
//remote-endpoint = <&ov7670_ep_out>;
146+
remote-endpoint-label = "gc2145_ep_out";
147+
// remote-endpoint-label = "ov7670_ep_out";
148+
bus-width = <8>;
149+
hsync-active = <0>;
150+
vsync-active = <0>;
151+
pclk-sample = <0>;
155152
};
156153
};
157154
};

west.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,17 @@ manifest:
1515
url-base: https://github.com/arduino
1616
- name: facchinm
1717
url-base: https://github.com/facchinm
18+
- name: pillo79
19+
url-base: https://github.com/pillo79
1820

1921
projects:
2022
- name: zephyr
2123
remote: arduino
22-
revision: arduino_core_merge_post_4.1
24+
revision: zephyr-arduino-20250520
2325
import:
2426
name-allowlist:
2527
- cmsis
28+
- cmsis_6
2629
- hal_nordic
2730
- hal_ti
2831
- hal_ambiq

0 commit comments

Comments
 (0)