Skip to content

Commit e53b9e3

Browse files
pennampennam
authored
Merge pull request #27 from arduino/giga_release
Giga release
2 parents b8c2642 + bfcabfe commit e53b9e3

File tree

7 files changed

+314
-2
lines changed

7 files changed

+314
-2
lines changed

‎app/board.h

+66
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,72 @@
273273
#define BOARD_USB_OTG_HS_DIR_PULL (GPIO_NOPULL)
274274
#define BOARD_USB_OTG_HS_DIR_ALTERNATE (GPIO_AF10_OTG2_HS)
275275
#define BOARD_USB_OTG_HS_DIR_GPIO (GPIOC)
276+
277+
#elif defined TARGET_GIGA
278+
#define BOARD_GREEN_LED PJ_13
279+
#define BOARD_RED_LED PI_12
280+
#define BOARD_BLUE_LED PE_3
281+
282+
#define BOARD_LED_OFF 1
283+
284+
#define BOARD_USBD_VID 0x2341
285+
#define BOARD_USBD_PID 0x0366
286+
287+
#define BOARD_USBD_STRING "Giga"
288+
289+
#define BOARD_QSPI_SO0 PD_11
290+
#define BOARD_QSPI_SO1 PD_12
291+
#define BOARD_QSPI_SO2 PE_2
292+
#define BOARD_QSPI_SO3 PF_6
293+
#define BOARD_QSPI_SCK PF_10
294+
#define BOARD_QSPI_CS PG_6
295+
296+
#define BOARD_USB_OTG_FS_DM_DP_PIN (GPIO_PIN_11 | GPIO_PIN_12)
297+
#define BOARD_USB_OTG_FS_DM_DP_MODE (GPIO_MODE_AF_PP)
298+
#define BOARD_USB_OTG_FS_DM_DP_PULL (GPIO_NOPULL)
299+
#define BOARD_USB_OTG_FS_DM_DP_SPEED (GPIO_SPEED_FREQ_VERY_HIGH)
300+
#define BOARD_USB_OTG_FS_DM_DP_ALTERNATE (GPIO_AF10_OTG1_FS)
301+
#define BOARD_USB_OTG_FS_DM_DP_GPIO (GPIOA)
302+
303+
#define BOARD_USB_OTG_HS_CLK_PIN (GPIO_PIN_5)
304+
#define BOARD_USB_OTG_HS_CLK_MODE (GPIO_MODE_AF_PP)
305+
#define BOARD_USB_OTG_HS_CLK_PULL (GPIO_NOPULL)
306+
#define BOARD_USB_OTG_HS_CLK_SPEED (GPIO_SPEED_FREQ_VERY_HIGH)
307+
#define BOARD_USB_OTG_HS_CLK_ALTERNATE (GPIO_AF10_OTG2_HS)
308+
#define BOARD_USB_OTG_HS_CLK_GPIO (GPIOA)
309+
310+
#define BOARD_USB_OTG_HS_D0_PIN (GPIO_PIN_3)
311+
#define BOARD_USB_OTG_HS_D0_MODE (GPIO_MODE_AF_PP)
312+
#define BOARD_USB_OTG_HS_D0_PULL (GPIO_NOPULL)
313+
#define BOARD_USB_OTG_HS_D0_SPEED (GPIO_SPEED_FREQ_VERY_HIGH)
314+
#define BOARD_USB_OTG_HS_D0_ALTERNATE (GPIO_AF10_OTG2_HS)
315+
#define BOARD_USB_OTG_HS_D0_GPIO (GPIOA)
316+
317+
#define BOARD_USB_OTG_HS_D1_D7_PIN (GPIO_PIN_0 | GPIO_PIN_1 | GPIO_PIN_5 | GPIO_PIN_10 | GPIO_PIN_11 | GPIO_PIN_12 | GPIO_PIN_13)
318+
#define BOARD_USB_OTG_HS_D1_D7_MODE (GPIO_MODE_AF_PP)
319+
#define BOARD_USB_OTG_HS_D1_D7_PULL (GPIO_NOPULL)
320+
#define BOARD_USB_OTG_HS_D1_D7_ALTERNATE (GPIO_AF10_OTG2_HS)
321+
#define BOARD_USB_OTG_HS_D1_D7_GPIO (GPIOB)
322+
323+
#define BOARD_USB_OTG_HS_STP_PIN (GPIO_PIN_0)
324+
#define BOARD_USB_OTG_HS_STP_MODE (GPIO_MODE_AF_PP)
325+
#define BOARD_USB_OTG_HS_STP_PULL (GPIO_NOPULL)
326+
#define BOARD_USB_OTG_HS_STP_ALTERNATE (GPIO_AF10_OTG2_HS)
327+
#define BOARD_USB_OTG_HS_STP_GPIO (GPIOC)
328+
329+
#define BOARD_USB_OTG_HS_NXT_PIN (GPIO_PIN_4)
330+
#define BOARD_USB_OTG_HS_NXT_MODE (GPIO_MODE_AF_PP)
331+
#define BOARD_USB_OTG_HS_NXT_PULL (GPIO_NOPULL)
332+
#define BOARD_USB_OTG_HS_NXT_ALTERNATE (GPIO_AF10_OTG2_HS)
333+
#define BOARD_USB_OTG_HS_NXT_GPIO (GPIOH)
334+
335+
#define BOARD_USB_OTG_HS_DIR_PIN (GPIO_PIN_11)
336+
#define BOARD_USB_OTG_HS_DIR_MODE (GPIO_MODE_AF_PP)
337+
#define BOARD_USB_OTG_HS_DIR_PULL (GPIO_NOPULL)
338+
#define BOARD_USB_OTG_HS_DIR_ALTERNATE (GPIO_AF10_OTG2_HS)
339+
#define BOARD_USB_OTG_HS_DIR_GPIO (GPIOI)
340+
#else
341+
276342
#endif
277343

278344
#endif /* __BOARD_H */

‎app/power/power.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ void power_init() {
125125
portenta_power_init();
126126
#elif defined TARGET_NICLA_VISION
127127
nicla_vision_power_init();
128+
#elif defined TARGET_GIGA
129+
//no power init function
128130
#else
129131

130132
#endif

‎generate_rel.sh

+29-1
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,39 @@ echo
7373
echo Generating binaries for OPTA
7474
mbed compile -c -m OPTA -t GCC_ARM --app=mbed_app_opta.json --profile=custom.json -N mcuboot_opta
7575
mkdir -p release/OPTA
76-
mv ./libbootutil.a ./release/OPTA
76+
cp ./libbootutil.a ./release/OPTA
7777
cp ./BUILD/OPTA/GCC_ARM-CUSTOM/mcuboot_opta.bin ./release/OPTA/mcuboot_opta.bin
7878
cp ./BUILD/OPTA/GCC_ARM-CUSTOM/mcuboot_opta_application.elf ./release/OPTA/mcuboot_opta.elf
7979
xxd -i ./release/OPTA/mcuboot_opta.bin > ./release/OPTA/mcuboot_opta.h
8080
sed -i "s/unsigned char __release_OPTA_mcuboot_opta_bin/const unsigned char mcuboot_opta_bin/" ./release/OPTA/mcuboot_opta.h
8181
sed -i "s/__release_OPTA_mcuboot_opta_bin_len/mcuboot_opta_bin_len/" ./release/OPTA/mcuboot_opta.h
8282
tar -czvf ./release/OPTA.tar.gz -C ./release/ OPTA
8383
fi
84+
85+
if [[ $1 == "giga" ]] || [[ $1 == "all" ]]; then
86+
echo
87+
echo Generating binaries for GIGA
88+
mbed compile -c -m GIGA -t GCC_ARM --app=mbed_app_giga.json --profile=custom.json -N mcuboot_giga
89+
mkdir -p release/GIGA
90+
cp ./libbootutil.a ./release/GIGA
91+
cp ./BUILD/GIGA/GCC_ARM-CUSTOM/mcuboot_giga.bin ./release/GIGA/mcuboot_giga.bin
92+
cp ./BUILD/GIGA/GCC_ARM-CUSTOM/mcuboot_giga_application.elf ./release/GIGA/mcuboot_giga.elf
93+
xxd -i ./release/GIGA/mcuboot_giga.bin > ./release/GIGA/mcuboot_giga.h
94+
sed -i "s/unsigned char __release_GIGA_mcuboot_giga_bin/const unsigned char mcuboot_giga_bin/" ./release/GIGA/mcuboot_giga.h
95+
sed -i "s/__release_GIGA_mcuboot_opta_bin_len/mcuboot_giga_bin_len/" ./release/GIGA/mcuboot_giga.h
96+
tar -czvf ./release/GIGA.tar.gz -C ./release/ GIGA
97+
fi
98+
99+
if [[ $1 == "gigaw" ]] || [[ $1 == "all" ]]; then
100+
echo
101+
echo Generating binaries for GIGA_WiFi
102+
mbed compile -c -m GIGA -t GCC_ARM --app=mbed_app_giga_wifi.json --profile=custom.json -N mcuboot_giga_wifi
103+
mkdir -p release/GIGA_WiFi
104+
mv ./libbootutil.a ./release/GIGA_WiFi
105+
cp ./BUILD/GIGA/GCC_ARM-CUSTOM/mcuboot_giga_wifi.bin ./release/GIGA_WiFi/mcuboot_giga_wifi.bin
106+
cp ./BUILD/GIGA/GCC_ARM-CUSTOM/mcuboot_giga_wifi_application.elf ./release/GIGA_WiFi/mcuboot_giga_wifi.elf
107+
xxd -i ./release/GIGA_WiFi/mcuboot_giga_wifi.bin > ./release/GIGA_WiFi/mcuboot_giga_wifi.h
108+
sed -i "s/unsigned char __release_GIGA_WiFi_mcuboot_giga_wifi_bin/const unsigned char mcuboot_giga_wifi_bin/" ./release/GIGA_WiFi/mcuboot_giga_wifi.h
109+
sed -i "s/__release_GIGA_WiFi_mcuboot_giga_wifi_bin_len/mcuboot_giga_wifi_bin_len/" ./release/GIGA_WiFi/mcuboot_giga_wifi.h
110+
tar -czvf ./release/GIGA_WiFi.tar.gz -C ./release/ GIGA_WiFi
111+
fi

‎mbed-os.lib

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://github.com/bcmi-labs/mbed-os-h747/#6e44fdca33d7fa196e90d57c388b6d0c03e34d10
1+
https://github.com/bcmi-labs/mbed-os/#a55c905a33d04ed410029d2626fab114a78ddfec

‎mbed_app.json

+17
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,23 @@
128128
"CYW43XXX"
129129
],
130130
"mcuboot.application-sdcard": null
131+
},
132+
"GIGA": {
133+
"target.clock_source": "USE_PLL_HSI",
134+
"target.use-mpu": true,
135+
"target.macros_add": [
136+
"USE_USB_FS",
137+
"BOARD_HAS_VIDEO=0",
138+
"BOARD_HAS_ETHERNET=0",
139+
"BOARD_HAS_WIFI=0",
140+
"BOARD_EXTCLOCK=16"
141+
],
142+
"target.components_remove" : [
143+
"WHD",
144+
"4343W_FS",
145+
"CYW43XXX"
146+
],
147+
"mcuboot.application-sdcard": null
131148
}
132149
}
133150
}

‎mbed_app_giga.json

+100
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
{
2+
"requires": [
3+
"bare-metal",
4+
"mbedtls",
5+
"mcuboot",
6+
"flashiap-block-device",
7+
"spif-driver",
8+
"qspif",
9+
"mbed-trace",
10+
"filesystem",
11+
"fat_chan",
12+
"littlefs",
13+
"rtos",
14+
"cmsis-cmsis5-rtos2",
15+
"events"
16+
],
17+
"macros": [
18+
"MBED_FAULT_HANDLER_DISABLED",
19+
"MBEDTLS_USER_CONFIG_FILE=\"mbedtls_config.h\""
20+
],
21+
"config": {
22+
"serial-bootloader-enable": {
23+
"help": "Build bootloader with serial update support",
24+
"value": 0
25+
}
26+
},
27+
"target_overrides": {
28+
"GIGA": {
29+
"target.restrict_size": "0x20000",
30+
"target.c_lib": "small",
31+
"target.printf_lib": "minimal-printf",
32+
"target.i2c_timing_value_algo": false,
33+
"target.extra_labels_remove" : ["CORDIO"],
34+
"target.features_remove" : ["BLE"],
35+
"target.device_has_remove": [
36+
"USBDEVICE",
37+
"EMAC",
38+
"CAN",
39+
"SPI_ASYNCH",
40+
"SPISLAVE",
41+
"SPI",
42+
"SERIAL_FC",
43+
"PWMOUT",
44+
"ANALOGIN",
45+
"ANALOGOUT",
46+
"I2CSLAVE",
47+
"I2C_ASYNC",
48+
"OSPI",
49+
"TRNG",
50+
"DAC",
51+
"CRC",
52+
"WATCHDOG",
53+
"RTC",
54+
"LPTICKER",
55+
"SLEEP"
56+
],
57+
"target.clock_source": "USE_PLL_HSI",
58+
"target.use-mpu": true,
59+
"target.macros_add": [
60+
"USE_USB_FS",
61+
"BOARD_HAS_VIDEO=0",
62+
"BOARD_HAS_ETHERNET=0",
63+
"BOARD_HAS_WIFI=0",
64+
"BOARD_EXTCLOCK=16"
65+
],
66+
"target.components_remove" : [
67+
"WHD",
68+
"4343W_FS",
69+
"CYW43XXX"
70+
],
71+
"platform.minimal-printf-enable-floating-point": false,
72+
"platform.minimal-printf-enable-64-bit": false,
73+
"platform.stdio-flush-at-exit": false,
74+
"platform.stdio-baud-rate": 115200,
75+
"fat_chan.ff_use_mkfs": 0,
76+
"fat_chan.ff_use_lfn": 0,
77+
"fat_chan.ff_fs_rpath": 0,
78+
"mcuboot.log-level": "MCUBOOT_LOG_LEVEL_INFO",
79+
"mcuboot.primary-slot-address": "0x8020000",
80+
"mcuboot.slot-size": "0x1E0000",
81+
"mcuboot.scratch-address": "0x9000000",
82+
"mcuboot.scratch-size": "0x20000",
83+
"mcuboot.max-img-sectors": "0x3C0",
84+
"mcuboot.max-align": 32,
85+
"mcuboot.bootstrap": true,
86+
"mcuboot.application-hooks": true,
87+
"mcuboot.application-littlefs": true,
88+
"mcuboot.application-dfu": true,
89+
"mcuboot.application-sdcard": null,
90+
"mcuboot.signature-algorithm": "SIGNATURE_TYPE_EC256",
91+
"mcuboot.encrypt-ec256": true,
92+
"mcuboot.include-keys": null,
93+
"mcuboot.bootloader-build": false,
94+
"mcuboot.encrypt-scratch": true,
95+
"mcuboot.swap-buf-size": 131072,
96+
"mbed-trace.enable": false,
97+
"mbed-trace.fea-ipv6": false
98+
}
99+
}
100+
}

‎mbed_app_giga_wifi.json

+99
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
{
2+
"requires": [
3+
"bare-metal",
4+
"mbedtls",
5+
"mcuboot",
6+
"flashiap-block-device",
7+
"spif-driver",
8+
"qspif",
9+
"mbed-trace",
10+
"filesystem",
11+
"fat_chan",
12+
"littlefs",
13+
"rtos",
14+
"cmsis-cmsis5-rtos2",
15+
"events"
16+
],
17+
"macros": [
18+
"MBED_FAULT_HANDLER_DISABLED",
19+
"MBEDTLS_USER_CONFIG_FILE=\"mbedtls_config.h\""
20+
],
21+
"config": {
22+
"serial-bootloader-enable": {
23+
"help": "Build bootloader with serial update support",
24+
"value": 0
25+
}
26+
},
27+
"target_overrides": {
28+
"GIGA": {
29+
"target.restrict_size": "0x20000",
30+
"target.c_lib": "small",
31+
"target.printf_lib": "minimal-printf",
32+
"target.i2c_timing_value_algo": false,
33+
"target.extra_labels_remove" : ["CORDIO"],
34+
"target.features_remove" : ["BLE"],
35+
"target.device_has_remove": [
36+
"USBDEVICE",
37+
"EMAC",
38+
"CAN",
39+
"SPI_ASYNCH",
40+
"SPISLAVE",
41+
"SPI",
42+
"SERIAL_FC",
43+
"PWMOUT",
44+
"ANALOGIN",
45+
"ANALOGOUT",
46+
"I2CSLAVE",
47+
"I2C_ASYNC",
48+
"OSPI",
49+
"TRNG",
50+
"DAC",
51+
"CRC",
52+
"WATCHDOG",
53+
"RTC",
54+
"LPTICKER",
55+
"SLEEP"
56+
],
57+
"target.clock_source": "USE_PLL_HSI",
58+
"target.use-mpu": true,
59+
"target.macros_add": [
60+
"USE_USB_FS",
61+
"BOARD_HAS_VIDEO=0",
62+
"BOARD_HAS_ETHERNET=0",
63+
"BOARD_EXTCLOCK=16"
64+
],
65+
"target.components_remove" : [
66+
"WHD",
67+
"4343W_FS",
68+
"CYW43XXX"
69+
],
70+
"platform.minimal-printf-enable-floating-point": false,
71+
"platform.minimal-printf-enable-64-bit": false,
72+
"platform.stdio-flush-at-exit": false,
73+
"platform.stdio-baud-rate": 115200,
74+
"fat_chan.ff_use_mkfs": 0,
75+
"fat_chan.ff_use_lfn": 0,
76+
"fat_chan.ff_fs_rpath": 0,
77+
"mcuboot.log-level": "MCUBOOT_LOG_LEVEL_INFO",
78+
"mcuboot.primary-slot-address": "0x8020000",
79+
"mcuboot.slot-size": "0x1E0000",
80+
"mcuboot.scratch-address": "0x9000000",
81+
"mcuboot.scratch-size": "0x20000",
82+
"mcuboot.max-img-sectors": "0x3C0",
83+
"mcuboot.max-align": 32,
84+
"mcuboot.bootstrap": true,
85+
"mcuboot.application-hooks": true,
86+
"mcuboot.application-littlefs": true,
87+
"mcuboot.application-dfu": true,
88+
"mcuboot.application-sdcard": null,
89+
"mcuboot.signature-algorithm": "SIGNATURE_TYPE_EC256",
90+
"mcuboot.encrypt-ec256": true,
91+
"mcuboot.include-keys": null,
92+
"mcuboot.bootloader-build": false,
93+
"mcuboot.encrypt-scratch": true,
94+
"mcuboot.swap-buf-size": 131072,
95+
"mbed-trace.enable": false,
96+
"mbed-trace.fea-ipv6": false
97+
}
98+
}
99+
}

0 commit comments

Comments
 (0)