Skip to content

Commit

Permalink
Merge branch 'main' into udc
Browse files Browse the repository at this point in the history
  • Loading branch information
loicpoulain committed Mar 6, 2023
2 parents 5481ab7 + 9c18b38 commit db860fe
Show file tree
Hide file tree
Showing 452 changed files with 38,800 additions and 2,342 deletions.
33 changes: 32 additions & 1 deletion MAINTAINERS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1395,6 +1395,20 @@ Google Platforms:
files:
- boards/*/google_*/

Hash Utilities:
status: maintained
maintainers:
- cfriedt
files:
- include/zephyr/sys/hash_*
- lib/hash/
- samples/basic/hash_map/
- tests/lib/hash_*/
description: >-
Hash Functions and Hash Maps (Hash Tables)
labels:
- "area: hash utils"

IPC:
status: maintained
maintainers:
Expand Down Expand Up @@ -2141,6 +2155,23 @@ nRF Platforms:
labels:
- "platform: nRF"

Renesas SmartBond Platforms:
status: maintained
maintainers:
- andrzej-kaczmarek
- blauret
files:
- boards/arm/da14*/
- drivers/*/*smartbond*
- dts/arm/renesas/smartbond/
- dts/bindings/*/renesas,smartbond*
- soc/arm/renesas_smartbond/
labels:
- "platform: Renesas SmartBond"
description: >-
Renesas SmartBond SOCs, dts files, and related drivers. Renesas boards based
on SmartBond SoCs.
Renesas R-Car Platforms:
status: maintained
maintainers:
Expand All @@ -2151,7 +2182,7 @@ Renesas R-Car Platforms:
- boards/arm/rcar_*/
- drivers/*/*rcar*
- drivers/clock_control/*cpg_mssr*
- dts/arm/renesas/
- dts/arm/renesas/gen3/
- dts/bindings/*/*rcar*
- soc/arm/renesas_rcar/
labels:
Expand Down
12 changes: 12 additions & 0 deletions boards/arm/arduino_giga_r1/Kconfig.board
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Copyright 2023 Google LLC
# SPDX-License-Identifier: Apache-2.0

config BOARD_ARDUINO_GIGA_R1_M7
bool "Arduino GIGA R1 WiFi Board (M7)"
depends on SOC_STM32H747XX
select CPU_CORTEX_M7

config BOARD_ARDUINO_GIGA_R1_M4
bool "Arduino GIGA R1 WiFi Board (M4)"
depends on SOC_STM32H747XX
select CPU_CORTEX_M4
13 changes: 13 additions & 0 deletions boards/arm/arduino_giga_r1/Kconfig.defconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Copyright 2023 Google LLC
# SPDX-License-Identifier: Apache-2.0

if BOARD_ARDUINO_GIGA_R1_M7 || BOARD_ARDUINO_GIGA_R1_M4

config BOARD
default "arduino_giga_r1_m7" if BOARD_ARDUINO_GIGA_R1_M7
default "arduino_giga_r1_m4" if BOARD_ARDUINO_GIGA_R1_M4

config STM32H7_DUAL_CORE
default y

endif # BOARD_ARDUINO_GIGA_R1_M7 || BOARD_ARDUINO_GIGA_R1_M4
38 changes: 38 additions & 0 deletions boards/arm/arduino_giga_r1/arduino_giga_r1.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/*
* Copyright 2023 Google LLC
*
* SPDX-License-Identifier: Apache-2.0
*/

#include "arduino_r3_connector.dtsi"

/ {
leds {
compatible = "gpio-leds";
red_led: led_0 {
gpios = <&gpioi 12 GPIO_ACTIVE_LOW>;
};
green_led: led_1 {
gpios = <&gpioj 13 GPIO_ACTIVE_LOW>;
};
blue_led: led_2 {
gpios = <&gpioe 3 GPIO_ACTIVE_LOW>;
};
};

gpio_keys {
compatible = "gpio-keys";
user_button: button_0 {
gpios = <&gpioc 13 GPIO_ACTIVE_HIGH>;
};
};
};

&rcc {
d1cpre = <1>;
hpre = <2>;
d1ppre = <2>;
d2ppre1 = <2>;
d2ppre2 = <2>;
d3ppre = <2>;
};
37 changes: 37 additions & 0 deletions boards/arm/arduino_giga_r1/arduino_giga_r1_m4.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*
* Copyright 2023 Google LLC
*
* SPDX-License-Identifier: Apache-2.0
*/

/dts-v1/;
#include <st/h7/stm32h747Xi_m4.dtsi>
#include <st/h7/stm32h747xihx-pinctrl.dtsi>
#include "arduino_giga_r1.dtsi"

/ {
model = "Arduino GIGA R1 WiFi Board (M4)";
compatible = "arduino,giga-r1";

chosen {
zephyr,console = &usart2;
zephyr,shell-uart = &usart2;
zephyr,sram = &sram1;
zephyr,flash = &flash1;
};

aliases {
led0 = &blue_led;
};
};

&rcc {
clock-frequency = <DT_FREQ_M(240)>;
};

&usart2 {
status = "okay";
pinctrl-0 = <&usart2_tx_pd5 &usart2_rx_pd6>;
pinctrl-names = "default";
current-speed = <115200>;
};
18 changes: 18 additions & 0 deletions boards/arm/arduino_giga_r1/arduino_giga_r1_m4.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
identifier: arduino_giga_r1_m4
name: Arduino GIGA R1 WiFi (M4)
type: mcu
arch: arm
toolchain:
- zephyr
- gnuarmemb
- xtools
ram: 288
flash: 1024
supported:
- arduino_gpio
- gpio
testing:
ignore_tags:
- mpu
- nfc
- net
30 changes: 30 additions & 0 deletions boards/arm/arduino_giga_r1/arduino_giga_r1_m4_defconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Copyright 2023 Google LLC
# SPDX-License-Identifier: Apache-2.0

CONFIG_SOC_SERIES_STM32H7X=y
CONFIG_SOC_STM32H747XX=y

# Board config should be specified since there are 2 possible targets
CONFIG_BOARD_ARDUINO_GIGA_R1_M4=y

# Enable GPIO
CONFIG_GPIO=y

# Clock configuration
CONFIG_CLOCK_CONTROL=y

# Enable MPU
CONFIG_ARM_MPU=y

# Enable HW stack protection
CONFIG_HW_STACK_PROTECTION=y

# Enable uart driver
CONFIG_SERIAL=y

# Console
CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y

# Enable pin controller
CONFIG_PINCTRL=y

0 comments on commit db860fe

Please sign in to comment.