From 452b52a61e6f76b4be0f820c5ba1a00e51e2a0dd Mon Sep 17 00:00:00 2001 From: Abdelatif Guettouche Date: Fri, 4 Dec 2020 17:35:12 +0000 Subject: [PATCH] boards/xtensa/esp32/common: Fix functions' descriptions. Signed-off-by: Abdelatif Guettouche --- .../introduction/detailed_support.rst | 11 +-- boards/Kconfig | 10 +-- .../esp32/common/include/esp32_board_tim.h | 11 +-- .../esp32/common/include/esp32_board_wdt.h | 5 -- .../xtensa/esp32/common/src/esp32_board_tim.c | 5 -- .../xtensa/esp32/common/src/esp32_board_wdt.c | 7 +- .../{esp32-core => esp32-devkitc}/Kconfig | 14 ++-- .../{esp32-core => esp32-devkitc}/README.txt | 68 +++++++------------ .../configs/leds/defconfig | 4 +- .../configs/mmcsdspi/defconfig | 4 +- .../configs/netnsh/defconfig | 4 +- .../configs/nsh/defconfig | 4 +- .../configs/ostest/defconfig | 4 +- .../configs/pm/defconfig | 4 +- .../configs/psram/defconfig | 4 +- .../configs/random/defconfig | 4 +- .../configs/smp/defconfig | 4 +- .../configs/spiflash/defconfig | 4 +- .../configs/timer/defconfig | 4 +- .../configs/wapi/defconfig | 4 +- .../configs/watchdog/defconfig | 4 +- .../include/board.h | 6 +- .../scripts/.gitignore | 0 .../scripts/Config.mk | 4 +- .../scripts/Make.defs | 6 +- .../scripts/esp32-ft232h.cfg | 0 .../scripts/esp32.cfg | 0 .../scripts/esp32.template.ld | 2 +- .../scripts/esp32_flash.ld | 2 +- .../scripts/esp32_iram.ld | 2 +- .../scripts/esp32_peripherals.ld | 2 +- .../scripts/esp32_rom.ld | 0 .../scripts/gnu-elf.ld | 2 +- .../src/Make.defs | 2 +- .../src/esp32-devkitc.h} | 2 +- .../src/esp32_appinit.c | 4 +- .../src/esp32_boot.c | 4 +- .../src/esp32_bringup.c | 4 +- .../src/esp32_mmcsd.c | 4 +- .../src/esp32_reset.c | 2 +- .../src/esp32_spi.c | 4 +- .../src/esp32_spiflash.c | 4 +- .../src/esp32_userleds.c | 6 +- 43 files changed, 104 insertions(+), 141 deletions(-) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/Kconfig (96%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/README.txt (93%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/configs/leds/defconfig (94%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/configs/mmcsdspi/defconfig (95%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/configs/netnsh/defconfig (96%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/configs/nsh/defconfig (94%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/configs/ostest/defconfig (94%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/configs/pm/defconfig (94%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/configs/psram/defconfig (96%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/configs/random/defconfig (94%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/configs/smp/defconfig (95%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/configs/spiflash/defconfig (95%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/configs/timer/defconfig (95%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/configs/wapi/defconfig (96%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/configs/watchdog/defconfig (95%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/include/board.h (96%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/scripts/.gitignore (100%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/scripts/Config.mk (96%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/scripts/Make.defs (96%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/scripts/esp32-ft232h.cfg (100%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/scripts/esp32.cfg (100%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/scripts/esp32.template.ld (97%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/scripts/esp32_flash.ld (98%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/scripts/esp32_iram.ld (98%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/scripts/esp32_peripherals.ld (92%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/scripts/esp32_rom.ld (100%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/scripts/gnu-elf.ld (98%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/src/Make.defs (98%) rename boards/xtensa/esp32/{esp32-core/src/esp32-core.h => esp32-devkitc/src/esp32-devkitc.h} (98%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/src/esp32_appinit.c (97%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/src/esp32_boot.c (97%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/src/esp32_bringup.c (98%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/src/esp32_mmcsd.c (97%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/src/esp32_reset.c (97%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/src/esp32_spi.c (95%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/src/esp32_spiflash.c (98%) rename boards/xtensa/esp32/{esp32-core => esp32-devkitc}/src/esp32_userleds.c (97%) diff --git a/Documentation/introduction/detailed_support.rst b/Documentation/introduction/detailed_support.rst index cb21686cc7..71693b0e4e 100644 --- a/Documentation/introduction/detailed_support.rst +++ b/Documentation/introduction/detailed_support.rst @@ -3060,9 +3060,9 @@ Basic architectural support for Xtensa LX6 processors and the port for the Espressif ESP32 were added in NuttX-7.19. The basic ESP32 port is function in both single CPU and dual CPU SMP configurations. -**Espressif ESP32 Core v2 Board** The NuttX release includes support for -Espressif ESP32 Core v2 board. There is an NSH configuration for each -CPU configuration and an OS test configuration for verificatin of the +**Espressif ESP32 DevkitC V4 Board** The NuttX release includes support for +Espressif ESP32 DevkitC V4 board. There is an NSH configuration for each +CPU configuration and an OS test configuration for verification of the port. **STATUS**. ESP32 support in NuttX-7.19 is functional, but very @@ -3071,10 +3071,11 @@ Outstanding issues include missing clock configuration logic, missing partition tables to support correct configuration from FLASH, and some serial driver pin configuration issues. The configuration is usable despite these limitations. Refer to the NuttX board -`README `__ +`README `__ file for further information. - +Release NuttX-10.0.0 brought a bunch of additions to the ESP32 port. This +includes: I2C, SPI, RTC, PM, Timers, Watchdog Timer and Ethernet. Zilog ZNEO Z16F =============== diff --git a/boards/Kconfig b/boards/Kconfig index 7e6486cb83..32f0681809 100644 --- a/boards/Kconfig +++ b/boards/Kconfig @@ -188,8 +188,8 @@ config ARCH_BOARD_QUICKFEATHER MC3635 accelerometer, DPS310 pressure sensor, IM69D130 PDM microphone, internal programmable FPGA fabric. -config ARCH_BOARD_ESP32CORE - bool "Espressif ESP32 Core board V2" +config ARCH_BOARD_ESP32_DEVKITC + bool "Espressif ESP32 DevkitC board V4" depends on ARCH_CHIP_ESP32 select ARCH_HAVE_LEDS ---help--- @@ -2205,7 +2205,7 @@ config ARCH_BOARD default "efm32gg-stk3700" if ARCH_BOARD_EFM32GG_STK3700 default "ekk-lm3s9b96" if ARCH_BOARD_EKKLM3S9B96 default "quickfeather" if ARCH_BOARD_QUICKFEATHER - default "esp32-core" if ARCH_BOARD_ESP32CORE + default "esp32-devkitc" if ARCH_BOARD_ESP32_DEVKITC default "esp32-ethernet-kit" if ARCH_BOARD_ESP32_ETHERNETKIT default "esp32-wrover-kit" if ARCH_BOARD_ESP32_WROVERKIT default "ez80f910200kitg" if ARCH_BOARD_EZ80F910200KITG @@ -3030,8 +3030,8 @@ endif if ARCH_BOARD_RX65N_GRROSE source "boards/renesas/rx65n/rx65n-grrose/Kconfig" endif -if ARCH_BOARD_ESP32CORE -source "boards/xtensa/esp32/esp32-core/Kconfig" +if ARCH_BOARD_ESP32_DEVKITC +source "boards/xtensa/esp32/esp32-devkitc/Kconfig" endif if ARCH_BOARD_ESP32_ETHERNETKIT source "boards/xtensa/esp32/esp32-ethernet-kit/Kconfig" diff --git a/boards/xtensa/esp32/common/include/esp32_board_tim.h b/boards/xtensa/esp32/common/include/esp32_board_tim.h index 9c728cd4a8..9089110ee7 100644 --- a/boards/xtensa/esp32/common/include/esp32_board_tim.h +++ b/boards/xtensa/esp32/common/include/esp32_board_tim.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_TIMER_H -#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_TIMER_H +#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_TIM_H +#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_TIM_H /**************************************************************************** * Included Files @@ -54,11 +54,6 @@ extern "C" * Description: * Configure the timer driver. * - * Input Parameters: - * devpath - The full path to the timer device. This should be of the - * form /dev/timerX - * timer - The timer's number. - * * Returned Value: * Zero (OK) is returned on success; A negated errno value is returned * to indicate the nature of any failure. @@ -75,4 +70,4 @@ int board_timer_init(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_TIMER_H */ +#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_TIM_H */ diff --git a/boards/xtensa/esp32/common/include/esp32_board_wdt.h b/boards/xtensa/esp32/common/include/esp32_board_wdt.h index 616bc1bb63..aad69f2567 100644 --- a/boards/xtensa/esp32/common/include/esp32_board_wdt.h +++ b/boards/xtensa/esp32/common/include/esp32_board_wdt.h @@ -54,11 +54,6 @@ extern "C" * Description: * Configure the timer driver. * - * Input Parameters: - * devpath - The full path to the timer device. This should be of the - * form /dev/watchdogX - * wdt timer - The wdt timer's number. - * * Returned Value: * Zero (OK) is returned on success; A negated errno value is returned * to indicate the nature of any failure. diff --git a/boards/xtensa/esp32/common/src/esp32_board_tim.c b/boards/xtensa/esp32/common/src/esp32_board_tim.c index fcc976ac99..35b4374741 100644 --- a/boards/xtensa/esp32/common/src/esp32_board_tim.c +++ b/boards/xtensa/esp32/common/src/esp32_board_tim.c @@ -61,11 +61,6 @@ * Description: * Configure the timer driver. * - * Input Parameters: - * devpath - The full path to the timer device. This should be of the - * form /dev/timerX - * timer - The timer's number. - * * Returned Value: * Zero (OK) is returned on success; A negated errno value is returned * to indicate the nature of any failure. diff --git a/boards/xtensa/esp32/common/src/esp32_board_wdt.c b/boards/xtensa/esp32/common/src/esp32_board_wdt.c index 94f57d6b54..57e8338497 100644 --- a/boards/xtensa/esp32/common/src/esp32_board_wdt.c +++ b/boards/xtensa/esp32/common/src/esp32_board_wdt.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/xtensa/esp32/common/src/esp32_wtd.c + * boards/xtensa/esp32/common/src/esp32_wdt.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -56,11 +56,6 @@ * Description: * Configure the timer driver. * - * Input Parameters: - * devpath - The full path to the timer device. This should be of the - * form /dev/watchdogX - * wdt timer - The wdt timer's number. - * * Returned Value: * Zero (OK) is returned on success; A negated errno value is returned * to indicate the nature of any failure. diff --git a/boards/xtensa/esp32/esp32-core/Kconfig b/boards/xtensa/esp32/esp32-devkitc/Kconfig similarity index 96% rename from boards/xtensa/esp32/esp32-core/Kconfig rename to boards/xtensa/esp32/esp32-devkitc/Kconfig index 9a42a5d3cc..84eff9f44d 100644 --- a/boards/xtensa/esp32/esp32-core/Kconfig +++ b/boards/xtensa/esp32/esp32-devkitc/Kconfig @@ -3,21 +3,21 @@ # see the file kconfig-language.txt in the NuttX tools repository. # -if ARCH_BOARD_ESP32CORE +if ARCH_BOARD_ESP32_DEVKITC choice prompt "On-board Crystal Frequency" - default ESP32CORE_XTAL_40MZ + default ESP32_DEVKITC_XTAL_40MZ -config ESP32CORE_XTAL_40MZ +config ESP32_DEVKITC_XTAL_40MZ bool "40MHz" -config ESP32CORE_XTAL_26MHz +config ESP32_DEVKITC_XTAL_26MHz bool "26MHz" endchoice # On-board Crystal Frequency -config ESP32CORE_RUN_IRAM +config ESP32_DEVKITC_RUN_IRAM bool "Run from IRAM" default n ---help--- @@ -38,7 +38,7 @@ config ESP32CORE_RUN_IRAM allows interoperability with the esp-idf system but makes you reliant on the esp-idf design for these parts. Both are possible. -config ESP32CORE_FLASH_IMAGE +config ESP32_DEVKITC_FLASH_IMAGE bool "esp32 flash image" default n ---help--- @@ -189,4 +189,4 @@ config ESP32_SPIRAM_SPIWP_SD3_PIN endif # ESP32_PSRAM -endif # ARCH_BOARD_ESP32CORE +endif # ARCH_BOARD_ESP32_DEVKITC diff --git a/boards/xtensa/esp32/esp32-core/README.txt b/boards/xtensa/esp32/esp32-devkitc/README.txt similarity index 93% rename from boards/xtensa/esp32/esp32-core/README.txt rename to boards/xtensa/esp32/esp32-devkitc/README.txt index 1c54e12c16..25dfedb9b5 100644 --- a/boards/xtensa/esp32/esp32-core/README.txt +++ b/boards/xtensa/esp32/esp32-devkitc/README.txt @@ -1,5 +1,5 @@ -README for the Espressif ESP32 Core board (V2) -============================================== +README for the Espressif ESP32 DevkitC board (V4) +================================================= The ESP32 is a dual-core system from Espressif with two Harvard architecture Xtensa LX6 CPUs. All embedded memory, external memory and @@ -39,6 +39,9 @@ STATUS Espressif is working to include support to WiFi and Bluetooth, but it will depends on their external libraries to get it up and running. + Wifi is supported and there is a config to demonstrate its use. Please, see + configs/wapi. + ESP32 Features ============== @@ -171,7 +174,7 @@ Memory Map NOTE 1: Linker script will reserve space at the beginning of the segment for BT and at the end for trace memory. - NOTE 2: Heap enads at the top of dram_0_seg + NOTE 2: Heap ends at the top of dram_0_seg NOTE 3: Linker script will reserve space at the beginning of the segment for co-processor reserve memory and at the end for ULP coprocessor reserve memory. @@ -328,7 +331,7 @@ OpenOCD for the ESP32 to reflect the physical JTAG adapter connected. NOTE: A copy of this OpenOCD configuration file available in the NuttX - source tree at nuttx/boards/xtensa/esp32/esp32-core/scripts/esp32.cfg . It has these + source tree at nuttx/boards/xtensa/esp32/esp32-devkitc/scripts/esp32.cfg . It has these modifications: - The referenced "set ESP32_RTOS none" line has been uncommented @@ -338,7 +341,7 @@ OpenOCD for the ESP32 NOTE: Another OpenOCD configuration file is available in the NuttX source tree at - nuttx/boards/xtensa/esp32/esp32-core/scripts/esp32-ft232h.cfg . + nuttx/boards/xtensa/esp32/esp32-devkitc/scripts/esp32-ft232h.cfg . It has been tested with: - ESP32-DevKitC V4 @@ -464,7 +467,7 @@ OpenOCD for the ESP32 The instructions at http://www.esp32.com/viewtopic.php?t=381 show use of an FTDI C232HM-DDHSL-0 USB 2.0 high speed to MPSSE cable. - The ESP32 Core v2 board has no on board JTAG connector. It will + The ESP32 DevkitC v4 board has no on board JTAG connector. It will be necessary to make a cable or some other board to connect a JTAG emulator. Refer to http://www.esp32.com/viewtopic.php?t=381 "How to debug ESP32 with JTAG / OpenOCD / GDB 1st part connect the @@ -584,7 +587,7 @@ OpenOCD for the ESP32 Running from IRAM is a good debug option. You should be able to load the ELF directly via JTAG in this case, and you may not need the bootloader. - NuttX supports a configuration option, CONFIG_ESP32CORE_RUN_IRAM, that may be + NuttX supports a configuration option, CONFIG_ESP32_DEVKITC_RUN_IRAM, that may be selected for execution from IRAM. This option simply selects the correct linker script for IRAM execution. @@ -628,12 +631,12 @@ OpenOCD for the ESP32 I did the initial bring-up using the IRAM configuration and OpenOCD. Here is a synopsis of my debug steps: - boards/xtensa/esp32/esp32-core/configs/nsh with + boards/xtensa/esp32/esp32-devkitc/configs/nsh with CONFIG_DEBUG_ASSERTIONS=y CONFIG_DEBUG_FEATURES=y CONFIG_DEBUG_SYMBOLS=y - CONFIG_ESP32CORE_RUN_IRAM=y + CONFIG_ESP32_DEVKITC_RUN_IRAM=y I also made this change configuration which will eliminate all attempts to re-configure serial. It will just use the serial settings as they were left @@ -644,7 +647,7 @@ OpenOCD for the ESP32 Start OpenOCD: cd ../openocde-esp32 - cp ../nuttx/boards/xtensa/esp32/esp32-core/scripts/esp32.cfg . + cp ../nuttx/boards/xtensa/esp32/esp32-devkitc/scripts/esp32.cfg . sudo ./src/openocd -s ./tcl/ -f tcl/interface/ftdi/olimex-arm-usb-ocd.cfg -f ./esp32.cfg Start GDB and load code: @@ -672,7 +675,7 @@ Configurations Each ESP32 core configuration is maintained in sub-directories and can be selected as follow: - tools/configure.sh esp32-core: + tools/configure.sh esp32-devkitc: make oldconfig Before building, make sure the PATH environment variable includes the @@ -681,7 +684,7 @@ Configurations If this is a Windows native build, then configure.bat should be used instead of configure.sh: - configure.bat esp32-core\ + configure.bat esp32-devkitc\ And then build NuttX by simply typing the following. At the conclusion of the make, the nuttx binary will reside in an ELF file called, simply, @@ -710,11 +713,11 @@ NOTES: 3. By default, these configurations assume a 40MHz crystal on- board: - CONFIG_ESP32CORE_XTAL_40MZ=y - # CONFIG_ESP32CORE_XTAL_26MHz is not set + CONFIG_ESP32_DEVKITC_XTAL_40MZ=y + # CONFIG_ESP32_DEVKITC_XTAL_26MHz is not set 4. Default configurations are set to run from FLASH. You will need - to set CONFIG_ESP32CORE_RUN_IRAM=y for now (see the " Executing + to set CONFIG_ESP32_DEVKITC_RUN_IRAM=y for now (see the " Executing and Debugging from FLASH and IRAM" section above). To select this option, do 'make menuconfig'. Then you can find @@ -743,7 +746,7 @@ NOTES: to provide that logic -- hopefully that is coming. As a consequence, whatever clock setup was left when NuttX started is used. For the case of execution out of IRAM with GDB, the - settings in boards/xtensa/esp32/esp32-core/include/board.h work. + settings in boards/xtensa/esp32/esp32-devkitc/include/board.h work. To check the timing, I use a stop watch and: nsh> sleep 60 @@ -858,14 +861,12 @@ NOTES: Things to Do ============ - 1. There is no support for an interrupt stack yet. - - 2. There is no clock initialization logic in place. This depends on logic in + 1. There is no clock initialization logic in place. This depends on logic in Espressif libraries. The board comes up using that basic 40 MHz crystal for clocking. Getting to 80 MHz will require clocking initialization in esp32_clockconfig.c. - 3. I did not implement the lazy co-processor save logic supported by Xtensa. + 2. I did not implement the lazy co-processor save logic supported by Xtensa. That logic works like this: a. CPENABLE is set to zero on each context switch, disabling all co- @@ -879,35 +880,14 @@ Things to Do be saved and restored even if the co-processor was never used, and (2) tasks must explicitly enable and disable co-processors. - 4. Currently the Xtensa port copies register state save information from + 3. Currently the Xtensa port copies register state save information from the stack into the TCB. A more efficient alternative would be to just save a pointer to a register state save area in the TCB. This would add some complexity to signal handling and also also the up_initialstate(). But the performance improvement might be worth the effort. - 5. See SMP-related issues above + 4. See SMP-related issues above - 6. See OpenOCD for the ESP32 above + 5. See OpenOCD for the ESP32 above - 7. Currently will not boot unless serial port initialization is disabled. - This will use the serial port settings as left by the preceding - bootloader: - - I also made this change configuration which will eliminate all attempts to - re-configure serial. It will just use the serial settings as they were left - by the bootloader: - - CONFIG_SUPPRESS_UART_CONFIG=y - - I have not debugged this in detail, but this appears to be an issue with the - implementation of esp32_configgpio() and/or gpio_matrix_out() when called from - the setup logic in arch/xtensa/src/esp32/esp32_serial.c. I am not inclined - to invest a lot in driver debug until the clock configuration is finalized. - - UPDATE: This may have been fixed with PR 457: - - https://bitbucket.org/nuttx/nuttx/pull-requests/457/ - fix-esp32-gpio-enable-reg-and-default-uart/diff - - That has not yet been verified. diff --git a/boards/xtensa/esp32/esp32-core/configs/leds/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/leds/defconfig similarity index 94% rename from boards/xtensa/esp32/esp32-core/configs/leds/defconfig rename to boards/xtensa/esp32/esp32-devkitc/configs/leds/defconfig index 27597de308..5b8af1d533 100644 --- a/boards/xtensa/esp32/esp32-core/configs/leds/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/leds/defconfig @@ -10,8 +10,8 @@ # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" -CONFIG_ARCH_BOARD="esp32-core" -CONFIG_ARCH_BOARD_ESP32CORE=y +CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/xtensa/esp32/esp32-core/configs/mmcsdspi/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mmcsdspi/defconfig similarity index 95% rename from boards/xtensa/esp32/esp32-core/configs/mmcsdspi/defconfig rename to boards/xtensa/esp32/esp32-devkitc/configs/mmcsdspi/defconfig index d959840dd7..5c3a7e7c78 100644 --- a/boards/xtensa/esp32/esp32-core/configs/mmcsdspi/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/mmcsdspi/defconfig @@ -15,8 +15,8 @@ # CONFIG_NSH_CMDPARMS is not set # CONFIG_SPI_EXCHANGE is not set CONFIG_ARCH="xtensa" -CONFIG_ARCH_BOARD="esp32-core" -CONFIG_ARCH_BOARD_ESP32CORE=y +CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/xtensa/esp32/esp32-core/configs/netnsh/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/netnsh/defconfig similarity index 96% rename from boards/xtensa/esp32/esp32-core/configs/netnsh/defconfig rename to boards/xtensa/esp32/esp32-devkitc/configs/netnsh/defconfig index 520af77017..713f2a1731 100644 --- a/boards/xtensa/esp32/esp32-core/configs/netnsh/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/netnsh/defconfig @@ -10,8 +10,8 @@ # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" -CONFIG_ARCH_BOARD="esp32-core" -CONFIG_ARCH_BOARD_ESP32CORE=y +CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/xtensa/esp32/esp32-core/configs/nsh/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/nsh/defconfig similarity index 94% rename from boards/xtensa/esp32/esp32-core/configs/nsh/defconfig rename to boards/xtensa/esp32/esp32-devkitc/configs/nsh/defconfig index c3d3fd7b3b..f7b569e06f 100644 --- a/boards/xtensa/esp32/esp32-core/configs/nsh/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/nsh/defconfig @@ -10,8 +10,8 @@ # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" -CONFIG_ARCH_BOARD="esp32-core" -CONFIG_ARCH_BOARD_ESP32CORE=y +CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/xtensa/esp32/esp32-core/configs/ostest/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/ostest/defconfig similarity index 94% rename from boards/xtensa/esp32/esp32-core/configs/ostest/defconfig rename to boards/xtensa/esp32/esp32-devkitc/configs/ostest/defconfig index 9e2aa22d5f..e0175b02b3 100644 --- a/boards/xtensa/esp32/esp32-core/configs/ostest/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/ostest/defconfig @@ -7,8 +7,8 @@ # # CONFIG_ARCH_LEDS is not set CONFIG_ARCH="xtensa" -CONFIG_ARCH_BOARD="esp32-core" -CONFIG_ARCH_BOARD_ESP32CORE=y +CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/xtensa/esp32/esp32-core/configs/pm/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/pm/defconfig similarity index 94% rename from boards/xtensa/esp32/esp32-core/configs/pm/defconfig rename to boards/xtensa/esp32/esp32-devkitc/configs/pm/defconfig index bd77010de5..6d45066a2c 100644 --- a/boards/xtensa/esp32/esp32-core/configs/pm/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/pm/defconfig @@ -10,8 +10,8 @@ # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" -CONFIG_ARCH_BOARD="esp32-core" -CONFIG_ARCH_BOARD_ESP32CORE=y +CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/xtensa/esp32/esp32-core/configs/psram/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/psram/defconfig similarity index 96% rename from boards/xtensa/esp32/esp32-core/configs/psram/defconfig rename to boards/xtensa/esp32/esp32-devkitc/configs/psram/defconfig index ab954ee9c5..b26a42aa0d 100644 --- a/boards/xtensa/esp32/esp32-core/configs/psram/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/psram/defconfig @@ -10,8 +10,8 @@ # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" -CONFIG_ARCH_BOARD="esp32-core" -CONFIG_ARCH_BOARD_ESP32CORE=y +CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/xtensa/esp32/esp32-core/configs/random/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/random/defconfig similarity index 94% rename from boards/xtensa/esp32/esp32-core/configs/random/defconfig rename to boards/xtensa/esp32/esp32-devkitc/configs/random/defconfig index 177bb12027..c81ecab518 100644 --- a/boards/xtensa/esp32/esp32-core/configs/random/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/random/defconfig @@ -10,8 +10,8 @@ # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" -CONFIG_ARCH_BOARD="esp32-core" -CONFIG_ARCH_BOARD_ESP32CORE=y +CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/xtensa/esp32/esp32-core/configs/smp/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/smp/defconfig similarity index 95% rename from boards/xtensa/esp32/esp32-core/configs/smp/defconfig rename to boards/xtensa/esp32/esp32-devkitc/configs/smp/defconfig index ebe9b4b1e8..fa28eb7803 100644 --- a/boards/xtensa/esp32/esp32-core/configs/smp/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/smp/defconfig @@ -10,8 +10,8 @@ # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" -CONFIG_ARCH_BOARD="esp32-core" -CONFIG_ARCH_BOARD_ESP32CORE=y +CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/xtensa/esp32/esp32-core/configs/spiflash/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig similarity index 95% rename from boards/xtensa/esp32/esp32-core/configs/spiflash/defconfig rename to boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig index 8353045aba..dd6a90d561 100644 --- a/boards/xtensa/esp32/esp32-core/configs/spiflash/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig @@ -10,8 +10,8 @@ # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" -CONFIG_ARCH_BOARD="esp32-core" -CONFIG_ARCH_BOARD_ESP32CORE=y +CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/xtensa/esp32/esp32-core/configs/timer/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/timer/defconfig similarity index 95% rename from boards/xtensa/esp32/esp32-core/configs/timer/defconfig rename to boards/xtensa/esp32/esp32-devkitc/configs/timer/defconfig index 0c3487ff34..d2e2da818f 100644 --- a/boards/xtensa/esp32/esp32-core/configs/timer/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/timer/defconfig @@ -10,8 +10,8 @@ # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" -CONFIG_ARCH_BOARD="esp32-core" -CONFIG_ARCH_BOARD_ESP32CORE=y +CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/xtensa/esp32/esp32-core/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig similarity index 96% rename from boards/xtensa/esp32/esp32-core/configs/wapi/defconfig rename to boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig index ae49d45e93..68e81e6370 100644 --- a/boards/xtensa/esp32/esp32-core/configs/wapi/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig @@ -10,8 +10,8 @@ # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" -CONFIG_ARCH_BOARD="esp32-core" -CONFIG_ARCH_BOARD_ESP32CORE=y +CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/xtensa/esp32/esp32-core/configs/watchdog/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/watchdog/defconfig similarity index 95% rename from boards/xtensa/esp32/esp32-core/configs/watchdog/defconfig rename to boards/xtensa/esp32/esp32-devkitc/configs/watchdog/defconfig index faca96912f..38082587af 100644 --- a/boards/xtensa/esp32/esp32-core/configs/watchdog/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/watchdog/defconfig @@ -10,8 +10,8 @@ # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" -CONFIG_ARCH_BOARD="esp32-core" -CONFIG_ARCH_BOARD_ESP32CORE=y +CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/xtensa/esp32/esp32-core/include/board.h b/boards/xtensa/esp32/esp32-devkitc/include/board.h similarity index 96% rename from boards/xtensa/esp32/esp32-core/include/board.h rename to boards/xtensa/esp32/esp32-devkitc/include/board.h index 094eed1e8d..bcb8000cac 100644 --- a/boards/xtensa/esp32/esp32-core/include/board.h +++ b/boards/xtensa/esp32/esp32-devkitc/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/xtensa/esp32/esp32-core/include/board.h + * boards/xtensa/esp32/esp32-devkitc/include/board.h * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -44,7 +44,7 @@ /* The ESP32 Core board V2 is fitted with either a 26 a 40MHz crystal */ -#ifdef CONFIG_ESP32CORE_XTAL_26MHz +#ifdef CONFIG_ESP32_DEVKITC_XTAL_26MHz # define BOARD_XTAL_FREQUENCY 26000000 #else # define BOARD_XTAL_FREQUENCY 40000000 @@ -75,7 +75,7 @@ * /bootloader_support/src/bootloader_clock.c#L38-L62 */ -#ifdef CONFIG_ESP32CORE_RUN_IRAM +#ifdef CONFIG_ESP32_DEVKITC_RUN_IRAM # define BOARD_CLOCK_FREQUENCY (2 * BOARD_XTAL_FREQUENCY) #else #ifdef CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ diff --git a/boards/xtensa/esp32/esp32-core/scripts/.gitignore b/boards/xtensa/esp32/esp32-devkitc/scripts/.gitignore similarity index 100% rename from boards/xtensa/esp32/esp32-core/scripts/.gitignore rename to boards/xtensa/esp32/esp32-devkitc/scripts/.gitignore diff --git a/boards/xtensa/esp32/esp32-core/scripts/Config.mk b/boards/xtensa/esp32/esp32-devkitc/scripts/Config.mk similarity index 96% rename from boards/xtensa/esp32/esp32-core/scripts/Config.mk rename to boards/xtensa/esp32/esp32-devkitc/scripts/Config.mk index a05af94749..8b74d41940 100644 --- a/boards/xtensa/esp32/esp32-core/scripts/Config.mk +++ b/boards/xtensa/esp32/esp32-devkitc/scripts/Config.mk @@ -1,5 +1,5 @@ ############################################################################ -# boards/xtensa/esp32/esp32-core/scripts/Config.mk +# boards/xtensa/esp32/esp32-devkitc/scripts/Config.mk # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -32,7 +32,7 @@ else PARTITION_TABLE=$(IDF_PATH)/hello_world/build/partition_table/partition-table.bin endif -ifeq ($(CONFIG_ESP32CORE_FLASH_IMAGE),y) +ifeq ($(CONFIG_ESP32_DEVKITC_FLASH_IMAGE),y) define POSTBUILD @echo "MKIMAGE: ESP32 binary" $(Q) if ! esptool.py version ; then \ diff --git a/boards/xtensa/esp32/esp32-core/scripts/Make.defs b/boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs similarity index 96% rename from boards/xtensa/esp32/esp32-core/scripts/Make.defs rename to boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs index 8ca55102dc..669ca47086 100644 --- a/boards/xtensa/esp32/esp32-core/scripts/Make.defs +++ b/boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/xtensa/esp32/esp32-core/scripts/Make.defs +# boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs # # Copyright (C) 2016-2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -35,14 +35,14 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)/boards/xtensa/esp32/esp32-core/scripts/Config.mk +include $(TOPDIR)/boards/xtensa/esp32/esp32-devkitc/scripts/Config.mk include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs LDSCRIPT1 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld LDSCRIPT3 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld LDSCRIPT4 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_peripherals.ld -ifeq ($(CONFIG_ESP32CORE_RUN_IRAM),y) +ifeq ($(CONFIG_ESP32_DEVKITC_RUN_IRAM),y) LDSCRIPT2 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_iram.ld else LDSCRIPT2 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_flash.ld diff --git a/boards/xtensa/esp32/esp32-core/scripts/esp32-ft232h.cfg b/boards/xtensa/esp32/esp32-devkitc/scripts/esp32-ft232h.cfg similarity index 100% rename from boards/xtensa/esp32/esp32-core/scripts/esp32-ft232h.cfg rename to boards/xtensa/esp32/esp32-devkitc/scripts/esp32-ft232h.cfg diff --git a/boards/xtensa/esp32/esp32-core/scripts/esp32.cfg b/boards/xtensa/esp32/esp32-devkitc/scripts/esp32.cfg similarity index 100% rename from boards/xtensa/esp32/esp32-core/scripts/esp32.cfg rename to boards/xtensa/esp32/esp32-devkitc/scripts/esp32.cfg diff --git a/boards/xtensa/esp32/esp32-core/scripts/esp32.template.ld b/boards/xtensa/esp32/esp32-devkitc/scripts/esp32.template.ld similarity index 97% rename from boards/xtensa/esp32/esp32-core/scripts/esp32.template.ld rename to boards/xtensa/esp32/esp32-devkitc/scripts/esp32.template.ld index 454d1e8227..199380e93a 100644 --- a/boards/xtensa/esp32/esp32-core/scripts/esp32.template.ld +++ b/boards/xtensa/esp32/esp32-devkitc/scripts/esp32.template.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/xtensa/esp32/esp32-core/scripts/esp32.template.ld + * boards/xtensa/esp32/esp32-devkitc/scripts/esp32.template.ld * ESP32 Linker Script Memory Layout * * This file describes the memory layout (memory blocks) as virtual diff --git a/boards/xtensa/esp32/esp32-core/scripts/esp32_flash.ld b/boards/xtensa/esp32/esp32-devkitc/scripts/esp32_flash.ld similarity index 98% rename from boards/xtensa/esp32/esp32-core/scripts/esp32_flash.ld rename to boards/xtensa/esp32/esp32-devkitc/scripts/esp32_flash.ld index 2909e8f07b..31dd3fadeb 100644 --- a/boards/xtensa/esp32/esp32-core/scripts/esp32_flash.ld +++ b/boards/xtensa/esp32/esp32-devkitc/scripts/esp32_flash.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/xtensa/esp32/esp32-core/scripts/esp32_flash.ld + * boards/xtensa/esp32/esp32-devkitc/scripts/esp32_flash.ld ****************************************************************************/ /* Default entry point: */ diff --git a/boards/xtensa/esp32/esp32-core/scripts/esp32_iram.ld b/boards/xtensa/esp32/esp32-devkitc/scripts/esp32_iram.ld similarity index 98% rename from boards/xtensa/esp32/esp32-core/scripts/esp32_iram.ld rename to boards/xtensa/esp32/esp32-devkitc/scripts/esp32_iram.ld index 54dcfefa85..c93d88bfb8 100644 --- a/boards/xtensa/esp32/esp32-core/scripts/esp32_iram.ld +++ b/boards/xtensa/esp32/esp32-devkitc/scripts/esp32_iram.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/xtensa/esp32/esp32-core/scripts/esp32_iram.ld + * boards/xtensa/esp32/esp32-devkitc/scripts/esp32_iram.ld ****************************************************************************/ /* Default entry point: */ diff --git a/boards/xtensa/esp32/esp32-core/scripts/esp32_peripherals.ld b/boards/xtensa/esp32/esp32-devkitc/scripts/esp32_peripherals.ld similarity index 92% rename from boards/xtensa/esp32/esp32-core/scripts/esp32_peripherals.ld rename to boards/xtensa/esp32/esp32-devkitc/scripts/esp32_peripherals.ld index 81c7595619..46101b26cf 100644 --- a/boards/xtensa/esp32/esp32-core/scripts/esp32_peripherals.ld +++ b/boards/xtensa/esp32/esp32-devkitc/scripts/esp32_peripherals.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/xtensa/esp32/esp32-core/scripts/esp32_peripherals.ld + * boards/xtensa/esp32/esp32-devkitc/scripts/esp32_peripherals.ld ****************************************************************************/ PROVIDE ( UART0 = 0x3ff40000 ); diff --git a/boards/xtensa/esp32/esp32-core/scripts/esp32_rom.ld b/boards/xtensa/esp32/esp32-devkitc/scripts/esp32_rom.ld similarity index 100% rename from boards/xtensa/esp32/esp32-core/scripts/esp32_rom.ld rename to boards/xtensa/esp32/esp32-devkitc/scripts/esp32_rom.ld diff --git a/boards/xtensa/esp32/esp32-core/scripts/gnu-elf.ld b/boards/xtensa/esp32/esp32-devkitc/scripts/gnu-elf.ld similarity index 98% rename from boards/xtensa/esp32/esp32-core/scripts/gnu-elf.ld rename to boards/xtensa/esp32/esp32-devkitc/scripts/gnu-elf.ld index e867083abb..6430b5de0c 100644 --- a/boards/xtensa/esp32/esp32-core/scripts/gnu-elf.ld +++ b/boards/xtensa/esp32/esp32-devkitc/scripts/gnu-elf.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/xtensa/esp32/esp32-core/scripts/gnu-elf.ld + * boards/xtensa/esp32/esp32-devkitc/scripts/gnu-elf.ld * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/boards/xtensa/esp32/esp32-core/src/Make.defs b/boards/xtensa/esp32/esp32-devkitc/src/Make.defs similarity index 98% rename from boards/xtensa/esp32/esp32-core/src/Make.defs rename to boards/xtensa/esp32/esp32-devkitc/src/Make.defs index 858ca443ca..5ed2881f78 100644 --- a/boards/xtensa/esp32/esp32-core/src/Make.defs +++ b/boards/xtensa/esp32/esp32-devkitc/src/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/xtensa/esp32/esp32-core/src/Makefile +# boards/xtensa/esp32/esp32-devkitc/src/Makefile # # Copyright (C) 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/xtensa/esp32/esp32-core/src/esp32-core.h b/boards/xtensa/esp32/esp32-devkitc/src/esp32-devkitc.h similarity index 98% rename from boards/xtensa/esp32/esp32-core/src/esp32-core.h rename to boards/xtensa/esp32/esp32-devkitc/src/esp32-devkitc.h index 1331c726b4..751ed824c7 100644 --- a/boards/xtensa/esp32/esp32-core/src/esp32-core.h +++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32-devkitc.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/xtensa/esp32/esp32-core/src/esp32-core.h + * boards/xtensa/esp32/esp32-devkitc/src/esp32-devkitc.h * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/xtensa/esp32/esp32-core/src/esp32_appinit.c b/boards/xtensa/esp32/esp32-devkitc/src/esp32_appinit.c similarity index 97% rename from boards/xtensa/esp32/esp32-core/src/esp32_appinit.c rename to boards/xtensa/esp32/esp32-devkitc/src/esp32_appinit.c index efaae9b975..5118cc226e 100644 --- a/boards/xtensa/esp32/esp32-core/src/esp32_appinit.c +++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32_appinit.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/xtensa/esp32/esp32-core/src/esp32_appinit.c + * boards/xtensa/esp32/esp32-devkitc/src/esp32_appinit.c * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -42,7 +42,7 @@ #include #include -#include "esp32-core.h" +#include "esp32-devkitc.h" #ifdef CONFIG_LIB_BOARDCTL diff --git a/boards/xtensa/esp32/esp32-core/src/esp32_boot.c b/boards/xtensa/esp32/esp32-devkitc/src/esp32_boot.c similarity index 97% rename from boards/xtensa/esp32/esp32-core/src/esp32_boot.c rename to boards/xtensa/esp32/esp32-devkitc/src/esp32_boot.c index 8d15fef882..b3c6f7397c 100644 --- a/boards/xtensa/esp32/esp32-core/src/esp32_boot.c +++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32_boot.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/xtensa/esp32/esp32-core/src/esp32_boot.c + * boards/xtensa/esp32/esp32-devkitc/src/esp32_boot.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -29,7 +29,7 @@ #include #include -#include "esp32-core.h" +#include "esp32-devkitc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/boards/xtensa/esp32/esp32-core/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c similarity index 98% rename from boards/xtensa/esp32/esp32-core/src/esp32_bringup.c rename to boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c index 541edaccf7..363ec03596 100644 --- a/boards/xtensa/esp32/esp32-core/src/esp32_bringup.c +++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/xtensa/esp32/esp32-core/src/esp32_bringup.c + * boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -73,7 +73,7 @@ # include "esp32_board_wdt.h" #endif -#include "esp32-core.h" +#include "esp32-devkitc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/boards/xtensa/esp32/esp32-core/src/esp32_mmcsd.c b/boards/xtensa/esp32/esp32-devkitc/src/esp32_mmcsd.c similarity index 97% rename from boards/xtensa/esp32/esp32-core/src/esp32_mmcsd.c rename to boards/xtensa/esp32/esp32-devkitc/src/esp32_mmcsd.c index 484c11eb4f..0f42d14e44 100644 --- a/boards/xtensa/esp32/esp32-core/src/esp32_mmcsd.c +++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32_mmcsd.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/xtensa/esp32/esp32-core/src/esp32_mmcsd.c + * boards/xtensa/esp32/esp32-devkitc/src/esp32_mmcsd.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -32,7 +32,7 @@ #include #include "esp32_spi.h" -#include "esp32-core.h" +#include "esp32-devkitc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/boards/xtensa/esp32/esp32-core/src/esp32_reset.c b/boards/xtensa/esp32/esp32-devkitc/src/esp32_reset.c similarity index 97% rename from boards/xtensa/esp32/esp32-core/src/esp32_reset.c rename to boards/xtensa/esp32/esp32-devkitc/src/esp32_reset.c index 926f312965..bd63ba40ad 100644 --- a/boards/xtensa/esp32/esp32-core/src/esp32_reset.c +++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32_reset.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/xtensa/esp32/esp32-core/src/esp32_reset.c + * boards/xtensa/esp32/esp32-devkitc/src/esp32_reset.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/boards/xtensa/esp32/esp32-core/src/esp32_spi.c b/boards/xtensa/esp32/esp32-devkitc/src/esp32_spi.c similarity index 95% rename from boards/xtensa/esp32/esp32-core/src/esp32_spi.c rename to boards/xtensa/esp32/esp32-devkitc/src/esp32_spi.c index 8a414e3ba0..cbd0bffc43 100644 --- a/boards/xtensa/esp32/esp32-core/src/esp32_spi.c +++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32_spi.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/xtensa/esp32/esp32-core/src/esp32_spi.c + * boards/xtensa/esp32/esp32-devkitc/src/esp32_spi.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -31,7 +31,7 @@ #include #include -#include "esp32-core.h" +#include "esp32-devkitc.h" /**************************************************************************** * Public Functions diff --git a/boards/xtensa/esp32/esp32-core/src/esp32_spiflash.c b/boards/xtensa/esp32/esp32-devkitc/src/esp32_spiflash.c similarity index 98% rename from boards/xtensa/esp32/esp32-core/src/esp32_spiflash.c rename to boards/xtensa/esp32/esp32-devkitc/src/esp32_spiflash.c index 7407117c4c..f2ce40cfaf 100644 --- a/boards/xtensa/esp32/esp32-core/src/esp32_spiflash.c +++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32_spiflash.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/xtensa/esp32/esp32-core/src/esp32_spiflash.c + * boards/xtensa/esp32/esp32-devkitc/src/esp32_spiflash.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -38,7 +38,7 @@ #include #include "esp32_spiflash.h" -#include "esp32-core.h" +#include "esp32-devkitc.h" /**************************************************************************** * Public Functions diff --git a/boards/xtensa/esp32/esp32-core/src/esp32_userleds.c b/boards/xtensa/esp32/esp32-devkitc/src/esp32_userleds.c similarity index 97% rename from boards/xtensa/esp32/esp32-core/src/esp32_userleds.c rename to boards/xtensa/esp32/esp32-devkitc/src/esp32_userleds.c index 3a0b7654b5..09dcbd10c1 100644 --- a/boards/xtensa/esp32/esp32-core/src/esp32_userleds.c +++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32_userleds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/xtensa/esp32/esp32-core/src/esp32_userleds.c + * boards/xtensa/esp32/esp32-devkitc/src/esp32_userleds.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -29,7 +29,9 @@ #include #include #include "esp32_gpio.h" -#include "esp32-core.h" + +#include "esp32-devkitc.h" + /**************************************************************************** * Private Data ****************************************************************************/