nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

risc-v/espressif: Rename espressif/esp32c3 as esp32c3

Browse source 
risc-v/espressif: Rename espressif/esp32c6 as esp32c6
risc-v/espressif: Rename espressif/esp32h2 as esp32h2
This commit is contained in:
Eren Terzioglu 2024-01-08 11:26:14 +03:00 committed by Alin Jerpelea
parent c8d7c81cb9
commit d1db1810ad
123 changed files with 1255 additions and 365 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

129
arch/risc-v/Kconfig
View file

@ -90,10 +90,93 @@ config ARCH_CHIP_ESP32C3
---help---
Espressif ESP32-C3 (RV32IMC).
config ARCH_CHIP_ESPRESSIF
bool "Espressif ESP32 family"
config ARCH_CHIP_ESP32C3_GENERIC
bool "ESP32-C3"
select ARCH_RV32
select ARCH_RV_ISA_M
select ARCH_RV_ISA_C
select ARCH_VECNOTIRQ
select ARCH_HAVE_BOOTLOADER if !ESPRESSIF_SIMPLE_BOOT
select ARCH_HAVE_MPU
select ARCH_HAVE_RESET
select ARCH_HAVE_RNG
select ARCH_HAVE_TICKLESS
select LIBC_ARCH_ATOMIC
select LIBC_ARCH_MEMCPY
select LIBC_ARCH_MEMCHR
select LIBC_ARCH_MEMCMP
select LIBC_ARCH_MEMMOVE
select LIBC_ARCH_MEMSET
select LIBC_ARCH_STRCHR
select LIBC_ARCH_STRCMP
select LIBC_ARCH_STRCPY
select LIBC_ARCH_STRLCPY
select LIBC_ARCH_STRNCPY
select LIBC_ARCH_STRLEN
select LIBC_ARCH_STRNLEN
select ESPRESSIF_SOC_RTC_MEM_SUPPORTED
select ARCH_CHIP_ESPRESSIF
---help---
Family of RISC-V based microcontrollers from Espressif Systems.
ESP32-C3 chip with a single RISC-V IMC core, no embedded Flash memory
config ARCH_CHIP_ESP32C6
bool "ESP32-C6"
select ARCH_RV32
select ARCH_RV_ISA_M
select ARCH_RV_ISA_A
select ARCH_RV_ISA_C
select ARCH_VECNOTIRQ
select ARCH_HAVE_BOOTLOADER
select ARCH_HAVE_MPU
select ARCH_HAVE_RESET
select ARCH_HAVE_RNG
select ARCH_HAVE_TICKLESS
select LIBC_ARCH_MEMCPY
select LIBC_ARCH_MEMCHR
select LIBC_ARCH_MEMCMP
select LIBC_ARCH_MEMMOVE
select LIBC_ARCH_MEMSET
select LIBC_ARCH_STRCHR
select LIBC_ARCH_STRCMP
select LIBC_ARCH_STRCPY
select LIBC_ARCH_STRLCPY
select LIBC_ARCH_STRNCPY
select LIBC_ARCH_STRLEN
select LIBC_ARCH_STRNLEN
select ESPRESSIF_SOC_RTC_MEM_SUPPORTED
select ARCH_CHIP_ESPRESSIF
---help---
Espressif ESP32-C6 (RV32IMAC).
config ARCH_CHIP_ESP32H2
bool "ESP32-H2"
select ARCH_RV32
select ARCH_RV_ISA_M
select ARCH_RV_ISA_C
select ARCH_VECNOTIRQ
select ARCH_HAVE_BOOTLOADER
select ARCH_HAVE_MPU
select ARCH_HAVE_RESET
select ARCH_HAVE_RNG
select ARCH_HAVE_TICKLESS
select LIBC_ARCH_ATOMIC
select LIBC_ARCH_MEMCPY
select LIBC_ARCH_MEMCHR
select LIBC_ARCH_MEMCMP
select LIBC_ARCH_MEMMOVE
select LIBC_ARCH_MEMSET
select LIBC_ARCH_STRCHR
select LIBC_ARCH_STRCMP
select LIBC_ARCH_STRCPY
select LIBC_ARCH_STRLCPY
select LIBC_ARCH_STRNCPY
select LIBC_ARCH_STRLEN
select LIBC_ARCH_STRNLEN
select ESPRESSIF_ESPTOOLPY_NO_STUB
select ESPRESSIF_SOC_RTC_MEM_SUPPORTED
select ARCH_CHIP_ESPRESSIF
---help---
Espressif ESP32-H2 (RV32IMC).
config ARCH_CHIP_C906
bool "THEAD C906"
@ -304,20 +387,22 @@ config ARCH_FAMILY
config ARCH_CHIP
string
default "fe310" if ARCH_CHIP_FE310
default "k210" if ARCH_CHIP_K210
default "litex" if ARCH_CHIP_LITEX
default "bl602" if ARCH_CHIP_BL602
default "esp32c3-legacy" if ARCH_CHIP_ESP32C3
default "espressif" if ARCH_CHIP_ESPRESSIF
default "c906" if ARCH_CHIP_C906
default "mpfs" if ARCH_CHIP_MPFS
default "rv32m1" if ARCH_CHIP_RV32M1
default "qemu-rv" if ARCH_CHIP_QEMU_RV
default "hpm6750" if ARCH_CHIP_HPM6750
default "jh7110" if ARCH_CHIP_JH7110
default "bl808" if ARCH_CHIP_BL808
default "k230" if ARCH_CHIP_K230
default "fe310" if ARCH_CHIP_FE310
default "k210" if ARCH_CHIP_K210
default "litex" if ARCH_CHIP_LITEX
default "bl602" if ARCH_CHIP_BL602
default "esp32c3-legacy" if ARCH_CHIP_ESP32C3
default "esp32c3" if ARCH_CHIP_ESP32C3_GENERIC
default "esp32c6" if ARCH_CHIP_ESP32C6
default "esp32h2" if ARCH_CHIP_ESP32H2
default "c906" if ARCH_CHIP_C906
default "mpfs" if ARCH_CHIP_MPFS
default "rv32m1" if ARCH_CHIP_RV32M1
default "qemu-rv" if ARCH_CHIP_QEMU_RV
default "hpm6750" if ARCH_CHIP_HPM6750
default "jh7110" if ARCH_CHIP_JH7110
default "bl808" if ARCH_CHIP_BL808
default "k230" if ARCH_CHIP_K230
config ARCH_RISCV_INTXCPT_EXTENSIONS
bool "RISC-V Integer Context Extensions"
@ -460,8 +545,14 @@ endif
if ARCH_CHIP_ESP32C3
source "arch/risc-v/src/esp32c3-legacy/Kconfig"
endif
if ARCH_CHIP_ESPRESSIF
source "arch/risc-v/src/espressif/Kconfig"
if ARCH_CHIP_ESP32C3_GENERIC
source "arch/risc-v/src/esp32c3/Kconfig"
endif
if ARCH_CHIP_ESP32C6
source "arch/risc-v/src/esp32c6/Kconfig"
endif
if ARCH_CHIP_ESP32H2
source "arch/risc-v/src/esp32h2/Kconfig"
endif
if ARCH_CHIP_C906
source "arch/risc-v/src/c906/Kconfig"

0
arch/risc-v/include/espressif/.gitignore → arch/risc-v/include/esp32c3/.gitignore vendored
View file

8
arch/risc-v/include/espressif/chip.h → arch/risc-v/include/esp32c3/chip.h
View file

@ -1,5 +1,5 @@
/****************************************************************************
* arch/risc-v/include/espressif/chip.h
* arch/risc-v/include/esp32c3/chip.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -18,8 +18,8 @@
*
****************************************************************************/
#ifndef __ARCH_RISCV_INCLUDE_ESPRESSIF_CHIP_H
#define __ARCH_RISCV_INCLUDE_ESPRESSIF_CHIP_H
#ifndef __ARCH_RISCV_INCLUDE_ESP32C3_CHIP_H
#define __ARCH_RISCV_INCLUDE_ESP32C3_CHIP_H
/****************************************************************************
* Included Files
@ -29,4 +29,4 @@
* Pre-processor Definitions
****************************************************************************/
#endif /* __ARCH_RISCV_INCLUDE_ESPRESSIF_CHIP_H */
#endif /* __ARCH_RISCV_INCLUDE_ESP32C3_CHIP_H */

2
arch/risc-v/include/esp32c6/.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
/gpio_sig_map.h
/irq.h

32
arch/risc-v/include/esp32c6/chip.h Normal file
View file

@ -0,0 +1,32 @@
/****************************************************************************
* arch/risc-v/include/esp32c6/chip.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
****************************************************************************/
#ifndef __ARCH_RISCV_INCLUDE_ESP32C6_CHIP_H
#define __ARCH_RISCV_INCLUDE_ESP32C6_CHIP_H
/****************************************************************************
* Included Files
****************************************************************************/
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#endif /* __ARCH_RISCV_INCLUDE_ESP32C6_CHIP_H */

2
arch/risc-v/include/esp32h2/.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
/gpio_sig_map.h
/irq.h

32
arch/risc-v/include/esp32h2/chip.h Normal file
View file

@ -0,0 +1,32 @@
/****************************************************************************
* arch/risc-v/include/esp32h2/chip.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
****************************************************************************/
#ifndef __ARCH_RISCV_INCLUDE_ESP32H2_CHIP_H
#define __ARCH_RISCV_INCLUDE_ESP32H2_CHIP_H
/****************************************************************************
* Included Files
****************************************************************************/
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#endif /* __ARCH_RISCV_INCLUDE_ESP32H2_CHIP_H */

0
arch/risc-v/src/espressif/.gitignore → arch/risc-v/src/common/espressif/.gitignore vendored
View file

74
arch/risc-v/src/espressif/Kconfig → arch/risc-v/src/common/espressif/Kconfig
View file

@ -3,7 +3,7 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
if ARCH_CHIP_ESPRESSIF
if ARCH_CHIP_ESPRESSIF || ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2 || ARCH_CHIP_ESP32C3_GENERIC
choice ESPRESSIF_CHIP_SERIES
prompt "Chip Series"
@ -11,86 +11,16 @@ choice ESPRESSIF_CHIP_SERIES
config ESPRESSIF_ESP32C3
bool "ESP32-C3"
select ARCH_RV32
select ARCH_RV_ISA_M
select ARCH_RV_ISA_C
select ARCH_VECNOTIRQ
select ARCH_HAVE_BOOTLOADER if !ESPRESSIF_SIMPLE_BOOT
select ARCH_HAVE_MPU
select ARCH_HAVE_RESET
select ARCH_HAVE_RNG
select ARCH_HAVE_TICKLESS
select LIBC_ARCH_ATOMIC
select LIBC_ARCH_MEMCPY
select LIBC_ARCH_MEMCHR
select LIBC_ARCH_MEMCMP
select LIBC_ARCH_MEMMOVE
select LIBC_ARCH_MEMSET
select LIBC_ARCH_STRCHR
select LIBC_ARCH_STRCMP
select LIBC_ARCH_STRCPY
select LIBC_ARCH_STRLCPY
select LIBC_ARCH_STRNCPY
select LIBC_ARCH_STRLEN
select LIBC_ARCH_STRNLEN
select ESPRESSIF_SOC_RTC_MEM_SUPPORTED
---help---
ESP32-C3 chip with a single RISC-V IMC core, no embedded Flash memory
config ESPRESSIF_ESP32C6
bool "ESP32-C6"
select ARCH_RV32
select ARCH_RV_ISA_M
select ARCH_RV_ISA_A
select ARCH_RV_ISA_C
select ARCH_VECNOTIRQ
select ARCH_HAVE_BOOTLOADER
select ARCH_HAVE_MPU
select ARCH_HAVE_RESET
select ARCH_HAVE_RNG
select ARCH_HAVE_TICKLESS
select LIBC_ARCH_MEMCPY
select LIBC_ARCH_MEMCHR
select LIBC_ARCH_MEMCMP
select LIBC_ARCH_MEMMOVE
select LIBC_ARCH_MEMSET
select LIBC_ARCH_STRCHR
select LIBC_ARCH_STRCMP
select LIBC_ARCH_STRCPY
select LIBC_ARCH_STRLCPY
select LIBC_ARCH_STRNCPY
select LIBC_ARCH_STRLEN
select LIBC_ARCH_STRNLEN
select ESPRESSIF_SOC_RTC_MEM_SUPPORTED
---help---
Espressif ESP32-C6 (RV32IMAC).
config ESPRESSIF_ESP32H2
bool "ESP32-H2"
select ARCH_RV32
select ARCH_RV_ISA_M
select ARCH_RV_ISA_C
select ARCH_VECNOTIRQ
select ARCH_HAVE_BOOTLOADER
select ARCH_HAVE_MPU
select ARCH_HAVE_RESET
select ARCH_HAVE_RNG
select ARCH_HAVE_TICKLESS
select LIBC_ARCH_ATOMIC
select LIBC_ARCH_MEMCPY
select LIBC_ARCH_MEMCHR
select LIBC_ARCH_MEMCMP
select LIBC_ARCH_MEMMOVE
select LIBC_ARCH_MEMSET
select LIBC_ARCH_STRCHR
select LIBC_ARCH_STRCMP
select LIBC_ARCH_STRCPY
select LIBC_ARCH_STRLCPY
select LIBC_ARCH_STRNCPY
select LIBC_ARCH_STRLEN
select LIBC_ARCH_STRNLEN
select ESPRESSIF_ESPTOOLPY_NO_STUB
select ESPRESSIF_SOC_RTC_MEM_SUPPORTED
---help---
Espressif ESP32-H2 (RV32IMC).
@ -234,7 +164,7 @@ config ESPRESSIF_MCUBOOT_VERSION
depends on ESPRESSIF_BOOTLOADER_MCUBOOT
default "aa7e2b1faae623dbe01bbc6094e71ab44ec9d80a"
choice
choice ESPRESSIF_ESPTOOL_TARGET_SLOT
prompt "Target slot for image flashing"
default ESPRESSIF_ESPTOOL_TARGET_PRIMARY
depends on ESPRESSIF_HAVE_OTA_PARTITION

40
arch/risc-v/src/common/espressif/Make.defs
View file

@ -73,7 +73,47 @@ ifeq ($(CONFIG_ESPRESSIF_USBSERIAL),y)
CHIP_CSRCS += esp_usbserial.c
endif
#############################################################################
# Espressif HAL for 3rd Party Platforms
#############################################################################
# Fetch source files and add them to build
ESP_HAL_3RDPARTY_REPO = esp-hal-3rdparty
ifndef ESP_HAL_3RDPARTY_VERSION
ESP_HAL_3RDPARTY_VERSION = b6a943764f5e5a12d12edd8a6d71bdecc505428c
endif
ifndef ESP_HAL_3RDPARTY_URL
ESP_HAL_3RDPARTY_URL = https://github.com/espressif/esp-hal-3rdparty.git
endif
chip/$(ESP_HAL_3RDPARTY_REPO):
$(Q) echo "Cloning Espressif HAL for 3rd Party Platforms"
$(Q) git clone --quiet $(ESP_HAL_3RDPARTY_URL) chip/$(ESP_HAL_3RDPARTY_REPO)
$(Q) echo "Espressif HAL for 3rd Party Platforms: ${ESP_HAL_3RDPARTY_VERSION}"
$(Q) git -C chip/$(ESP_HAL_3RDPARTY_REPO) checkout --quiet $(ESP_HAL_3RDPARTY_VERSION)
include common$(DELIM)espressif$(DELIM)Bootloader.mk
# Silent preprocessor warnings
CFLAGS += -Wno-undef -Wno-unused-variable
# Remove quotes from CONFIG_ESPRESSIF_CHIP_SERIES configuration
CHIP_SERIES = $(patsubst "%",%,$(CONFIG_ESPRESSIF_CHIP_SERIES))
include chip/hal_${CHIP_SERIES}.mk
context:: chip/$(ESP_HAL_3RDPARTY_REPO)
$(call COPYFILE,chip/$(ESP_HAL_3RDPARTY_REPO)/components/soc/$(CHIP_SERIES)/include/soc/gpio_sig_map.h,../include/chip/)
$(call COPYFILE,chip/$(ESP_HAL_3RDPARTY_REPO)/nuttx/$(CHIP_SERIES)/include/irq.h,../include/chip/)
distclean::
$(call DELFILE,../include/chip/gpio_sig_map.h)
$(call DELFILE,../include/chip/irq.h)
$(call DELDIR,chip/$(ESP_HAL_3RDPARTY_REPO))
INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)common$(DELIM)espressif
VPATH += common$(DELIM)espressif

1
arch/risc-v/src/common/espressif/esp_vectors.S
View file

@ -24,7 +24,6 @@
#include <nuttx/config.h>
#include <arch/espressif/irq.h>
#include <arch/irq.h>
#include "chip.h"

4
arch/risc-v/src/esp32c3/.gitignore vendored Normal file
View file

@ -0,0 +1,4 @@
/bootloader
/esp-nuttx-bootloader
/*.zip
/esp-hal-3rdparty

10
arch/risc-v/src/esp32c3/Kconfig Normal file
View file

@ -0,0 +1,10 @@
#
# For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository.
#
if ARCH_CHIP_ESP32C3_GENERIC
source "arch/risc-v/src/common/espressif/Kconfig"
endif # ARCH_CHIP_ESP32C3_GENERIC

22
arch/risc-v/src/esp32c3/Make.defs Normal file
View file

@ -0,0 +1,22 @@
############################################################################
# arch/risc-v/src/esp32c3/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
# ASF licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance with the
# License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
############################################################################
include common/Make.defs
include common/espressif/Make.defs

2
arch/risc-v/src/espressif/hal_esp32c3.mk → arch/risc-v/src/esp32c3/hal_esp32c3.mk
View file

@ -1,5 +1,5 @@
############################################################################
# arch/risc-v/src/espressif/esp32c3.mk
# arch/risc-v/src/esp32c3/esp32c3.mk
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with

4
arch/risc-v/src/esp32c6/.gitignore vendored Normal file
View file

@ -0,0 +1,4 @@
/bootloader
/esp-nuttx-bootloader
/*.zip
/esp-hal-3rdparty

10
arch/risc-v/src/esp32c6/Kconfig Normal file
View file

@ -0,0 +1,10 @@
#
# For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository.
#
if ARCH_CHIP_ESP32C6
source "arch/risc-v/src/common/espressif/Kconfig"
endif # ARCH_CHIP_ESP32C6

22
arch/risc-v/src/esp32c6/Make.defs Normal file
View file

@ -0,0 +1,22 @@
############################################################################
# arch/risc-v/src/esp32c6/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
# ASF licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance with the
# License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
############################################################################
include common/Make.defs
include common/espressif/Make.defs

2
arch/risc-v/src/espressif/hal_esp32c6.mk → arch/risc-v/src/esp32c6/hal_esp32c6.mk
View file

@ -1,5 +1,5 @@
############################################################################
# arch/risc-v/src/espressif/esp32c6.mk
# arch/risc-v/src/esp32c6/esp32c6.mk
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with

4
arch/risc-v/src/esp32h2/.gitignore vendored Normal file
View file

@ -0,0 +1,4 @@
/bootloader
/esp-nuttx-bootloader
/*.zip
/esp-hal-3rdparty

10
arch/risc-v/src/esp32h2/Kconfig Normal file
View file

@ -0,0 +1,10 @@
#
# For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository.
#
if ARCH_CHIP_ESP32H2
source "arch/risc-v/src/common/espressif/Kconfig"
endif # ARCH_CHIP_ESP32H2

22
arch/risc-v/src/esp32h2/Make.defs Normal file
View file

@ -0,0 +1,22 @@
############################################################################
# arch/risc-v/src/esp32h2/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
# ASF licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance with the
# License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
############################################################################
include common/Make.defs
include common/espressif/Make.defs

2
arch/risc-v/src/espressif/hal_esp32h2.mk → arch/risc-v/src/esp32h2/hal_esp32h2.mk
View file

@ -1,5 +1,5 @@
############################################################################
# arch/risc-v/src/espressif/esp32h2.mk
# arch/risc-v/src/esp32c6/esp32h2.mk
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with

62
arch/risc-v/src/espressif/Make.defs
View file

@ -1,62 +0,0 @@
############################################################################
# arch/risc-v/src/espressif/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
# ASF licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance with the
# License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
############################################################################
include common/Make.defs
include common/espressif/Make.defs
#############################################################################
# Espressif HAL for 3rd Party Platforms
#############################################################################
# Fetch source files and add them to build
ESP_HAL_3RDPARTY_REPO = esp-hal-3rdparty
ifndef ESP_HAL_3RDPARTY_VERSION
ESP_HAL_3RDPARTY_VERSION = b6a943764f5e5a12d12edd8a6d71bdecc505428c
endif
ifndef ESP_HAL_3RDPARTY_URL
ESP_HAL_3RDPARTY_URL = https://github.com/espressif/esp-hal-3rdparty.git
endif
chip/$(ESP_HAL_3RDPARTY_REPO):
$(Q) echo "Cloning Espressif HAL for 3rd Party Platforms"
$(Q) git clone --quiet $(ESP_HAL_3RDPARTY_URL) chip/$(ESP_HAL_3RDPARTY_REPO)
$(Q) echo "Espressif HAL for 3rd Party Platforms: ${ESP_HAL_3RDPARTY_VERSION}"
$(Q) git -C chip/$(ESP_HAL_3RDPARTY_REPO) checkout --quiet $(ESP_HAL_3RDPARTY_VERSION)
# Silent preprocessor warnings
CFLAGS += -Wno-undef -Wno-unused-variable
# Remove quotes from CONFIG_ESPRESSIF_CHIP_SERIES configuration
CHIP_SERIES = $(patsubst "%",%,$(CONFIG_ESPRESSIF_CHIP_SERIES))
include chip/hal_${CHIP_SERIES}.mk
context:: chip/$(ESP_HAL_3RDPARTY_REPO)
$(call COPYFILE,chip/$(ESP_HAL_3RDPARTY_REPO)/components/soc/$(CHIP_SERIES)/include/soc/gpio_sig_map.h,../include/chip/)
$(call COPYFILE,chip/$(ESP_HAL_3RDPARTY_REPO)/nuttx/$(CHIP_SERIES)/include/irq.h,../include/chip/)
distclean::
$(call DELFILE,../include/chip/gpio_sig_map.h)
$(call DELFILE,../include/chip/irq.h)
$(call DELDIR,chip/$(ESP_HAL_3RDPARTY_REPO))

38
boards/Kconfig
View file

@ -487,7 +487,7 @@ config ARCH_BOARD_ESP32S3_MEADOW
The ESP32-S3-Meadow is a small-sized board produced by WildernessLabs
featuring the ESP32-S3 CPU with 32MiB Octal SPI PSRAM and 64 MiB flash.
config ARCH_BOARD_ESP32C6_GENERIC
config ARCH_BOARD_ESP32C6_DEVKIT
bool "Espressif ESP32-C6 Generic DevKit"
depends on ESPRESSIF_ESP32C6
select ARCH_HAVE_BUTTONS
@ -495,7 +495,7 @@ config ARCH_BOARD_ESP32C6_GENERIC
---help---
The ESP32-C6 DevKit features the ESP32-C6 CPU with a RISC-V core.
config ARCH_BOARD_ESP32H2_GENERIC
config ARCH_BOARD_ESP32H2_DEVKIT
bool "Espressif ESP32-H2 Generic DevKit"
depends on ESPRESSIF_ESP32H2
select ARCH_HAVE_BUTTONS
@ -510,15 +510,6 @@ config ARCH_BOARD_ET_STM32_STAMP
The ET-STM32 Stamp features the STM32F103RET6 (Cortex M3) microcontroller.
For board details, see: https://www.futurlec.com/ET-STM32_Stamp.shtml
config ARCH_BOARD_ESP32C6_DEVKIT
bool "Espressif ESP32-C6 DevKit"
depends on ARCH_CHIP_ESP32C6MINI1 || ARCH_CHIP_ESP32C6WROOM1
---help---
The ESP32-C6 DevKit features the ESP32-C6 CPU with a RISC-V core.
It comes in two flavors, the ESP32-C6-DevKitM-1 and the ESP32-C6-DevKitC-02.
The ESP32-C6-DevKitM-1 version contains the ESP32-C6-MINI-1 module and the
ESP32-C6-DevKitC-02 version the ESP32-C6-WROOM-1.
config ARCH_BOARD_EZ80F910200KITG
bool "ZiLOG ez80f910200kitg development kit"
depends on ARCH_CHIP_EZ80F91
@ -3124,8 +3115,7 @@ config ARCH_BOARD
default "esp32s3-lcd-ev" if ARCH_BOARD_ESP32S3_LCD_EV
default "esp32s3-box" if ARCH_BOARD_ESP32S3_BOX
default "esp32c6-devkit" if ARCH_BOARD_ESP32C6_DEVKIT
default "esp32c6-generic" if ARCH_BOARD_ESP32C6_GENERIC
default "esp32h2-generic" if ARCH_BOARD_ESP32H2_GENERIC
default "esp32h2-devkit" if ARCH_BOARD_ESP32H2_DEVKIT
default "et-stm32-stamp" if ARCH_BOARD_ET_STM32_STAMP
default "tlsr8278adk80d" if ARCH_BOARD_TLSR8278ADK80D
default "ez80f910200kitg" if ARCH_BOARD_EZ80F910200KITG
@ -4192,7 +4182,7 @@ if ARCH_BOARD_ESP32C3_DEVKIT_RUST1
source "boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/Kconfig"
endif
if ARCH_BOARD_ESP32C3_GENERIC
source "boards/risc-v/espressif/esp32c3-generic/Kconfig"
source "boards/risc-v/esp32c3/esp32c3-generic/Kconfig"
endif
if ARCH_BOARD_ESP32S2_KALUGA_1
source "boards/xtensa/esp32s2/esp32s2-kaluga-1/Kconfig"
@ -4218,11 +4208,11 @@ endif
if ARCH_BOARD_ESP32S3_BOX
source "boards/xtensa/esp32s3/esp32s3-box/Kconfig"
endif
if ARCH_BOARD_ESP32C6_GENERIC
source "boards/risc-v/espressif/esp32c6-generic/Kconfig"
endif
if ARCH_BOARD_ESP32H2_GENERIC
source "boards/risc-v/espressif/esp32h2-generic/Kconfig"
#if ARCH_BOARD_ESP32C6_DEVKIT
#source "boards/risc-v/esp32c6/esp32c6-devkit/Kconfig"
#endif
if ARCH_BOARD_ESP32H2_DEVKIT
source "boards/risc-v/esp32h2/esp32h2-devkit/Kconfig"
endif
if ARCH_BOARD_SIM
source "boards/sim/sim/sim/Kconfig"
@ -4354,8 +4344,14 @@ endif
if ARCH_CHIP_ESP32C3
source "boards/risc-v/esp32c3-legacy/common/Kconfig"
endif
if ARCH_CHIP_ESPRESSIF
source "boards/risc-v/espressif/common/Kconfig"
if ARCH_CHIP_ESP32C3_GENERIC
source "boards/risc-v/esp32c3/common/Kconfig"
endif
if ARCH_CHIP_ESP32C6
source "boards/risc-v/esp32c6/common/Kconfig"
endif
if ARCH_CHIP_ESP32H2
source "boards/risc-v/esp32h2/common/Kconfig"
endif
if ARCH_CHIP_SAMV7
source "boards/arm/samv7/common/Kconfig"

0
boards/risc-v/espressif/common/Kconfig → boards/risc-v/esp32c3/common/Kconfig
View file

2
boards/risc-v/espressif/common/Makefile → boards/risc-v/esp32c3/common/Makefile
View file

@ -1,5 +1,5 @@
#############################################################################
# boards/risc-v/espressif/common/Makefile
# boards/risc-v/esp32c3/common/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with

8
boards/risc-v/espressif/common/include/esp_board_ledc.h → boards/risc-v/esp32c3/common/include/esp_board_ledc.h
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/common/include/esp_board_ledc.h
* boards/risc-v/esp32c3/common/include/esp_board_ledc.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -18,8 +18,8 @@
*
****************************************************************************/
#ifndef __BOARDS_RISCV_ESPRESSIF_COMMON_INCLUDE_ESP_BOARD_LEDC_H
#define __BOARDS_RISCV_ESPRESSIF_COMMON_INCLUDE_ESP_BOARD_LEDC_H
#ifndef __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP_BOARD_LEDC_H
#define __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP_BOARD_LEDC_H
/****************************************************************************
* Included Files
@ -71,4 +71,4 @@ int board_ledc_setup(void);
#endif
#endif /* __ASSEMBLY__ */
#endif /* __BOARDS_RISCV_ESPRESSIF_COMMON_INCLUDE_ESP_BOARD_LEDC_H */
#endif /* __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP_BOARD_LEDC_H */

0
boards/risc-v/espressif/common/scripts/.gitignore → boards/risc-v/esp32c3/common/scripts/.gitignore vendored
View file

2
boards/risc-v/espressif/common/scripts/common.ld → boards/risc-v/esp32c3/common/scripts/common.ld
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/common/scripts/common.ld
* boards/risc-v/esp32c3/common/scripts/common.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

2
boards/risc-v/espressif/common/scripts/esp32c3_aliases.ld → boards/risc-v/esp32c3/common/scripts/esp32c3_aliases.ld
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/common/scripts/esp32c3_aliases.ld
* boards/risc-v/esp32c3/common/scripts/esp32c3_aliases.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

2
boards/risc-v/espressif/common/scripts/esp32c3_flat_memory.ld → boards/risc-v/esp32c3/common/scripts/esp32c3_flat_memory.ld
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/common/scripts/esp32c3_flat_memory.ld
* boards/risc-v/esp32c3/common/scripts/esp32c3_flat_memory.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

2
boards/risc-v/espressif/common/scripts/esp32c3_legacy_sections.ld → boards/risc-v/esp32c3/common/scripts/esp32c3_legacy_sections.ld
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/common/scripts/esp32c3_legacy_sections.ld
* boards/risc-v/esp32c3/common/scripts/esp32c3_legacy_sections.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

2
boards/risc-v/espressif/common/scripts/esp32c3_mcuboot_sections.ld → boards/risc-v/esp32c3/common/scripts/esp32c3_mcuboot_sections.ld
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/common/scripts/esp32c3_mcuboot_sections.ld
* boards/risc-v/esp32c3/common/scripts/esp32c3_mcuboot_sections.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

1
boards/risc-v/espressif/common/scripts/esp32c3_simple_boot_sections.ld → boards/risc-v/esp32c3/common/scripts/esp32c3_simple_boot_sections.ld
View file

@ -396,4 +396,3 @@ SECTIONS
"RTC reserved segment data does not fit.")
}

2
boards/risc-v/espressif/common/src/Make.defs → boards/risc-v/esp32c3/common/src/Make.defs
View file

@ -1,5 +1,5 @@
#############################################################################
# boards/risc-v/espressif/common/src/Make.defs
# boards/risc-v/esp32c3/common/src/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with

2
boards/risc-v/espressif/common/src/esp_board_ledc.c → boards/risc-v/esp32c3/common/src/esp_board_ledc.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/common/src/esp_board_ledc.c
* boards/risc-v/esp32c3/common/src/esp_board_ledc.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

0
boards/risc-v/espressif/esp32c3-generic/Kconfig → boards/risc-v/esp32c3/esp32c3-generic/Kconfig
View file

4
boards/risc-v/espressif/esp32c3-generic/configs/buttons/defconfig → boards/risc-v/esp32c3/esp32c3-generic/configs/buttons/defconfig
View file

@ -12,8 +12,8 @@ CONFIG_ARCH_BOARD="esp32c3-generic"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C3_GENERIC=y
CONFIG_ARCH_BUTTONS=y
CONFIG_ARCH_CHIP="espressif"
CONFIG_ARCH_CHIP_ESPRESSIF=y
CONFIG_ARCH_CHIP="esp32c3"
CONFIG_ARCH_CHIP_ESP32C3_GENERIC=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_IRQBUTTONS=y
CONFIG_ARCH_RISCV=y

4
boards/risc-v/espressif/esp32c3-generic/configs/gpio/defconfig → boards/risc-v/esp32c3/esp32c3-generic/configs/gpio/defconfig
View file

@ -11,8 +11,8 @@ CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c3-generic"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C3_GENERIC=y
CONFIG_ARCH_CHIP="espressif"
CONFIG_ARCH_CHIP_ESPRESSIF=y
CONFIG_ARCH_CHIP="esp32c3"
CONFIG_ARCH_CHIP_ESP32C3_GENERIC=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y

4
boards/risc-v/espressif/esp32c3-generic/configs/mcuboot_nsh/defconfig → boards/risc-v/esp32c3/esp32c3-generic/configs/mcuboot_nsh/defconfig
View file

@ -11,8 +11,8 @@ CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c3-generic"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C3_GENERIC=y
CONFIG_ARCH_CHIP="espressif"
CONFIG_ARCH_CHIP_ESPRESSIF=y
CONFIG_ARCH_CHIP="esp32c3"
CONFIG_ARCH_CHIP_ESP32C3_GENERIC=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y

4
boards/risc-v/espressif/esp32c3-generic/configs/nsh/defconfig → boards/risc-v/esp32c3/esp32c3-generic/configs/nsh/defconfig
View file

@ -11,8 +11,8 @@ CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c3-generic"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C3_GENERIC=y
CONFIG_ARCH_CHIP="espressif"
CONFIG_ARCH_CHIP_ESPRESSIF=y
CONFIG_ARCH_CHIP="esp32c3"
CONFIG_ARCH_CHIP_ESP32C3_GENERIC=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y

4
boards/risc-v/espressif/esp32c3-generic/configs/pwm/defconfig → boards/risc-v/esp32c3/esp32c3-generic/configs/pwm/defconfig
View file

@ -11,8 +11,8 @@ CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c3-generic"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C3_GENERIC=y
CONFIG_ARCH_CHIP="espressif"
CONFIG_ARCH_CHIP_ESPRESSIF=y
CONFIG_ARCH_CHIP="esp32c3"
CONFIG_ARCH_CHIP_ESP32C3_GENERIC=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y

4
boards/risc-v/espressif/esp32c3-generic/configs/random/defconfig → boards/risc-v/esp32c3/esp32c3-generic/configs/random/defconfig
View file

@ -11,8 +11,8 @@ CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c3-generic"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C3_GENERIC=y
CONFIG_ARCH_CHIP="espressif"
CONFIG_ARCH_CHIP_ESPRESSIF=y
CONFIG_ARCH_CHIP="esp32c3"
CONFIG_ARCH_CHIP_ESP32C3_GENERIC=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y

4
boards/risc-v/espressif/esp32c3-generic/configs/rtc/defconfig → boards/risc-v/esp32c3/esp32c3-generic/configs/rtc/defconfig
View file

@ -11,8 +11,8 @@ CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c3-generic"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C3_GENERIC=y
CONFIG_ARCH_CHIP="espressif"
CONFIG_ARCH_CHIP_ESPRESSIF=y
CONFIG_ARCH_CHIP="esp32c3"
CONFIG_ARCH_CHIP_ESP32C3_GENERIC=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y

4
boards/risc-v/espressif/esp32c3-generic/configs/tickless/defconfig → boards/risc-v/esp32c3/esp32c3-generic/configs/tickless/defconfig
View file

@ -11,8 +11,8 @@ CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c3-generic"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C3_GENERIC=y
CONFIG_ARCH_CHIP="espressif"
CONFIG_ARCH_CHIP_ESPRESSIF=y
CONFIG_ARCH_CHIP="esp32c3"
CONFIG_ARCH_CHIP_ESP32C3_GENERIC=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y

4
boards/risc-v/espressif/esp32c3-generic/configs/timers/defconfig → boards/risc-v/esp32c3/esp32c3-generic/configs/timers/defconfig
View file

@ -11,8 +11,8 @@ CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c3-generic"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C3_GENERIC=y
CONFIG_ARCH_CHIP="espressif"
CONFIG_ARCH_CHIP_ESPRESSIF=y
CONFIG_ARCH_CHIP="esp32c3"
CONFIG_ARCH_CHIP_ESP32C3_GENERIC=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y

4
boards/risc-v/espressif/esp32c3-generic/configs/usbconsole/defconfig → boards/risc-v/esp32c3/esp32c3-generic/configs/usbconsole/defconfig
View file

@ -12,8 +12,8 @@ CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c3-generic"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C3_GENERIC=y
CONFIG_ARCH_CHIP="espressif"
CONFIG_ARCH_CHIP_ESPRESSIF=y
CONFIG_ARCH_CHIP="esp32c3"
CONFIG_ARCH_CHIP_ESP32C3_GENERIC=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y

4
boards/risc-v/espressif/esp32c3-generic/configs/watchdog/defconfig → boards/risc-v/esp32c3/esp32c3-generic/configs/watchdog/defconfig
View file

@ -11,8 +11,8 @@ CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c3-generic"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C3_GENERIC=y
CONFIG_ARCH_CHIP="espressif"
CONFIG_ARCH_CHIP_ESPRESSIF=y
CONFIG_ARCH_CHIP="esp32c3"
CONFIG_ARCH_CHIP_ESP32C3_GENERIC=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y

8
boards/risc-v/espressif/esp32c3-generic/include/board.h → boards/risc-v/esp32c3/esp32c3-generic/include/board.h
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/esp32c3-generic/include/board.h
* boards/risc-v/esp32c3/esp32c3-generic/include/board.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -18,8 +18,8 @@
*
****************************************************************************/
#ifndef __BOARDS_RISCV_ESPRESSIF_ESP32C3_GENERIC_INCLUDE_BOARD_H
#define __BOARDS_RISCV_ESPRESSIF_ESP32C3_GENERIC_INCLUDE_BOARD_H
#ifndef __BOARDS_RISCV_ESP32C3_ESP32C3_GENERIC_INCLUDE_BOARD_H
#define __BOARDS_RISCV_ESP32C3_ESP32C3_GENERIC_INCLUDE_BOARD_H
/****************************************************************************
* Pre-processor Definitions
@ -36,5 +36,5 @@
#define BUTTON_BOOT 9
#endif /* __BOARDS_RISCV_ESPRESSIF_ESP32C3_GENERIC_INCLUDE_BOARD_H */
#endif /* __BOARDS_RISCV_ESP32C3_ESP32C3_GENERIC_INCLUDE_BOARD_H */

2
boards/risc-v/espressif/esp32c3-generic/scripts/Make.defs → boards/risc-v/esp32c3/esp32c3-generic/scripts/Make.defs
View file

@ -1,5 +1,5 @@
############################################################################
# boards/risc-v/espressif/esp32c3-generic/scripts/Make.defs
# boards/risc-v/esp32c3/esp32c3-generic/scripts/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with

2
boards/risc-v/espressif/esp32c3-generic/src/Make.defs → boards/risc-v/esp32c3/esp32c3-generic/src/Make.defs
View file

@ -1,5 +1,5 @@
#############################################################################
# boards/risc-v/espressif/esp32c3-generic/src/Make.defs
# boards/risc-v/esp32c3/esp32c3-generic/src/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with

8
boards/risc-v/espressif/esp32c3-generic/src/esp32c3-generic.h → boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3-generic.h
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/esp32c3-generic/src/esp32c3-generic.h
* boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3-generic.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -18,8 +18,8 @@
*
****************************************************************************/
#ifndef __BOARDS_RISCV_ESPRESSIF_ESP32C3_GENERIC_SRC_ESP32C3_GENERIC_H
#define __BOARDS_RISCV_ESPRESSIF_ESP32C3_GENERIC_SRC_ESP32C3_GENERIC_H
#ifndef __BOARDS_RISCV_ESP32C3_ESP32C3_GENERIC_SRC_ESP32C3_GENERIC_H
#define __BOARDS_RISCV_ESP32C3_ESP32C3_GENERIC_SRC_ESP32C3_GENERIC_H
/****************************************************************************
* Included Files
@ -84,4 +84,4 @@ int esp_gpio_init(void);
#endif
#endif /* __ASSEMBLY__ */
#endif /* __BOARDS_RISCV_ESPRESSIF_ESP32C3_GENERIC_SRC_ESP32C3_GENERIC_H */
#endif /* __BOARDS_RISCV_ESP32C3_ESP32C3_GENERIC_SRC_ESP32C3_GENERIC_H */

2
boards/risc-v/espressif/esp32c3-generic/src/esp32c3_appinit.c → boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_appinit.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/esp32c3-generic/src/esp32c3_appinit.c
* boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_appinit.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

2
boards/risc-v/espressif/esp32c3-generic/src/esp32c3_boot.c → boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_boot.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/esp32c3-generic/src/esp32c3_boot.c
* boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_boot.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

2
boards/risc-v/espressif/esp32c3-generic/src/esp32c3_bringup.c → boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_bringup.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/esp32c3-generic/src/esp32c3_bringup.c
* boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_bringup.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

2
boards/risc-v/espressif/esp32c3-generic/src/esp32c3_buttons.c → boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_buttons.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/esp32c3-generic/src/esp32c3_buttons.c
* boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_buttons.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

2
boards/risc-v/espressif/esp32c3-generic/src/esp32c3_gpio.c → boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_gpio.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/esp32c3-generic/src/esp32c3_gpio.c
* boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_gpio.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

2
boards/risc-v/espressif/esp32c3-generic/src/esp32c3_reset.c → boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_reset.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/esp32c3-generic/src/esp32c3_reset.c
* boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_reset.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

13
boards/risc-v/esp32c6/common/Kconfig Normal file
View file

@ -0,0 +1,13 @@
#
# For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository.
#
config ESPRESSIF_MERGE_BINS
bool "Merge raw binary files into a single file"
default n
---help---
Merge the raw binary files into a single file for flashing to the
device.
This is only useful when the path to binary files (e.g. bootloader)
is provided via the ESPTOOL_BINDIR variable.

33
boards/risc-v/esp32c6/common/Makefile Normal file
View file

@ -0,0 +1,33 @@
#############################################################################
# boards/risc-v/esp32c6/common/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
# ASF licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance with the
# License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
#############################################################################
include $(TOPDIR)/Make.defs
include board/Make.defs
include src/Make.defs
DEPPATH += --dep-path board
DEPPATH += --dep-path src
include $(TOPDIR)/boards/Board.mk
ARCHSRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
BOARDDIR = $(ARCHSRCDIR)$(DELIM)board
CFLAGS += ${INCDIR_PREFIX}$(BOARDDIR)$(DELIM)include

74
boards/risc-v/esp32c6/common/include/esp_board_ledc.h Normal file
View file

@ -0,0 +1,74 @@
/****************************************************************************
* boards/risc-v/esp32c6/common/include/esp_board_ledc.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
****************************************************************************/
#ifndef __BOARDS_RISCV_ESP32C6_COMMON_INCLUDE_ESP_BOARD_LEDC_H
#define __BOARDS_RISCV_ESP32C6_COMMON_INCLUDE_ESP_BOARD_LEDC_H
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#ifndef __ASSEMBLY__
#undef EXTERN
#if defined(__cplusplus)
#define EXTERN extern "C"
extern "C"
{
#else
#define EXTERN extern
#endif
/****************************************************************************
* Public Function Prototypes
****************************************************************************/
/****************************************************************************
* Name: board_ledc_setup
*
* Description:
* Initialize LEDC PWM and register the PWM device.
*
* Input Parameters:
* None.
*
* Returned Value:
* Zero (OK) is returned on success; A negated errno value is returned
* to indicate the nature of any failure.
*
****************************************************************************/
#ifdef CONFIG_ESPRESSIF_LEDC
int board_ledc_setup(void);
#endif
#undef EXTERN
#if defined(__cplusplus)
}
#endif
#endif /* __ASSEMBLY__ */
#endif /* __BOARDS_RISCV_ESP32C6_COMMON_INCLUDE_ESP_BOARD_LEDC_H */

1
boards/risc-v/esp32c6/common/scripts/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
/*.ld.tmp

35
boards/risc-v/esp32c6/common/scripts/common.ld Normal file
View file

@ -0,0 +1,35 @@
/****************************************************************************
* boards/risc-v/esp32c6/common/scripts/common.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
****************************************************************************/
#include <nuttx/config.h>
#if CONFIG_ESPRESSIF_SOC_RTC_MEM_SUPPORTED
# define ESP_BOOTLOADER_RESERVE_RTC 0
/* rtc timer data (s_rtc_timer_retain_mem, see esp_clk.c files).
* For rtc_timer_data_in_rtc_mem section.
*/
# define RTC_TIMER_RESERVE_RTC (24)
# ifdef CONFIG_ARCH_CHIP_ESP32
# define RESERVE_RTC_MEM (RTC_TIMER_RESERVE_RTC)
# else
# define RESERVE_RTC_MEM (ESP_BOOTLOADER_RESERVE_RTC + RTC_TIMER_RESERVE_RTC)
# endif /* CONFIG_ARCH_CHIP_ESP32 */
#endif /* CONFIG_ESPRESSIF_SOC_RTC_MEM_SUPPORTED */

2
boards/risc-v/espressif/common/scripts/esp32c6_aliases.ld → boards/risc-v/esp32c6/common/scripts/esp32c6_aliases.ld
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/common/scripts/esp32c6_aliases.ld
* boards/risc-v/esp32c6/common/scripts/esp32c6_aliases.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

2
boards/risc-v/espressif/common/scripts/esp32c6_flat_memory.ld → boards/risc-v/esp32c6/common/scripts/esp32c6_flat_memory.ld
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/common/scripts/esp32c6_flat_memory.ld
* boards/risc-v/esp32c6/common/scripts/esp32c6_flat_memory.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

2
boards/risc-v/espressif/common/scripts/esp32c6_legacy_sections.ld → boards/risc-v/esp32c6/common/scripts/esp32c6_legacy_sections.ld
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/common/scripts/esp32c6_legacy_sections.ld
* boards/risc-v/esp32c6/common/scripts/esp32c6_legacy_sections.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

31
boards/risc-v/esp32c6/common/src/Make.defs Normal file
View file

@ -0,0 +1,31 @@
#############################################################################
# boards/risc-v/esp32c6/common/src/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
# ASF licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance with the
# License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
#############################################################################
ifeq ($(CONFIG_ARCH_BOARD_COMMON),y)
ifeq ($(CONFIG_ESPRESSIF_LEDC),y)
CSRCS += esp_board_ledc.c
endif
DEPPATH += --dep-path src
VPATH += :src
CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src
endif

147
boards/risc-v/esp32c6/common/src/esp_board_ledc.c Normal file
View file

@ -0,0 +1,147 @@
/****************************************************************************
* boards/risc-v/esp32c6/common/src/esp_board_ledc.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <sys/types.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/board.h>
#include <nuttx/timers/pwm.h>
#include <arch/board/board.h>
#include "espressif/esp_ledc.h"
#include "esp_board_ledc.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#define LEDC_TIMER0 0
#define LEDC_TIMER1 1
#define LEDC_TIMER2 2
#define LEDC_TIMER3 3
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: board_ledc_setup
*
* Description:
* Initialize LEDC PWM and register the PWM device.
*
* Input Parameters:
* None.
*
* Returned Value:
* Zero (OK) is returned on success; A negated errno value is returned
* to indicate the nature of any failure.
*
****************************************************************************/
int board_ledc_setup(void)
{
int ret = OK;
struct pwm_lowerhalf_s *pwm;
#ifdef CONFIG_ESPRESSIF_LEDC_TIMER0
pwm = esp_ledc_init(LEDC_TIMER0);
if (!pwm)
{
syslog(LOG_ERR, "ERROR: Failed to get the LEDC PWM 0 lower half\n");
return -ENODEV;
}
/* Register the PWM driver at "/dev/pwm0" */
ret = pwm_register("/dev/pwm0", pwm);
if (ret < 0)
{
syslog(LOG_ERR, "ERROR: pwm_register failed: %d\n", ret);
return ret;
}
#endif
#ifdef CONFIG_ESPRESSIF_LEDC_TIMER1
pwm = esp_ledc_init(LEDC_TIMER1);
if (!pwm)
{
syslog(LOG_ERR, "ERROR: Failed to get the LEDC PWM 1 lower half\n");
return -ENODEV;
}
/* Register the PWM driver at "/dev/pwm1" */
ret = pwm_register("/dev/pwm1", pwm);
if (ret < 0)
{
syslog(LOG_ERR, "ERROR: pwm_register failed: %d\n", ret);
return ret;
}
#endif
#ifdef CONFIG_ESPRESSIF_LEDC_TIMER2
pwm = esp_ledc_init(LEDC_TIMER2);
if (!pwm)
{
syslog(LOG_ERR, "ERROR: Failed to get the LEDC PWM 2 lower half\n");
return -ENODEV;
}
/* Register the PWM driver at "/dev/pwm2" */
ret = pwm_register("/dev/pwm2", pwm);
if (ret < 0)
{
syslog(LOG_ERR, "ERROR: pwm_register failed: %d\n", ret);
return ret;
}
#endif
#ifdef CONFIG_ESPRESSIF_LEDC_TIMER3
pwm = esp_ledc_init(LEDC_TIMER3);
if (!pwm)
{
syslog(LOG_ERR, "ERROR: Failed to get the LEDC PWM 3 lower half\n");
return -ENODEV;
}
/* Register the PWM driver at "/dev/pwm3" */
ret = pwm_register("/dev/pwm3", pwm);
if (ret < 0)
{
syslog(LOG_ERR, "ERROR: pwm_register failed: %d\n", ret);
return ret;
}
#endif
return ret;
}

4
boards/risc-v/espressif/esp32c6-generic/Kconfig → boards/risc-v/esp32c6/esp32c6-devkit/Kconfig
View file

@ -3,6 +3,6 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
if ARCH_BOARD_ESP32C6_GENERIC
if ARCH_BOARD_ESP32C6_DEVKIT
endif # ARCH_BOARD_ESP32C6_GENERIC
endif # ARCH_BOARD_ESP32C6_DEVKIT

8
boards/risc-v/espressif/esp32c6-generic/configs/buttons/defconfig → boards/risc-v/esp32c6/esp32c6-devkit/configs/buttons/defconfig
View file

@ -8,12 +8,12 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c6-generic"
CONFIG_ARCH_BOARD="esp32c6-devkit"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C6_GENERIC=y
CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y
CONFIG_ARCH_BUTTONS=y
CONFIG_ARCH_CHIP="espressif"
CONFIG_ARCH_CHIP_ESPRESSIF=y
CONFIG_ARCH_CHIP="esp32c6"
CONFIG_ARCH_CHIP_ESP32C6=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_IRQBUTTONS=y
CONFIG_ARCH_RISCV=y

8
boards/risc-v/espressif/esp32c6-generic/configs/gpio/defconfig → boards/risc-v/esp32c6/esp32c6-devkit/configs/gpio/defconfig
View file

@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c6-generic"
CONFIG_ARCH_BOARD="esp32c6-devkit"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C6_GENERIC=y
CONFIG_ARCH_CHIP="espressif"
CONFIG_ARCH_CHIP_ESPRESSIF=y
CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y
CONFIG_ARCH_CHIP="esp32c6"
CONFIG_ARCH_CHIP_ESP32C6=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y

8
boards/risc-v/espressif/esp32c6-generic/configs/nsh/defconfig → boards/risc-v/esp32c6/esp32c6-devkit/configs/nsh/defconfig
View file

@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c6-generic"
CONFIG_ARCH_BOARD="esp32c6-devkit"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C6_GENERIC=y
CONFIG_ARCH_CHIP="espressif"
CONFIG_ARCH_CHIP_ESPRESSIF=y
CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y
CONFIG_ARCH_CHIP="esp32c6"
CONFIG_ARCH_CHIP_ESP32C6=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y

8
boards/risc-v/espressif/esp32c6-generic/configs/ostest/defconfig → boards/risc-v/esp32c6/esp32c6-devkit/configs/ostest/defconfig
View file

@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c6-generic"
CONFIG_ARCH_BOARD="esp32c6-devkit"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C6_GENERIC=y
CONFIG_ARCH_CHIP="espressif"
CONFIG_ARCH_CHIP_ESPRESSIF=y
CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y
CONFIG_ARCH_CHIP="esp32c6"
CONFIG_ARCH_CHIP_ESP32C6=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y

8
boards/risc-v/espressif/esp32c6-generic/configs/pwm/defconfig → boards/risc-v/esp32c6/esp32c6-devkit/configs/pwm/defconfig
View file

@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c6-generic"
CONFIG_ARCH_BOARD="esp32c6-devkit"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C6_GENERIC=y
CONFIG_ARCH_CHIP="espressif"
CONFIG_ARCH_CHIP_ESPRESSIF=y
CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y
CONFIG_ARCH_CHIP="esp32c6"
CONFIG_ARCH_CHIP_ESP32C6=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y

8
boards/risc-v/espressif/esp32c6-generic/configs/random/defconfig → boards/risc-v/esp32c6/esp32c6-devkit/configs/random/defconfig
View file

@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c6-generic"
CONFIG_ARCH_BOARD="esp32c6-devkit"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C6_GENERIC=y
CONFIG_ARCH_CHIP="espressif"
CONFIG_ARCH_CHIP_ESPRESSIF=y
CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y
CONFIG_ARCH_CHIP="esp32c6"
CONFIG_ARCH_CHIP_ESP32C6=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y

8
boards/risc-v/espressif/esp32c6-generic/configs/rtc/defconfig → boards/risc-v/esp32c6/esp32c6-devkit/configs/rtc/defconfig
View file

@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c6-generic"
CONFIG_ARCH_BOARD="esp32c6-devkit"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C6_GENERIC=y
CONFIG_ARCH_CHIP="espressif"
CONFIG_ARCH_CHIP_ESPRESSIF=y
CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y
CONFIG_ARCH_CHIP="esp32c6"
CONFIG_ARCH_CHIP_ESP32C6=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y

53
boards/risc-v/esp32c6/esp32c6-devkit/configs/sotest/defconfig Normal file
View file

@ -0,0 +1,53 @@
#
# This file is autogenerated: PLEASE DO NOT EDIT IT.
#
# You can use "make menuconfig" to make any modifications to the installed .config file.
# You can then do "make savedefconfig" to generate a new defconfig file that includes your
# modifications.
#
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c6-devkit"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y
CONFIG_ARCH_CHIP="esp32c6"
CONFIG_ARCH_CHIP_ESP32C6=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARDCTL_RESET=y
CONFIG_BOARD_LOOPSPERMSEC=15000
CONFIG_BUILTIN=y
CONFIG_DEV_ZERO=y
CONFIG_ESPRESSIF_ESP32C6=y
CONFIG_EXAMPLES_SOTEST=y
CONFIG_FS_PROCFS=y
CONFIG_FS_ROMFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=3072
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_DLFCN=y
CONFIG_LIBC_PERROR_STDOUT=y
CONFIG_LIBC_STRERROR=y
CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LINELEN=64
CONFIG_NSH_READLINE=y
CONFIG_NSH_STRERROR=y
CONFIG_PREALLOC_TIMERS=0
CONFIG_RR_INTERVAL=200
CONFIG_SCHED_BACKTRACE=y
CONFIG_SCHED_WAITPID=y
CONFIG_START_DAY=29
CONFIG_START_MONTH=11
CONFIG_START_YEAR=2019
CONFIG_SYSTEM_DUMPSTACK=y
CONFIG_SYSTEM_NSH=y
CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_OSTEST=y
CONFIG_UART0_SERIAL_CONSOLE=y

8
boards/risc-v/espressif/esp32c6-generic/configs/tickless/defconfig → boards/risc-v/esp32c6/esp32c6-devkit/configs/tickless/defconfig
View file

@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c6-generic"
CONFIG_ARCH_BOARD="esp32c6-devkit"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C6_GENERIC=y
CONFIG_ARCH_CHIP="espressif"
CONFIG_ARCH_CHIP_ESPRESSIF=y
CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y
CONFIG_ARCH_CHIP="esp32c6"
CONFIG_ARCH_CHIP_ESP32C6=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y

8
boards/risc-v/espressif/esp32c6-generic/configs/timers/defconfig → boards/risc-v/esp32c6/esp32c6-devkit/configs/timers/defconfig
View file

@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c6-generic"
CONFIG_ARCH_BOARD="esp32c6-devkit"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C6_GENERIC=y
CONFIG_ARCH_CHIP="espressif"
CONFIG_ARCH_CHIP_ESPRESSIF=y
CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y
CONFIG_ARCH_CHIP="esp32c6"
CONFIG_ARCH_CHIP_ESP32C6=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y

8
boards/risc-v/espressif/esp32c6-generic/configs/usbconsole/defconfig → boards/risc-v/esp32c6/esp32c6-devkit/configs/usbconsole/defconfig
View file

@ -9,11 +9,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c6-generic"
CONFIG_ARCH_BOARD="esp32c6-devkit"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C6_GENERIC=y
CONFIG_ARCH_CHIP="espressif"
CONFIG_ARCH_CHIP_ESPRESSIF=y
CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y
CONFIG_ARCH_CHIP="esp32c6"
CONFIG_ARCH_CHIP_ESP32C6=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y

8
boards/risc-v/espressif/esp32c6-generic/configs/watchdog/defconfig → boards/risc-v/esp32c6/esp32c6-devkit/configs/watchdog/defconfig
View file

@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c6-generic"
CONFIG_ARCH_BOARD="esp32c6-devkit"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C6_GENERIC=y
CONFIG_ARCH_CHIP="espressif"
CONFIG_ARCH_CHIP_ESPRESSIF=y
CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y
CONFIG_ARCH_CHIP="esp32c6"
CONFIG_ARCH_CHIP_ESP32C6=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y

8
boards/risc-v/espressif/esp32c6-generic/include/board.h → boards/risc-v/esp32c6/esp32c6-devkit/include/board.h
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/esp32c6-generic/include/board.h
* boards/risc-v/esp32c6/esp32c6-devkit/include/board.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -18,8 +18,8 @@
*
****************************************************************************/
#ifndef __BOARDS_RISCV_ESPRESSIF_ESP32C6_GENERIC_INCLUDE_BOARD_H
#define __BOARDS_RISCV_ESPRESSIF_ESP32C6_GENERIC_INCLUDE_BOARD_H
#ifndef __BOARDS_RISCV_ESP32C6_ESP32C6_DEVKIT_INCLUDE_BOARD_H
#define __BOARDS_RISCV_ESP32C6_ESP32C6_DEVKIT_INCLUDE_BOARD_H
/****************************************************************************
* Pre-processor Definitions
@ -36,5 +36,5 @@
#define BUTTON_BOOT 9
#endif /* __BOARDS_RISCV_ESPRESSIF_ESP32C6_GENERIC_INCLUDE_BOARD_H */
#endif /* __BOARDS_RISCV_ESP32C6_ESP32C6_DEVKIT_INCLUDE_BOARD_H */

2
boards/risc-v/espressif/esp32h2-generic/scripts/Make.defs → boards/risc-v/esp32c6/esp32c6-devkit/scripts/Make.defs
View file

@ -1,5 +1,5 @@
############################################################################
# boards/risc-v/espressif/esp32h2-generic/scripts/Make.defs
# boards/risc-v/esp32c6/esp32c6-devkit/scripts/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with

2
boards/risc-v/espressif/esp32c6-generic/src/Make.defs → boards/risc-v/esp32c6/esp32c6-devkit/src/Make.defs
View file

@ -1,5 +1,5 @@
#############################################################################
# boards/risc-v/espressif/esp32c6-generic/src/Make.defs
# boards/risc-v/esp32c6/esp32c6-devkit/src/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with

8
boards/risc-v/espressif/esp32c6-generic/src/esp32c6-generic.h → boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6-devkit.h
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/esp32c6-generic/src/esp32c6-generic.h
* boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6-devkit.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -18,8 +18,8 @@
*
****************************************************************************/
#ifndef __BOARDS_RISCV_ESPRESSIF_ESP32C6_GENERIC_SRC_ESP32C6_GENERIC_H
#define __BOARDS_RISCV_ESPRESSIF_ESP32C6_GENERIC_SRC_ESP32C6_GENERIC_H
#ifndef __BOARDS_RISCV_ESP32C6_ESP32C6_DEVKIT_SRC_ESP32C6_DEVKIT_H
#define __BOARDS_RISCV_ESP32C6_ESP32C6_DEVKIT_SRC_ESP32C6_DEVKIT_H
/****************************************************************************
* Included Files
@ -84,4 +84,4 @@ int esp_gpio_init(void);
#endif
#endif /* __ASSEMBLY__ */
#endif /* __BOARDS_RISCV_ESPRESSIF_ESP32C6_GENERIC_SRC_ESP32C6_GENERIC_H */
#endif /* __BOARDS_RISCV_ESP32C6_ESP32C6_DEVKIT_SRC_ESP32C6_DEVKIT_H */

4
boards/risc-v/espressif/esp32c6-generic/src/esp32c6_appinit.c → boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_appinit.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/esp32c6-generic/src/esp32c6_appinit.c
* boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_appinit.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -28,7 +28,7 @@
#include <nuttx/board.h>
#include "esp32c6-generic.h"
#include "esp32c6-devkit.h"
#ifdef CONFIG_BOARDCTL

2
boards/risc-v/espressif/esp32c6-generic/src/esp32c6_boot.c → boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_boot.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/esp32c6-generic/src/esp32c6_boot.c
* boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_boot.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

4
boards/risc-v/espressif/esp32c6-generic/src/esp32c6_bringup.c → boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_bringup.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/esp32c6-generic/src/esp32c6_bringup.c
* boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_bringup.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -60,7 +60,7 @@
# include <nuttx/input/buttons.h>
#endif
#include "esp32c6-generic.h"
#include "esp32c6-devkit.h"
/****************************************************************************
* Pre-processor Definitions

4
boards/risc-v/espressif/esp32c6-generic/src/esp32c6_buttons.c → boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_buttons.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/esp32c6-generic/src/esp32c6_buttons.c
* boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_buttons.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -47,7 +47,7 @@
/* Board */
#include "esp32c6-generic.h"
#include "esp32c6-devkit.h"
#include <arch/board/board.h>
/****************************************************************************

4
boards/risc-v/espressif/esp32c6-generic/src/esp32c6_gpio.c → boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_gpio.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/esp32c6-generic/src/esp32c6_gpio.c
* boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_gpio.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -45,7 +45,7 @@
/* Board */
#include "esp32c6-generic.h"
#include "esp32c6-devkit.h"
#include <arch/board/board.h>
/* HAL */

2
boards/risc-v/espressif/esp32c6-generic/src/esp32c6_reset.c → boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_reset.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/esp32c6-generic/src/esp32c6_reset.c
* boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_reset.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

13
boards/risc-v/esp32h2/common/Kconfig Normal file
View file

@ -0,0 +1,13 @@
#
# For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository.
#
config ESPRESSIF_MERGE_BINS
bool "Merge raw binary files into a single file"
default n
---help---
Merge the raw binary files into a single file for flashing to the
device.
This is only useful when the path to binary files (e.g. bootloader)
is provided via the ESPTOOL_BINDIR variable.

33
boards/risc-v/esp32h2/common/Makefile Normal file
View file

@ -0,0 +1,33 @@
#############################################################################
# boards/risc-v/esp32h2/common/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
# ASF licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance with the
# License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
#############################################################################
include $(TOPDIR)/Make.defs
include board/Make.defs
include src/Make.defs
DEPPATH += --dep-path board
DEPPATH += --dep-path src
include $(TOPDIR)/boards/Board.mk
ARCHSRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
BOARDDIR = $(ARCHSRCDIR)$(DELIM)board
CFLAGS += ${INCDIR_PREFIX}$(BOARDDIR)$(DELIM)include

74
boards/risc-v/esp32h2/common/include/esp_board_ledc.h Normal file
View file

@ -0,0 +1,74 @@
/****************************************************************************
* boards/risc-v/esp32h2/common/include/esp_board_ledc.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
****************************************************************************/
#ifndef __BOARDS_RISCV_ESP32H2_COMMON_INCLUDE_ESP_BOARD_LEDC_H
#define __BOARDS_RISCV_ESP32H2_COMMON_INCLUDE_ESP_BOARD_LEDC_H
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#ifndef __ASSEMBLY__
#undef EXTERN
#if defined(__cplusplus)
#define EXTERN extern "C"
extern "C"
{
#else
#define EXTERN extern
#endif
/****************************************************************************
* Public Function Prototypes
****************************************************************************/
/****************************************************************************
* Name: board_ledc_setup
*
* Description:
* Initialize LEDC PWM and register the PWM device.
*
* Input Parameters:
* None.
*
* Returned Value:
* Zero (OK) is returned on success; A negated errno value is returned
* to indicate the nature of any failure.
*
****************************************************************************/
#ifdef CONFIG_ESPRESSIF_LEDC
int board_ledc_setup(void);
#endif
#undef EXTERN
#if defined(__cplusplus)
}
#endif
#endif /* __ASSEMBLY__ */
#endif /* __BOARDS_RISCV_ESP32H2_COMMON_INCLUDE_ESP_BOARD_LEDC_H */

1
boards/risc-v/esp32h2/common/scripts/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
/*.ld.tmp

35
boards/risc-v/esp32h2/common/scripts/common.ld Normal file
View file

@ -0,0 +1,35 @@
/****************************************************************************
* boards/risc-v/esp32h2/common/scripts/common.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
****************************************************************************/
#include <nuttx/config.h>
#if CONFIG_ESPRESSIF_SOC_RTC_MEM_SUPPORTED
# define ESP_BOOTLOADER_RESERVE_RTC 0
/* rtc timer data (s_rtc_timer_retain_mem, see esp_clk.c files).
* For rtc_timer_data_in_rtc_mem section.
*/
# define RTC_TIMER_RESERVE_RTC (24)
# ifdef CONFIG_ARCH_CHIP_ESP32
# define RESERVE_RTC_MEM (RTC_TIMER_RESERVE_RTC)
# else
# define RESERVE_RTC_MEM (ESP_BOOTLOADER_RESERVE_RTC + RTC_TIMER_RESERVE_RTC)
# endif /* CONFIG_ARCH_CHIP_ESP32 */
#endif /* CONFIG_ESPRESSIF_SOC_RTC_MEM_SUPPORTED */

2
boards/risc-v/espressif/common/scripts/esp32h2_aliases.ld → boards/risc-v/esp32h2/common/scripts/esp32h2_aliases.ld
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/common/scripts/esp32h2_aliases.ld
* boards/risc-v/esp32h2/common/scripts/esp32h2_aliases.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

2
boards/risc-v/espressif/common/scripts/esp32h2_flat_memory.ld → boards/risc-v/esp32h2/common/scripts/esp32h2_flat_memory.ld
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/common/scripts/esp32h2_flat_memory.ld
* boards/risc-v/esp32h2/common/scripts/esp32h2_flat_memory.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

2
boards/risc-v/espressif/common/scripts/esp32h2_legacy_sections.ld → boards/risc-v/esp32h2/common/scripts/esp32h2_legacy_sections.ld
View file

@ -1,5 +1,5 @@
/****************************************************************************
* boards/risc-v/espressif/common/scripts/esp32h2_legacy_sections.ld
* boards/risc-v/esp32h2/common/scripts/esp32h2_legacy_sections.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

Some files were not shown because too many files have changed in this diff Show more