You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/07/11 17:10:37 UTC
[incubator-nuttx] branch master updated: boards/xtensa: Remove outdated information.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 6de170b154 boards/xtensa: Remove outdated information.
6de170b154 is described below
commit 6de170b154b3b3f982c71644200c7c15fcbe5f22
Author: Abdelatif Guettouche <ab...@espressif.com>
AuthorDate: Mon Jul 11 12:47:12 2022 +0200
boards/xtensa: Remove outdated information.
Signed-off-by: Abdelatif Guettouche <ab...@espressif.com>
---
boards/xtensa/esp32/esp32-devkitc/include/board.h | 31 +----------------
.../esp32/esp32-ethernet-kit/include/board.h | 39 ++--------------------
.../xtensa/esp32/esp32-wrover-kit/include/board.h | 39 ++--------------------
boards/xtensa/esp32/ttgo_eink5_v2/include/board.h | 29 ----------------
.../xtensa/esp32/ttgo_lora_esp32/include/board.h | 29 ----------------
.../xtensa/esp32s2/esp32s2-saola-1/include/board.h | 27 ---------------
.../xtensa/esp32s3/esp32s3-devkit/include/board.h | 27 ---------------
boards/xtensa/esp32s3/esp32s3-eye/include/board.h | 27 ---------------
8 files changed, 5 insertions(+), 243 deletions(-)
diff --git a/boards/xtensa/esp32/esp32-devkitc/include/board.h b/boards/xtensa/esp32/esp32-devkitc/include/board.h
index 6b645d993b..103c4a9c9e 100644
--- a/boards/xtensa/esp32/esp32-devkitc/include/board.h
+++ b/boards/xtensa/esp32/esp32-devkitc/include/board.h
@@ -27,7 +27,7 @@
/* Clocking *****************************************************************/
-/* The ESP32 Core board V2 is fitted with either a 26 a 40MHz crystal */
+/* The ESP32 Devkit board is fitted with either a 26 a 40MHz crystal */
#ifdef CONFIG_ESP32_XTAL_26MHz
# define BOARD_XTAL_FREQUENCY 26000000
@@ -35,40 +35,11 @@
# define BOARD_XTAL_FREQUENCY 40000000
#endif
-/* Clock reconfiguration is currently disabled, so the CPU will be running
- * at the XTAL frequency or at two times the XTAL frequency, depending upon
- * how we load the code:
- *
- * - If we load the code into FLASH at address 0x1000 where it is started by
- * the second level bootloader, then the frequency is the crystal
- * frequency.
- * - If we load the code into IRAM after the second level bootloader has run
- * this frequency will be twice the crystal frequency.
- *
- * Don't ask me for an explanation.
- */
-
-/* Note: The bootloader (esp-idf bootloader.bin) configures:
- *
- * - CPU frequency to 80MHz
- * - The XTAL frequency according to the SDK config CONFIG_ESP32_XTAL_FREQ,
- * which is 40MHz by default.
- *
- * Reference:
- * https://github.com/espressif/esp-idf/blob
- * /6fd855ab8d00d23bad4660216bc2122c2285d5be/components
- * /bootloader_support/src/bootloader_clock.c#L38-L62
- */
-
-#ifdef CONFIG_ESP32_RUN_IRAM
-# define BOARD_CLOCK_FREQUENCY (2 * BOARD_XTAL_FREQUENCY)
-#else
#ifdef CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ
# define BOARD_CLOCK_FREQUENCY (CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ * 1000000)
#else
# define BOARD_CLOCK_FREQUENCY 80000000
#endif
-#endif
/* LED definitions **********************************************************/
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/include/board.h b/boards/xtensa/esp32/esp32-ethernet-kit/include/board.h
index 46977212a4..6fb43b22d1 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/include/board.h
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/include/board.h
@@ -27,49 +27,14 @@
/* Clocking *****************************************************************/
-/* The ESP32 Ethernet kit board V2 is fitted with either a 26 or a 40MHz
- * crystal
- */
+/* The ESP32 Ethernet kit board uses a 40 MHz crystal oscillator */
-#ifdef CONFIG_ESP32_XTAL_26MHz
-# define BOARD_XTAL_FREQUENCY 26000000
-#else
-# define BOARD_XTAL_FREQUENCY 40000000
-#endif
-
-/* Clock reconfiguration is currently disabled, so the CPU will be running
- * at the XTAL frequency or at two times the XTAL frequency, depending upon
- * how we load the code:
- *
- * - If we load the code into FLASH at address 0x1000 where it is started by
- * the second level bootloader, then the frequency is the crystal
- * frequency.
- * - If we load the code into IRAM after the second level bootloader has run
- * this frequency will be twice the crystal frequency.
- *
- * Don't ask me for an explanation.
- */
+#define BOARD_XTAL_FREQUENCY 40000000
-/* Note: The bootloader (esp-idf bootloader.bin) configures:
- *
- * - CPU frequency to 80MHz
- * - The XTAL frequency according to the SDK config CONFIG_ESP32_XTAL_FREQ,
- * which is 40MHz by default.
- *
- * Reference:
- * https://github.com/espressif/esp-idf/blob
- * /6fd855ab8d00d23bad4660216bc2122c2285d5be/components
- * /bootloader_support/src/bootloader_clock.c#L38-L62
- */
-
-#ifdef CONFIG_ESP32_RUN_IRAM
-# define BOARD_CLOCK_FREQUENCY (2 * BOARD_XTAL_FREQUENCY)
-#else
#ifdef CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ
# define BOARD_CLOCK_FREQUENCY (CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ * 1000000)
#else
# define BOARD_CLOCK_FREQUENCY 80000000
#endif
-#endif
#endif /* __BOARDS_XTENSA_ESP32_ESP32_ETHERNET_KIT_INCLUDE_BOARD_H */
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/include/board.h b/boards/xtensa/esp32/esp32-wrover-kit/include/board.h
index aeda9d47b1..bfcdf4b461 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/include/board.h
+++ b/boards/xtensa/esp32/esp32-wrover-kit/include/board.h
@@ -27,50 +27,15 @@
/* Clocking *****************************************************************/
-/* The ESP32 Ethernet kit board V2 is fitted with either a 26 or a 40MHz
- * crystal
- */
-
-#ifdef CONFIG_ESP32_XTAL_26MHz
-# define BOARD_XTAL_FREQUENCY 26000000
-#else
-# define BOARD_XTAL_FREQUENCY 40000000
-#endif
+/* The ESP32 Wrover kit board uses a 40MHz crystal oscillator. */
-/* Clock reconfiguration is currently disabled, so the CPU will be running
- * at the XTAL frequency or at two times the XTAL frequency, depending upon
- * how we load the code:
- *
- * - If we load the code into FLASH at address 0x1000 where it is started by
- * the second level bootloader, then the frequency is the crystal
- * frequency.
- * - If we load the code into IRAM after the second level bootloader has run
- * this frequency will be twice the crystal frequency.
- *
- * Don't ask me for an explanation.
- */
+#define BOARD_XTAL_FREQUENCY 40000000
-/* Note: The bootloader (esp-idf bootloader.bin) configures:
- *
- * - CPU frequency to 80MHz
- * - The XTAL frequency according to the SDK config CONFIG_ESP32_XTAL_FREQ,
- * which is 40MHz by default.
- *
- * Reference:
- * https://github.com/espressif/esp-idf/blob
- * /6fd855ab8d00d23bad4660216bc2122c2285d5be/components
- * /bootloader_support/src/bootloader_clock.c#L38-L62
- */
-
-#ifdef CONFIG_ESP32_RUN_IRAM
-# define BOARD_CLOCK_FREQUENCY (2 * BOARD_XTAL_FREQUENCY)
-#else
#ifdef CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ
# define BOARD_CLOCK_FREQUENCY (CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ * 1000000)
#else
# define BOARD_CLOCK_FREQUENCY 80000000
#endif
-#endif
/* GPIO definitions *********************************************************/
diff --git a/boards/xtensa/esp32/ttgo_eink5_v2/include/board.h b/boards/xtensa/esp32/ttgo_eink5_v2/include/board.h
index d988c553e5..793ceb91df 100644
--- a/boards/xtensa/esp32/ttgo_eink5_v2/include/board.h
+++ b/boards/xtensa/esp32/ttgo_eink5_v2/include/board.h
@@ -35,40 +35,11 @@
# define BOARD_XTAL_FREQUENCY 40000000
#endif
-/* Clock reconfiguration is currently disabled, so the CPU will be running
- * at the XTAL frequency or at two times the XTAL frequency, depending upon
- * how we load the code:
- *
- * - If we load the code into FLASH at address 0x1000 where it is started by
- * the second level bootloader, then the frequency is the crystal
- * frequency.
- * - If we load the code into IRAM after the second level bootloader has run
- * this frequency will be twice the crystal frequency.
- *
- * Don't ask me for an explanation.
- */
-
-/* Note: The bootloader (esp-idf bootloader.bin) configures:
- *
- * - CPU frequency to 80MHz
- * - The XTAL frequency according to the SDK config CONFIG_ESP32_XTAL_FREQ,
- * which is 40MHz by default.
- *
- * Reference:
- * https://github.com/espressif/esp-idf/blob
- * /6fd855ab8d00d23bad4660216bc2122c2285d5be/components
- * /bootloader_support/src/bootloader_clock.c#L38-L62
- */
-
-#ifdef CONFIG_ESP32_RUN_IRAM
-# define BOARD_CLOCK_FREQUENCY (2 * BOARD_XTAL_FREQUENCY)
-#else
#ifdef CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ
# define BOARD_CLOCK_FREQUENCY (CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ * 1000000)
#else
# define BOARD_CLOCK_FREQUENCY 80000000
#endif
-#endif
/* LED definitions **********************************************************/
diff --git a/boards/xtensa/esp32/ttgo_lora_esp32/include/board.h b/boards/xtensa/esp32/ttgo_lora_esp32/include/board.h
index 8aff8d8000..8ff8ea28a5 100644
--- a/boards/xtensa/esp32/ttgo_lora_esp32/include/board.h
+++ b/boards/xtensa/esp32/ttgo_lora_esp32/include/board.h
@@ -35,40 +35,11 @@
# define BOARD_XTAL_FREQUENCY 40000000
#endif
-/* Clock reconfiguration is currently disabled, so the CPU will be running
- * at the XTAL frequency or at two times the XTAL frequency, depending upon
- * how we load the code:
- *
- * - If we load the code into FLASH at address 0x1000 where it is started by
- * the second level bootloader, then the frequency is the crystal
- * frequency.
- * - If we load the code into IRAM after the second level bootloader has run
- * this frequency will be twice the crystal frequency.
- *
- * Don't ask me for an explanation.
- */
-
-/* Note: The bootloader (esp-idf bootloader.bin) configures:
- *
- * - CPU frequency to 80MHz
- * - The XTAL frequency according to the SDK config CONFIG_ESP32_XTAL_FREQ,
- * which is 40MHz by default.
- *
- * Reference:
- * https://github.com/espressif/esp-idf/blob
- * /6fd855ab8d00d23bad4660216bc2122c2285d5be/components
- * /bootloader_support/src/bootloader_clock.c#L38-L62
- */
-
-#ifdef CONFIG_ESP32_RUN_IRAM
-# define BOARD_CLOCK_FREQUENCY (2 * BOARD_XTAL_FREQUENCY)
-#else
#ifdef CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ
# define BOARD_CLOCK_FREQUENCY (CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ * 1000000)
#else
# define BOARD_CLOCK_FREQUENCY 80000000
#endif
-#endif
/* LED definitions **********************************************************/
diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/include/board.h b/boards/xtensa/esp32s2/esp32s2-saola-1/include/board.h
index ae4fcecd79..2523824a87 100644
--- a/boards/xtensa/esp32s2/esp32s2-saola-1/include/board.h
+++ b/boards/xtensa/esp32s2/esp32s2-saola-1/include/board.h
@@ -37,38 +37,11 @@
#define BOARD_XTAL_FREQUENCY 40000000
-/* Clock reconfiguration is currently disabled, so the CPU will be running
- * at the XTAL frequency or at two times the XTAL frequency, depending upon
- * how we load the code:
- *
- * - If we load the code into FLASH at address 0x1000 where it is started by
- * the second level bootloader, then the frequency is the crystal
- * frequency.
- * - If we load the code into IRAM after the second level bootloader has run
- * this frequency will be twice the crystal frequency.
- *
- * Don't ask me for an explanation.
- */
-
-/* Note: The bootloader (esp-idf bootloader.bin) configures:
- *
- * - CPU frequency to 80MHz
- *
- * Reference:
- * https://github.com/espressif/esp-idf/blob
- * /ebf7e811b12e3c1e347340e5b9ec014e9c6319ba/components
- * /bootloader_support/src/bootloader_clock_init.c#L26-L27
- */
-
-#ifdef CONFIG_ESP32S2_RUN_IRAM
-# define BOARD_CLOCK_FREQUENCY (2 * BOARD_XTAL_FREQUENCY)
-#else
#ifdef CONFIG_ESP32S2_DEFAULT_CPU_FREQ_MHZ
# define BOARD_CLOCK_FREQUENCY (CONFIG_ESP32S2_DEFAULT_CPU_FREQ_MHZ * 1000000)
#else
# define BOARD_CLOCK_FREQUENCY 80000000
#endif
-#endif
/* LED definitions **********************************************************/
diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/include/board.h b/boards/xtensa/esp32s3/esp32s3-devkit/include/board.h
index 727da875b6..2b12b97538 100644
--- a/boards/xtensa/esp32s3/esp32s3-devkit/include/board.h
+++ b/boards/xtensa/esp32s3/esp32s3-devkit/include/board.h
@@ -31,38 +31,11 @@
#define BOARD_XTAL_FREQUENCY 40000000
-/* Clock reconfiguration is currently disabled, so the CPU will be running
- * at the XTAL frequency or at two times the XTAL frequency, depending upon
- * how we load the code:
- *
- * - If we load the code into FLASH at address 0x1000 where it is started by
- * the second level bootloader, then the frequency is the crystal
- * frequency.
- * - If we load the code into IRAM after the second level bootloader has run
- * this frequency will be twice the crystal frequency.
- *
- * Don't ask me for an explanation.
- */
-
-/* Note: The bootloader (esp-idf bootloader.bin) configures:
- *
- * - CPU frequency to 80MHz
- *
- * Reference:
- * https://github.com/espressif/esp-idf/blob
- * /ebf7e811b12e3c1e347340e5b9ec014e9c6319ba/components
- * /bootloader_support/src/bootloader_clock_init.c#L26-L27
- */
-
-#ifdef CONFIG_ESP32S3_RUN_IRAM
-# define BOARD_CLOCK_FREQUENCY (2 * BOARD_XTAL_FREQUENCY)
-#else
#ifdef CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ
# define BOARD_CLOCK_FREQUENCY (CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ * 1000000)
#else
# define BOARD_CLOCK_FREQUENCY 80000000
#endif
-#endif
/* LED definitions **********************************************************/
diff --git a/boards/xtensa/esp32s3/esp32s3-eye/include/board.h b/boards/xtensa/esp32s3/esp32s3-eye/include/board.h
index 7034b3257f..17ff2cec5b 100644
--- a/boards/xtensa/esp32s3/esp32s3-eye/include/board.h
+++ b/boards/xtensa/esp32s3/esp32s3-eye/include/board.h
@@ -31,38 +31,11 @@
#define BOARD_XTAL_FREQUENCY 40000000
-/* Clock reconfiguration is currently disabled, so the CPU will be running
- * at the XTAL frequency or at two times the XTAL frequency, depending upon
- * how we load the code:
- *
- * - If we load the code into FLASH at address 0x1000 where it is started by
- * the second level bootloader, then the frequency is the crystal
- * frequency.
- * - If we load the code into IRAM after the second level bootloader has run
- * this frequency will be twice the crystal frequency.
- *
- * Don't ask me for an explanation.
- */
-
-/* Note: The bootloader (esp-idf bootloader.bin) configures:
- *
- * - CPU frequency to 80MHz
- *
- * Reference:
- * https://github.com/espressif/esp-idf/blob
- * /ebf7e811b12e3c1e347340e5b9ec014e9c6319ba/components
- * /bootloader_support/src/bootloader_clock_init.c#L26-L27
- */
-
-#ifdef CONFIG_ESP32S3_RUN_IRAM
-# define BOARD_CLOCK_FREQUENCY (2 * BOARD_XTAL_FREQUENCY)
-#else
#ifdef CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ
# define BOARD_CLOCK_FREQUENCY (CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ * 1000000)
#else
# define BOARD_CLOCK_FREQUENCY 80000000
#endif
-#endif
/* LED definitions **********************************************************/