Skip to content

Commit 59f1eff

Browse files
committed
giga: update branch to support display shield
1 parent e0eb2aa commit 59f1eff

File tree

5 files changed

+16
-5
lines changed

5 files changed

+16
-5
lines changed

extra/build.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ set -e
66

77
board=$1
88
variant=$2
9+
shield=$3
910

1011
if [[ $# -eq 0 ]]; then
1112
board=arduino_giga_r1//m7
@@ -14,7 +15,13 @@ fi
1415

1516
source venv/bin/activate
1617

17-
(west build loader -b $board -p && west build -t llext-edk)
18+
if [ -n "$shield" ]; then
19+
shield_arg="--shield $shield"
20+
else
21+
shield_arg=""
22+
fi
23+
24+
(west build loader -b $board -p $shield_arg && west build -t llext-edk)
1825
(tar xfp build/zephyr/llext-edk.tar.xz --directory variants/$variant/)
1926

2027
(cp build/zephyr/zephyr.elf firmwares/zephyr-$variant.elf)

extra/build_all.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
./extra/build.sh arduino_giga_r1//m7 arduino_giga_r1_m7
5+
./extra/build.sh arduino_giga_r1//m7 arduino_giga_r1_m7 giga_display_shield
66
./extra/build.sh arduino_nano_33_ble//sense arduino_nano_33_ble_sense
77
./extra/build.sh arduino_portenta_h7//m7 arduino_portenta_h7
88
./extra/build.sh ek_ra8d1 ek_ra8d1

loader/boards/arduino_giga_r1_m7.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,6 @@ CONFIG_VIDEO_BUFFER_POOL_ALIGN=32
3939
CONFIG_VIDEO_BUFFER_USE_SHARED_MULTI_HEAP=y
4040
CONFIG_VIDEO_BUFFER_SMH_ATTRIBUTE=2
4141
CONFIG_VIDEO_GC2145=y
42+
43+
CONFIG_DISPLAY=y
44+
CONFIG_INPUT=y

loader/boards/arduino_giga_r1_m7.overlay

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194
&adc1_inp0_pa0_c
195195
&adc1_inp1_pa1_c>;
196196
pinctrl-names = "default";
197-
st,adc-clock-source = <SYNC>;
197+
st,adc-clock-source = "SYNC";
198198
st,adc-prescaler = <4>;
199199
status = "okay";
200200

@@ -292,7 +292,7 @@
292292
pinctrl-0 = <&adc3_inp0_pc2_c
293293
&adc3_inp1_pc3_c>;
294294
pinctrl-names = "default";
295-
st,adc-clock-source = <SYNC>;
295+
st,adc-clock-source = "SYNC";
296296
st,adc-prescaler = <4>;
297297
status = "okay";
298298

west.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ manifest:
1717
projects:
1818
- name: zephyr
1919
remote: arduino
20-
revision: arduino_core_merge_4.0.99
20+
revision: giga_display_shield
2121
import:
2222
name-allowlist:
2323
- cmsis
@@ -42,6 +42,7 @@ manifest:
4242
- segger
4343
- thrift
4444
- mcuboot
45+
- lvgl
4546
- name: ArduinoCore-API
4647
path: modules/lib/ArduinoCore-API
4748
revision: master

0 commit comments

Comments
 (0)