Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-27 11:26:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

boards/xtensa/esp32: Update Make.defs to account for the new location of

Browse Source 
the linker scripts.

Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
This commit is contained in:
Abdelatif Guettouche
2021-07-13 18:55:10 +02:00
committed by Alan Carvalho de Assis
parent e45facf6a8
commit 0aa35850fc
6 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs
+1 -1
View File
@@ -24,7 +24,7 @@ include $(TOPDIR)/tools/esp32/Config.mk
include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs
LDSCRIPT1 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld LDSCRIPT1 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
LDSCRIPT2 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32.ld LDSCRIPT2 = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32.ld
LDSCRIPT3 = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld LDSCRIPT3 = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
ifeq ($(CONFIG_CYGWIN_WINTOOL),y) ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
boards/xtensa/esp32/esp32-devkitc/src/Make.defs
+2 -4
View File
@@ -20,8 +20,6 @@
include $(TOPDIR)/Make.defs include $(TOPDIR)/Make.defs
SCRIPTDIR = $(BOARD_DIR)$(DELIM)scripts
CONFIGFILE = $(TOPDIR)$(DELIM)include$(DELIM)nuttx$(DELIM)config.h CONFIGFILE = $(TOPDIR)$(DELIM)include$(DELIM)nuttx$(DELIM)config.h
CSRCS = esp32_boot.c esp32_bringup.c CSRCS = esp32_boot.c esp32_bringup.c
@@ -53,8 +51,8 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
CSRCS += esp32_buttons.c CSRCS += esp32_buttons.c
endif endif
SCRIPTIN = $(SCRIPTDIR)$(DELIM)esp32.template.ld SCRIPTIN = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32.template.ld
SCRIPTOUT = $(SCRIPTDIR)$(DELIM)esp32_out.ld SCRIPTOUT = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
.PHONY = context distclean .PHONY = context distclean
boards/xtensa/esp32/esp32-ethernet-kit/scripts/Make.defs
+1 -1
View File
@@ -24,7 +24,7 @@ include $(TOPDIR)/tools/esp32/Config.mk
include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs
LDSCRIPT1 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld LDSCRIPT1 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
LDSCRIPT2 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32.ld LDSCRIPT2 = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32.ld
LDSCRIPT3 = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld LDSCRIPT3 = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
ifeq ($(CONFIG_CYGWIN_WINTOOL),y) ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
boards/xtensa/esp32/esp32-ethernet-kit/src/Make.defs
+2 -4
View File
@@ -20,8 +20,6 @@
include $(TOPDIR)/Make.defs include $(TOPDIR)/Make.defs
SCRIPTDIR = $(BOARD_DIR)$(DELIM)scripts
CONFIGFILE = $(TOPDIR)$(DELIM)include$(DELIM)nuttx$(DELIM)config.h CONFIGFILE = $(TOPDIR)$(DELIM)include$(DELIM)nuttx$(DELIM)config.h
CSRCS = esp32_boot.c esp32_bringup.c CSRCS = esp32_boot.c esp32_bringup.c
@@ -45,8 +43,8 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
CSRCS += esp32_buttons.c CSRCS += esp32_buttons.c
endif endif
SCRIPTIN = $(SCRIPTDIR)$(DELIM)esp32.template.ld SCRIPTIN = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32.template.ld
SCRIPTOUT = $(SCRIPTDIR)$(DELIM)esp32_out.ld SCRIPTOUT = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
.PHONY = context distclean .PHONY = context distclean
boards/xtensa/esp32/esp32-wrover-kit/scripts/Make.defs
+1 -1
View File
@@ -24,7 +24,7 @@ include $(TOPDIR)/tools/esp32/Config.mk
include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs
LDSCRIPT1 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld LDSCRIPT1 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
LDSCRIPT2 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32.ld LDSCRIPT2 = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32.ld
LDSCRIPT3 = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld LDSCRIPT3 = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
ifeq ($(CONFIG_CYGWIN_WINTOOL),y) ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
boards/xtensa/esp32/esp32-wrover-kit/src/Make.defs
+2 -4
View File
@@ -20,8 +20,6 @@
include $(TOPDIR)/Make.defs include $(TOPDIR)/Make.defs
SCRIPTDIR = $(BOARD_DIR)$(DELIM)scripts
CONFIGFILE = $(TOPDIR)$(DELIM)include$(DELIM)nuttx$(DELIM)config.h CONFIGFILE = $(TOPDIR)$(DELIM)include$(DELIM)nuttx$(DELIM)config.h
CSRCS = esp32_boot.c esp32_bringup.c CSRCS = esp32_boot.c esp32_bringup.c
@@ -55,8 +53,8 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
CSRCS += esp32_buttons.c CSRCS += esp32_buttons.c
endif endif
SCRIPTIN = $(SCRIPTDIR)$(DELIM)esp32.template.ld SCRIPTIN = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32.template.ld
SCRIPTOUT = $(SCRIPTDIR)$(DELIM)esp32_out.ld SCRIPTOUT = $(BOARD_DIR)$(DELIM)script$(DELIM)esp32_out.ld
.PHONY = context distclean .PHONY = context distclean