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 2021/06/23 17:14:41 UTC
[incubator-nuttx] 02/05: boards/esp32: Remove the peripherals'
linker script since it's not needed.
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
commit 40d7bbb231d45d2c9957a0cdfdc096bb0533605c
Author: Abdelatif Guettouche <ab...@espressif.com>
AuthorDate: Tue Jun 22 14:20:12 2021 +0100
boards/esp32: Remove the peripherals' linker script since it's not
needed.
Signed-off-by: Abdelatif Guettouche <ab...@espressif.com>
---
.../xtensa/esp32/esp32-devkitc/scripts/Make.defs | 4 +---
.../esp32-devkitc/scripts/esp32_peripherals.ld | 24 ----------------------
.../esp32/esp32-ethernet-kit/scripts/Make.defs | 4 +---
.../scripts/esp32_peripherals.ld | 24 ----------------------
.../esp32/esp32-wrover-kit/scripts/Make.defs | 4 +---
.../esp32-wrover-kit/scripts/esp32_peripherals.ld | 24 ----------------------
6 files changed, 3 insertions(+), 81 deletions(-)
diff --git a/boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs b/boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs
index 873156f..bc80ab2 100644
--- a/boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs
+++ b/boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs
@@ -25,7 +25,6 @@ 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_ESP32_RUN_IRAM),y)
LDSCRIPT2 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_iram.ld
@@ -37,9 +36,8 @@ ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
ARCHSCRIPT = -T "${shell cygpath -w $(LDSCRIPT1)}"
ARCHSCRIPT += -T "${shell cygpath -w $(LDSCRIPT2)}"
ARCHSCRIPT += -T "${shell cygpath -w $(LDSCRIPT3)}"
- ARCHSCRIPT += -T "${shell cygpath -w $(LDSCRIPT4)}"
else
- ARCHSCRIPT = -T$(LDSCRIPT1) -T$(LDSCRIPT2) -T$(LDSCRIPT3) -T$(LDSCRIPT4)
+ ARCHSCRIPT = -T$(LDSCRIPT1) -T$(LDSCRIPT2) -T$(LDSCRIPT3)
endif
ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/boards/xtensa/esp32/esp32-devkitc/scripts/esp32_peripherals.ld b/boards/xtensa/esp32/esp32-devkitc/scripts/esp32_peripherals.ld
deleted file mode 100644
index 46101b2..0000000
--- a/boards/xtensa/esp32/esp32-devkitc/scripts/esp32_peripherals.ld
+++ /dev/null
@@ -1,24 +0,0 @@
-/****************************************************************************
- * boards/xtensa/esp32/esp32-devkitc/scripts/esp32_peripherals.ld
- ****************************************************************************/
-
-PROVIDE ( UART0 = 0x3ff40000 );
-PROVIDE ( SPI1 = 0x3ff42000 );
-PROVIDE ( SPI0 = 0x3ff43000 );
-PROVIDE ( GPIO = 0x3ff44000 );
-PROVIDE ( SIGMADELTA = 0x3ff44f00 );
-PROVIDE ( UHCI1 = 0x3ff4C000 );
-PROVIDE ( I2S0 = 0x3ff4F000 );
-PROVIDE ( UART1 = 0x3ff50000 );
-PROVIDE ( I2C0 = 0x3ff53000 );
-PROVIDE ( UHCI0 = 0x3ff54000 );
-PROVIDE ( RMT = 0x3ff56000 );
-PROVIDE ( PCNT = 0x3ff57000 );
-PROVIDE ( LEDC = 0x3ff59000 );
-PROVIDE ( TIMERG0 = 0x3ff5F000 );
-PROVIDE ( TIMERG1 = 0x3ff60000 );
-PROVIDE ( SPI2 = 0x3ff64000 );
-PROVIDE ( SPI3 = 0x3ff65000 );
-PROVIDE ( I2C1 = 0x3ff67000 );
-PROVIDE ( I2S1 = 0x3ff6D000 );
-PROVIDE ( UART2 = 0x3ff6E000 );
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/scripts/Make.defs b/boards/xtensa/esp32/esp32-ethernet-kit/scripts/Make.defs
index 1b4e115..a13d25e 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/scripts/Make.defs
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/scripts/Make.defs
@@ -25,7 +25,6 @@ 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_ESP32_RUN_IRAM),y)
LDSCRIPT2 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_iram.ld
@@ -37,9 +36,8 @@ ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
ARCHSCRIPT = -T "${shell cygpath -w $(LDSCRIPT1)}"
ARCHSCRIPT += -T "${shell cygpath -w $(LDSCRIPT2)}"
ARCHSCRIPT += -T "${shell cygpath -w $(LDSCRIPT3)}"
- ARCHSCRIPT += -T "${shell cygpath -w $(LDSCRIPT4)}"
else
- ARCHSCRIPT = -T$(LDSCRIPT1) -T$(LDSCRIPT2) -T$(LDSCRIPT3) -T$(LDSCRIPT4)
+ ARCHSCRIPT = -T$(LDSCRIPT1) -T$(LDSCRIPT2) -T$(LDSCRIPT3)
endif
ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/scripts/esp32_peripherals.ld b/boards/xtensa/esp32/esp32-ethernet-kit/scripts/esp32_peripherals.ld
deleted file mode 100644
index 2f3262e..0000000
--- a/boards/xtensa/esp32/esp32-ethernet-kit/scripts/esp32_peripherals.ld
+++ /dev/null
@@ -1,24 +0,0 @@
-/****************************************************************************
- * boards/xtensa/esp32/esp32-ethernet-kit/scripts/esp32_peripherals.ld
- ****************************************************************************/
-
-PROVIDE ( UART0 = 0x3ff40000 );
-PROVIDE ( SPI1 = 0x3ff42000 );
-PROVIDE ( SPI0 = 0x3ff43000 );
-PROVIDE ( GPIO = 0x3ff44000 );
-PROVIDE ( SIGMADELTA = 0x3ff44f00 );
-PROVIDE ( UHCI1 = 0x3ff4C000 );
-PROVIDE ( I2S0 = 0x3ff4F000 );
-PROVIDE ( UART1 = 0x3ff50000 );
-PROVIDE ( I2C0 = 0x3ff53000 );
-PROVIDE ( UHCI0 = 0x3ff54000 );
-PROVIDE ( RMT = 0x3ff56000 );
-PROVIDE ( PCNT = 0x3ff57000 );
-PROVIDE ( LEDC = 0x3ff59000 );
-PROVIDE ( TIMERG0 = 0x3ff5F000 );
-PROVIDE ( TIMERG1 = 0x3ff60000 );
-PROVIDE ( SPI2 = 0x3ff64000 );
-PROVIDE ( SPI3 = 0x3ff65000 );
-PROVIDE ( I2C1 = 0x3ff67000 );
-PROVIDE ( I2S1 = 0x3ff6D000 );
-PROVIDE ( UART2 = 0x3ff6E000 );
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/scripts/Make.defs b/boards/xtensa/esp32/esp32-wrover-kit/scripts/Make.defs
index 4c02ca2..453a790 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/scripts/Make.defs
+++ b/boards/xtensa/esp32/esp32-wrover-kit/scripts/Make.defs
@@ -25,7 +25,6 @@ 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_ESP32_RUN_IRAM),y)
LDSCRIPT2 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_iram.ld
@@ -37,9 +36,8 @@ ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
ARCHSCRIPT = -T "${shell cygpath -w $(LDSCRIPT1)}"
ARCHSCRIPT += -T "${shell cygpath -w $(LDSCRIPT2)}"
ARCHSCRIPT += -T "${shell cygpath -w $(LDSCRIPT3)}"
- ARCHSCRIPT += -T "${shell cygpath -w $(LDSCRIPT4)}"
else
- ARCHSCRIPT = -T$(LDSCRIPT1) -T$(LDSCRIPT2) -T$(LDSCRIPT3) -T$(LDSCRIPT4)
+ ARCHSCRIPT = -T$(LDSCRIPT1) -T$(LDSCRIPT2) -T$(LDSCRIPT3)
endif
ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/scripts/esp32_peripherals.ld b/boards/xtensa/esp32/esp32-wrover-kit/scripts/esp32_peripherals.ld
deleted file mode 100644
index af55704..0000000
--- a/boards/xtensa/esp32/esp32-wrover-kit/scripts/esp32_peripherals.ld
+++ /dev/null
@@ -1,24 +0,0 @@
-/****************************************************************************
- * boards/xtensa/esp32/esp32-wrover-kit/scripts/esp32_peripherals.ld
- ****************************************************************************/
-
-PROVIDE ( UART0 = 0x3ff40000 );
-PROVIDE ( SPI1 = 0x3ff42000 );
-PROVIDE ( SPI0 = 0x3ff43000 );
-PROVIDE ( GPIO = 0x3ff44000 );
-PROVIDE ( SIGMADELTA = 0x3ff44f00 );
-PROVIDE ( UHCI1 = 0x3ff4C000 );
-PROVIDE ( I2S0 = 0x3ff4F000 );
-PROVIDE ( UART1 = 0x3ff50000 );
-PROVIDE ( I2C0 = 0x3ff53000 );
-PROVIDE ( UHCI0 = 0x3ff54000 );
-PROVIDE ( RMT = 0x3ff56000 );
-PROVIDE ( PCNT = 0x3ff57000 );
-PROVIDE ( LEDC = 0x3ff59000 );
-PROVIDE ( TIMERG0 = 0x3ff5F000 );
-PROVIDE ( TIMERG1 = 0x3ff60000 );
-PROVIDE ( SPI2 = 0x3ff64000 );
-PROVIDE ( SPI3 = 0x3ff65000 );
-PROVIDE ( I2C1 = 0x3ff67000 );
-PROVIDE ( I2S1 = 0x3ff6D000 );
-PROVIDE ( UART2 = 0x3ff6E000 );