From 0aa35850fc755d75210ac87b5e98e735546866aa Mon Sep 17 00:00:00 2001 From: Abdelatif Guettouche Date: Tue, 13 Jul 2021 18:55:10 +0200 Subject: [PATCH] boards/xtensa/esp32: Update Make.defs to account for the new location of the linker scripts. Signed-off-by: Abdelatif Guettouche --- boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs | 2 +- boards/xtensa/esp32/esp32-devkitc/src/Make.defs | 6 ++---- boards/xtensa/esp32/esp32-ethernet-kit/scripts/Make.defs | 2 +- boards/xtensa/esp32/esp32-ethernet-kit/src/Make.defs | 6 ++---- boards/xtensa/esp32/esp32-wrover-kit/scripts/Make.defs | 2 +- boards/xtensa/esp32/esp32-wrover-kit/src/Make.defs | 6 ++---- 6 files changed, 9 insertions(+), 15 deletions(-) diff --git a/boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs b/boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs index bf8cc21f10..ced2c519b0 100644 --- a/boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs +++ b/boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs @@ -24,7 +24,7 @@ include $(TOPDIR)/tools/esp32/Config.mk include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs 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 ifeq ($(CONFIG_CYGWIN_WINTOOL),y) diff --git a/boards/xtensa/esp32/esp32-devkitc/src/Make.defs b/boards/xtensa/esp32/esp32-devkitc/src/Make.defs index a30a0c3e9d..6f91478f93 100644 --- a/boards/xtensa/esp32/esp32-devkitc/src/Make.defs +++ b/boards/xtensa/esp32/esp32-devkitc/src/Make.defs @@ -20,8 +20,6 @@ include $(TOPDIR)/Make.defs -SCRIPTDIR = $(BOARD_DIR)$(DELIM)scripts - CONFIGFILE = $(TOPDIR)$(DELIM)include$(DELIM)nuttx$(DELIM)config.h CSRCS = esp32_boot.c esp32_bringup.c @@ -53,8 +51,8 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += esp32_buttons.c endif -SCRIPTIN = $(SCRIPTDIR)$(DELIM)esp32.template.ld -SCRIPTOUT = $(SCRIPTDIR)$(DELIM)esp32_out.ld +SCRIPTIN = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32.template.ld +SCRIPTOUT = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld .PHONY = context distclean diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/scripts/Make.defs b/boards/xtensa/esp32/esp32-ethernet-kit/scripts/Make.defs index f858a6a410..155f49e7da 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/scripts/Make.defs +++ b/boards/xtensa/esp32/esp32-ethernet-kit/scripts/Make.defs @@ -24,7 +24,7 @@ include $(TOPDIR)/tools/esp32/Config.mk include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs 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 ifeq ($(CONFIG_CYGWIN_WINTOOL),y) diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/src/Make.defs b/boards/xtensa/esp32/esp32-ethernet-kit/src/Make.defs index f0d4593874..054bd97a46 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/src/Make.defs +++ b/boards/xtensa/esp32/esp32-ethernet-kit/src/Make.defs @@ -20,8 +20,6 @@ include $(TOPDIR)/Make.defs -SCRIPTDIR = $(BOARD_DIR)$(DELIM)scripts - CONFIGFILE = $(TOPDIR)$(DELIM)include$(DELIM)nuttx$(DELIM)config.h CSRCS = esp32_boot.c esp32_bringup.c @@ -45,8 +43,8 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += esp32_buttons.c endif -SCRIPTIN = $(SCRIPTDIR)$(DELIM)esp32.template.ld -SCRIPTOUT = $(SCRIPTDIR)$(DELIM)esp32_out.ld +SCRIPTIN = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32.template.ld +SCRIPTOUT = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld .PHONY = context distclean diff --git a/boards/xtensa/esp32/esp32-wrover-kit/scripts/Make.defs b/boards/xtensa/esp32/esp32-wrover-kit/scripts/Make.defs index 761605dec4..1366c36847 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/scripts/Make.defs +++ b/boards/xtensa/esp32/esp32-wrover-kit/scripts/Make.defs @@ -24,7 +24,7 @@ include $(TOPDIR)/tools/esp32/Config.mk include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs 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 ifeq ($(CONFIG_CYGWIN_WINTOOL),y) diff --git a/boards/xtensa/esp32/esp32-wrover-kit/src/Make.defs b/boards/xtensa/esp32/esp32-wrover-kit/src/Make.defs index 968ff30e51..2609cb3c1c 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/src/Make.defs +++ b/boards/xtensa/esp32/esp32-wrover-kit/src/Make.defs @@ -20,8 +20,6 @@ include $(TOPDIR)/Make.defs -SCRIPTDIR = $(BOARD_DIR)$(DELIM)scripts - CONFIGFILE = $(TOPDIR)$(DELIM)include$(DELIM)nuttx$(DELIM)config.h CSRCS = esp32_boot.c esp32_bringup.c @@ -55,8 +53,8 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += esp32_buttons.c endif -SCRIPTIN = $(SCRIPTDIR)$(DELIM)esp32.template.ld -SCRIPTOUT = $(SCRIPTDIR)$(DELIM)esp32_out.ld +SCRIPTIN = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32.template.ld +SCRIPTOUT = $(BOARD_DIR)$(DELIM)script$(DELIM)esp32_out.ld .PHONY = context distclean