mirror of
https://github.com/apache/nuttx.git
synced 2026-05-27 03:05:40 +08:00
xtensa/esp32: Simplify board linker script selection
Signed-off-by: Gustavo Henrique Nihei <gustavo.nihei@espressif.com>
This commit is contained in:
committed by
Xiang Xiao
parent
236ee5c80d
commit
f78c6432d8
@@ -29,12 +29,12 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_INIT_ENTRYPOINT))
|
|||||||
# is appropriate for the host OS
|
# is appropriate for the host OS
|
||||||
|
|
||||||
USER_LIBPATHS = $(addprefix -L,$(call CONVERT_PATH,$(addprefix $(TOPDIR)$(DELIM),$(dir $(USERLIBS)))))
|
USER_LIBPATHS = $(addprefix -L,$(call CONVERT_PATH,$(addprefix $(TOPDIR)$(DELIM),$(dir $(USERLIBS)))))
|
||||||
USER_LDSCRIPT = -T $(call CONVERT_PATH,$(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld)
|
USER_LDSCRIPT = $(call CONVERT_PATH,$(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)protected_memory.ld)
|
||||||
USER_LDSCRIPT += -T $(call CONVERT_PATH,$(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)user-space.ld)
|
USER_LDSCRIPT += $(call CONVERT_PATH,$(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)user-space.ld)
|
||||||
USER_HEXFILE += $(call CONVERT_PATH,$(TOPDIR)$(DELIM)nuttx_user.hex)
|
USER_HEXFILE += $(call CONVERT_PATH,$(TOPDIR)$(DELIM)nuttx_user.hex)
|
||||||
USER_BINFILE += $(call CONVERT_PATH,$(TOPDIR)$(DELIM)nuttx_user.bin)
|
USER_BINFILE += $(call CONVERT_PATH,$(TOPDIR)$(DELIM)nuttx_user.bin)
|
||||||
|
|
||||||
USER_LDFLAGS = --undefined=$(ENTRYPT) --entry=$(ENTRYPT) $(USER_LDSCRIPT)
|
USER_LDFLAGS = --undefined=$(ENTRYPT) --entry=$(ENTRYPT) $(addprefix -T,$(addsuffix .tmp,$(USER_LDSCRIPT)))
|
||||||
|
|
||||||
ifeq ($(CONFIG_DEBUG_LINK_MAP),y)
|
ifeq ($(CONFIG_DEBUG_LINK_MAP),y)
|
||||||
USER_LDFLAGS += --cref -Map="$(TOPDIR)$(DELIM)User.map"
|
USER_LDFLAGS += --cref -Map="$(TOPDIR)$(DELIM)User.map"
|
||||||
@@ -67,9 +67,12 @@ all: $(TOPDIR)$(DELIM)nuttx_user.elf
|
|||||||
$(COBJS): %$(OBJEXT): %.c
|
$(COBJS): %$(OBJEXT): %.c
|
||||||
$(call COMPILE, $<, $@)
|
$(call COMPILE, $<, $@)
|
||||||
|
|
||||||
|
$(addsuffix .tmp,$(USER_LDSCRIPT)): $(USER_LDSCRIPT)
|
||||||
|
$(call PREPROCESS,$(patsubst %.tmp,%,$@),$@)
|
||||||
|
|
||||||
# Create the nuttx_user.elf file containing all of the user-mode code
|
# Create the nuttx_user.elf file containing all of the user-mode code
|
||||||
|
|
||||||
nuttx_user.elf: $(OBJS)
|
nuttx_user.elf: $(OBJS) $(addsuffix .tmp,$(USER_LDSCRIPT))
|
||||||
$(Q) $(LD) -o $@ $(USER_LDFLAGS) $(USER_LIBPATHS) $(OBJS) $(LDSTARTGROUP) $(USER_LDLIBS) $(LDENDGROUP) $(USER_LIBGCC)
|
$(Q) $(LD) -o $@ $(USER_LDFLAGS) $(USER_LIBPATHS) $(OBJS) $(LDSTARTGROUP) $(USER_LDLIBS) $(LDENDGROUP) $(USER_LIBGCC)
|
||||||
|
|
||||||
$(TOPDIR)$(DELIM)nuttx_user.elf: nuttx_user.elf
|
$(TOPDIR)$(DELIM)nuttx_user.elf: nuttx_user.elf
|
||||||
@@ -83,6 +86,7 @@ ifeq ($(CONFIG_RAW_BINARY),y)
|
|||||||
$(Q) echo "CP: nuttx_user.bin"
|
$(Q) echo "CP: nuttx_user.bin"
|
||||||
$(Q) $(OBJCOPY) $(OBJCOPYARGS) -O binary nuttx_user.elf $(USER_BINFILE)
|
$(Q) $(OBJCOPY) $(OBJCOPYARGS) -O binary nuttx_user.elf $(USER_BINFILE)
|
||||||
endif
|
endif
|
||||||
|
$(Q) $(call DELFILE,$(addsuffix .tmp,$(USER_LDSCRIPT)))
|
||||||
|
|
||||||
.depend:
|
.depend:
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
/*.ld.tmp
|
||||||
@@ -1 +0,0 @@
|
|||||||
/esp32_out.ld
|
|
||||||
@@ -23,42 +23,22 @@ include $(TOPDIR)/tools/Config.mk
|
|||||||
include $(TOPDIR)/tools/esp32/Config.mk
|
include $(TOPDIR)/tools/esp32/Config.mk
|
||||||
include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs
|
include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs
|
||||||
|
|
||||||
# This is the generated memory layout linker script. It will always be
|
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
||||||
# generated at the board level.
|
|
||||||
|
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
|
|
||||||
|
|
||||||
# Pick the linker scripts from the board level if they exist, if not
|
# Pick the linker scripts from the board level if they exist, if not
|
||||||
# pick the common linker scripts.
|
# pick the common linker scripts.
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_sections.ld),)
|
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_sections.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,protected_memory.ld)
|
||||||
|
ARCHSCRIPT += $(call FINDSCRIPT,kernel-space.ld)
|
||||||
else
|
else
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld)
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)kernel-space.ld
|
|
||||||
else
|
|
||||||
ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y)
|
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)mcuboot_sections.ld
|
|
||||||
else
|
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)legacy_sections.ld
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld),)
|
ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y)
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld)
|
||||||
else
|
else
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_memory.ld),)
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_memory.ld
|
|
||||||
else
|
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)protected_memory.ld
|
|
||||||
else
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)flat_memory.ld
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ARCHPICFLAGS = -fpic
|
ARCHPICFLAGS = -fpic
|
||||||
|
|||||||
@@ -59,18 +59,6 @@ ifeq ($(CONFIG_NET_W5500),y)
|
|||||||
CSRCS += esp32_w5500.c
|
CSRCS += esp32_w5500.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SCRIPTOUT = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
|
|
||||||
|
|
||||||
.PHONY = context distclean
|
|
||||||
|
|
||||||
$(SCRIPTOUT): $(LDSCRIPT_TEMPLATE) $(CONFIGFILE)
|
|
||||||
$(Q) $(CC) -isystem $(TOPDIR)/include -I $(BOARD_COMMON_DIR)$(DELIM)scripts -C -P -x c -E $(LDSCRIPT_TEMPLATE) -o $@
|
|
||||||
|
|
||||||
context:: $(SCRIPTOUT)
|
|
||||||
|
|
||||||
distclean::
|
|
||||||
$(call DELFILE, $(SCRIPTOUT))
|
|
||||||
|
|
||||||
DEPPATH += --dep-path board
|
DEPPATH += --dep-path board
|
||||||
VPATH += :board
|
VPATH += :board
|
||||||
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
|
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
/esp32_out.ld
|
|
||||||
@@ -23,42 +23,22 @@ include $(TOPDIR)/tools/Config.mk
|
|||||||
include $(TOPDIR)/tools/esp32/Config.mk
|
include $(TOPDIR)/tools/esp32/Config.mk
|
||||||
include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs
|
include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs
|
||||||
|
|
||||||
# This is the generated memory layout linker script. It will always be
|
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
||||||
# generated at the board level.
|
|
||||||
|
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
|
|
||||||
|
|
||||||
# Pick the linker scripts from the board level if they exist, if not
|
# Pick the linker scripts from the board level if they exist, if not
|
||||||
# pick the common linker scripts.
|
# pick the common linker scripts.
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_sections.ld),)
|
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_sections.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,protected_memory.ld)
|
||||||
|
ARCHSCRIPT += $(call FINDSCRIPT,kernel-space.ld)
|
||||||
else
|
else
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld)
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)kernel-space.ld
|
|
||||||
else
|
|
||||||
ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y)
|
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)mcuboot_sections.ld
|
|
||||||
else
|
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)legacy_sections.ld
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld),)
|
ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y)
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld)
|
||||||
else
|
else
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_memory.ld),)
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_memory.ld
|
|
||||||
else
|
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)protected_memory.ld
|
|
||||||
else
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)flat_memory.ld
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ARCHPICFLAGS = -fpic
|
ARCHPICFLAGS = -fpic
|
||||||
|
|||||||
@@ -39,18 +39,6 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
|
|||||||
CSRCS += esp32_buttons.c
|
CSRCS += esp32_buttons.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SCRIPTOUT = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
|
|
||||||
|
|
||||||
.PHONY = context distclean
|
|
||||||
|
|
||||||
$(SCRIPTOUT): $(LDSCRIPT_TEMPLATE) $(CONFIGFILE)
|
|
||||||
$(Q) $(CC) -isystem $(TOPDIR)/include -C -P -x c -E $(LDSCRIPT_TEMPLATE) -o $@
|
|
||||||
|
|
||||||
context:: $(SCRIPTOUT)
|
|
||||||
|
|
||||||
distclean::
|
|
||||||
$(call DELFILE, $(SCRIPTOUT))
|
|
||||||
|
|
||||||
DEPPATH += --dep-path board
|
DEPPATH += --dep-path board
|
||||||
VPATH += :board
|
VPATH += :board
|
||||||
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
|
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
/esp32_out.ld
|
|
||||||
@@ -23,42 +23,22 @@ include $(TOPDIR)/tools/Config.mk
|
|||||||
include $(TOPDIR)/tools/esp32/Config.mk
|
include $(TOPDIR)/tools/esp32/Config.mk
|
||||||
include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs
|
include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs
|
||||||
|
|
||||||
# This is the generated memory layout linker script. It will always be
|
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
||||||
# generated at the board level.
|
|
||||||
|
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
|
|
||||||
|
|
||||||
# Pick the linker scripts from the board level if they exist, if not
|
# Pick the linker scripts from the board level if they exist, if not
|
||||||
# pick the common linker scripts.
|
# pick the common linker scripts.
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_sections.ld),)
|
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_sections.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,protected_memory.ld)
|
||||||
|
ARCHSCRIPT += $(call FINDSCRIPT,kernel-space.ld)
|
||||||
else
|
else
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld)
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)kernel-space.ld
|
|
||||||
else
|
|
||||||
ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y)
|
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)mcuboot_sections.ld
|
|
||||||
else
|
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)legacy_sections.ld
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld),)
|
ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y)
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld)
|
||||||
else
|
else
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_memory.ld),)
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_memory.ld
|
|
||||||
else
|
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)protected_memory.ld
|
|
||||||
else
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)flat_memory.ld
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ARCHPICFLAGS = -fpic
|
ARCHPICFLAGS = -fpic
|
||||||
|
|||||||
@@ -47,18 +47,6 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
|
|||||||
CSRCS += esp32_buttons.c
|
CSRCS += esp32_buttons.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SCRIPTOUT = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
|
|
||||||
|
|
||||||
.PHONY = context distclean
|
|
||||||
|
|
||||||
$(SCRIPTOUT): $(LDSCRIPT_TEMPLATE) $(CONFIGFILE)
|
|
||||||
$(Q) $(CC) -isystem $(TOPDIR)/include -C -P -x c -E $(LDSCRIPT_TEMPLATE) -o $@
|
|
||||||
|
|
||||||
context:: $(SCRIPTOUT)
|
|
||||||
|
|
||||||
distclean::
|
|
||||||
$(call DELFILE, $(SCRIPTOUT))
|
|
||||||
|
|
||||||
DEPPATH += --dep-path board
|
DEPPATH += --dep-path board
|
||||||
VPATH += :board
|
VPATH += :board
|
||||||
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
|
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
/esp32_out.ld
|
|
||||||
@@ -23,42 +23,22 @@ include $(TOPDIR)/tools/Config.mk
|
|||||||
include $(TOPDIR)/tools/esp32/Config.mk
|
include $(TOPDIR)/tools/esp32/Config.mk
|
||||||
include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs
|
include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs
|
||||||
|
|
||||||
# This is the generated memory layout linker script. It will always be
|
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
||||||
# generated at the board level.
|
|
||||||
|
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
|
|
||||||
|
|
||||||
# Pick the linker scripts from the board level if they exist, if not
|
# Pick the linker scripts from the board level if they exist, if not
|
||||||
# pick the common linker scripts.
|
# pick the common linker scripts.
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_sections.ld),)
|
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_sections.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,protected_memory.ld)
|
||||||
|
ARCHSCRIPT += $(call FINDSCRIPT,kernel-space.ld)
|
||||||
else
|
else
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld)
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)kernel-space.ld
|
|
||||||
else
|
|
||||||
ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y)
|
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)mcuboot_sections.ld
|
|
||||||
else
|
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)legacy_sections.ld
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld),)
|
ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y)
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld)
|
||||||
else
|
else
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_memory.ld),)
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_memory.ld
|
|
||||||
else
|
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)protected_memory.ld
|
|
||||||
else
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)flat_memory.ld
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ARCHPICFLAGS = -fpic
|
ARCHPICFLAGS = -fpic
|
||||||
|
|||||||
@@ -49,18 +49,6 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
|
|||||||
CSRCS += esp32_buttons.c
|
CSRCS += esp32_buttons.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SCRIPTOUT = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
|
|
||||||
|
|
||||||
.PHONY = context distclean
|
|
||||||
|
|
||||||
$(SCRIPTOUT): $(LDSCRIPT_TEMPLATE) $(CONFIGFILE)
|
|
||||||
$(Q) $(CC) -isystem $(TOPDIR)/include -C -P -x c -E $(LDSCRIPT_TEMPLATE) -o $@
|
|
||||||
|
|
||||||
context:: $(SCRIPTOUT)
|
|
||||||
|
|
||||||
distclean::
|
|
||||||
$(call DELFILE, $(SCRIPTOUT))
|
|
||||||
|
|
||||||
DEPPATH += --dep-path board
|
DEPPATH += --dep-path board
|
||||||
VPATH += :board
|
VPATH += :board
|
||||||
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
|
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
/esp32_out.ld
|
|
||||||
@@ -23,42 +23,22 @@ include $(TOPDIR)/tools/Config.mk
|
|||||||
include $(TOPDIR)/tools/esp32/Config.mk
|
include $(TOPDIR)/tools/esp32/Config.mk
|
||||||
include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs
|
include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs
|
||||||
|
|
||||||
# This is the generated memory layout linker script. It will always be
|
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
||||||
# generated at the board level.
|
|
||||||
|
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
|
|
||||||
|
|
||||||
# Pick the linker scripts from the board level if they exist, if not
|
# Pick the linker scripts from the board level if they exist, if not
|
||||||
# pick the common linker scripts.
|
# pick the common linker scripts.
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_sections.ld),)
|
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_sections.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,protected_memory.ld)
|
||||||
|
ARCHSCRIPT += $(call FINDSCRIPT,kernel-space.ld)
|
||||||
else
|
else
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld)
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)kernel-space.ld
|
|
||||||
else
|
|
||||||
ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y)
|
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)mcuboot_sections.ld
|
|
||||||
else
|
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)legacy_sections.ld
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld),)
|
ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y)
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld)
|
||||||
else
|
else
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_memory.ld),)
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_memory.ld
|
|
||||||
else
|
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)protected_memory.ld
|
|
||||||
else
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)flat_memory.ld
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ARCHPICFLAGS = -fpic
|
ARCHPICFLAGS = -fpic
|
||||||
|
|||||||
@@ -49,18 +49,6 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
|
|||||||
CSRCS += esp32_buttons.c
|
CSRCS += esp32_buttons.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SCRIPTOUT = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
|
|
||||||
|
|
||||||
.PHONY = context distclean
|
|
||||||
|
|
||||||
$(SCRIPTOUT): $(LDSCRIPT_TEMPLATE) $(CONFIGFILE)
|
|
||||||
$(Q) $(CC) -isystem $(TOPDIR)/include -C -P -x c -E $(LDSCRIPT_TEMPLATE) -o $@
|
|
||||||
|
|
||||||
context:: $(SCRIPTOUT)
|
|
||||||
|
|
||||||
distclean::
|
|
||||||
$(call DELFILE, $(SCRIPTOUT))
|
|
||||||
|
|
||||||
DEPPATH += --dep-path board
|
DEPPATH += --dep-path board
|
||||||
VPATH += :board
|
VPATH += :board
|
||||||
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
|
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
/esp32_out.ld
|
|
||||||
@@ -23,42 +23,22 @@ include $(TOPDIR)/tools/Config.mk
|
|||||||
include $(TOPDIR)/tools/esp32/Config.mk
|
include $(TOPDIR)/tools/esp32/Config.mk
|
||||||
include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs
|
include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs
|
||||||
|
|
||||||
# This is the generated memory layout linker script. It will always be
|
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
||||||
# generated at the board level.
|
|
||||||
|
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
|
|
||||||
|
|
||||||
# Pick the linker scripts from the board level if they exist, if not
|
# Pick the linker scripts from the board level if they exist, if not
|
||||||
# pick the common linker scripts.
|
# pick the common linker scripts.
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_sections.ld),)
|
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_sections.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,protected_memory.ld)
|
||||||
|
ARCHSCRIPT += $(call FINDSCRIPT,kernel-space.ld)
|
||||||
else
|
else
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld)
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)kernel-space.ld
|
|
||||||
else
|
|
||||||
ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y)
|
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)mcuboot_sections.ld
|
|
||||||
else
|
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)legacy_sections.ld
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld),)
|
ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y)
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld)
|
||||||
else
|
else
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_memory.ld),)
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_memory.ld
|
|
||||||
else
|
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)protected_memory.ld
|
|
||||||
else
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)flat_memory.ld
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ARCHPICFLAGS = -fpic
|
ARCHPICFLAGS = -fpic
|
||||||
|
|||||||
@@ -51,18 +51,6 @@ ifeq ($(CONFIG_LPWAN_SX127X),y)
|
|||||||
CSRCS += esp32_sx127x.c
|
CSRCS += esp32_sx127x.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SCRIPTOUT = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
|
|
||||||
|
|
||||||
.PHONY = context distclean
|
|
||||||
|
|
||||||
$(SCRIPTOUT): $(LDSCRIPT_TEMPLATE) $(CONFIGFILE)
|
|
||||||
$(Q) $(CC) -isystem $(TOPDIR)/include -C -P -x c -E $(LDSCRIPT_TEMPLATE) -o $@
|
|
||||||
|
|
||||||
context:: $(SCRIPTOUT)
|
|
||||||
|
|
||||||
distclean::
|
|
||||||
$(call DELFILE, $(SCRIPTOUT))
|
|
||||||
|
|
||||||
DEPPATH += --dep-path board
|
DEPPATH += --dep-path board
|
||||||
VPATH += :board
|
VPATH += :board
|
||||||
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
|
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
/esp32_out.ld
|
|
||||||
@@ -23,42 +23,22 @@ include $(TOPDIR)/tools/Config.mk
|
|||||||
include $(TOPDIR)/tools/esp32/Config.mk
|
include $(TOPDIR)/tools/esp32/Config.mk
|
||||||
include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs
|
include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs
|
||||||
|
|
||||||
# This is the generated memory layout linker script. It will always be
|
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
||||||
# generated at the board level.
|
|
||||||
|
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
|
|
||||||
|
|
||||||
# Pick the linker scripts from the board level if they exist, if not
|
# Pick the linker scripts from the board level if they exist, if not
|
||||||
# pick the common linker scripts.
|
# pick the common linker scripts.
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_sections.ld),)
|
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_sections.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,protected_memory.ld)
|
||||||
|
ARCHSCRIPT += $(call FINDSCRIPT,kernel-space.ld)
|
||||||
else
|
else
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld)
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)kernel-space.ld
|
|
||||||
else
|
|
||||||
ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y)
|
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)mcuboot_sections.ld
|
|
||||||
else
|
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)legacy_sections.ld
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld),)
|
ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y)
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld)
|
||||||
else
|
else
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_memory.ld),)
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_memory.ld
|
|
||||||
else
|
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)protected_memory.ld
|
|
||||||
else
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)flat_memory.ld
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ARCHPICFLAGS = -fpic
|
ARCHPICFLAGS = -fpic
|
||||||
|
|||||||
@@ -55,18 +55,6 @@ ifeq ($(CONFIG_ESP32_TWAI),y)
|
|||||||
CSRCS += esp32_twai.c
|
CSRCS += esp32_twai.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SCRIPTOUT = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
|
|
||||||
|
|
||||||
.PHONY = context distclean
|
|
||||||
|
|
||||||
$(SCRIPTOUT): $(LDSCRIPT_TEMPLATE) $(CONFIGFILE)
|
|
||||||
$(Q) $(CC) -isystem $(TOPDIR)/include -I $(BOARD_COMMON_DIR)$(DELIM)scripts -C -P -x c -E $(LDSCRIPT_TEMPLATE) -o $@
|
|
||||||
|
|
||||||
context:: $(SCRIPTOUT)
|
|
||||||
|
|
||||||
distclean::
|
|
||||||
$(call DELFILE, $(SCRIPTOUT))
|
|
||||||
|
|
||||||
DEPPATH += --dep-path board
|
DEPPATH += --dep-path board
|
||||||
VPATH += :board
|
VPATH += :board
|
||||||
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
|
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
/esp32_out.ld
|
|
||||||
@@ -23,42 +23,22 @@ include $(TOPDIR)/tools/Config.mk
|
|||||||
include $(TOPDIR)/tools/esp32/Config.mk
|
include $(TOPDIR)/tools/esp32/Config.mk
|
||||||
include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs
|
include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs
|
||||||
|
|
||||||
# This is the generated memory layout linker script. It will always be
|
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
||||||
# generated at the board level.
|
|
||||||
|
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
|
|
||||||
|
|
||||||
# Pick the linker scripts from the board level if they exist, if not
|
# Pick the linker scripts from the board level if they exist, if not
|
||||||
# pick the common linker scripts.
|
# pick the common linker scripts.
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_sections.ld),)
|
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_sections.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,protected_memory.ld)
|
||||||
|
ARCHSCRIPT += $(call FINDSCRIPT,kernel-space.ld)
|
||||||
else
|
else
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld)
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)kernel-space.ld
|
|
||||||
else
|
|
||||||
ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y)
|
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)mcuboot_sections.ld
|
|
||||||
else
|
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)legacy_sections.ld
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld),)
|
ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y)
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld)
|
||||||
else
|
else
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_memory.ld),)
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_memory.ld
|
|
||||||
else
|
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)protected_memory.ld
|
|
||||||
else
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)flat_memory.ld
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ARCHPICFLAGS = -fpic
|
ARCHPICFLAGS = -fpic
|
||||||
|
|||||||
@@ -51,18 +51,6 @@ ifeq ($(CONFIG_LPWAN_SX127X),y)
|
|||||||
CSRCS += esp32_sx127x.c
|
CSRCS += esp32_sx127x.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SCRIPTOUT = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
|
|
||||||
|
|
||||||
.PHONY = context distclean
|
|
||||||
|
|
||||||
$(SCRIPTOUT): $(LDSCRIPT_TEMPLATE) $(CONFIGFILE)
|
|
||||||
$(Q) $(CC) -isystem $(TOPDIR)/include -C -P -x c -E $(LDSCRIPT_TEMPLATE) -o $@
|
|
||||||
|
|
||||||
context:: $(SCRIPTOUT)
|
|
||||||
|
|
||||||
distclean::
|
|
||||||
$(call DELFILE, $(SCRIPTOUT))
|
|
||||||
|
|
||||||
DEPPATH += --dep-path board
|
DEPPATH += --dep-path board
|
||||||
VPATH += :board
|
VPATH += :board
|
||||||
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
|
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
/esp32_out.ld
|
|
||||||
@@ -23,42 +23,22 @@ include $(TOPDIR)/tools/Config.mk
|
|||||||
include $(TOPDIR)/tools/esp32/Config.mk
|
include $(TOPDIR)/tools/esp32/Config.mk
|
||||||
include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs
|
include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs
|
||||||
|
|
||||||
# This is the generated memory layout linker script. It will always be
|
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
||||||
# generated at the board level.
|
|
||||||
|
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
|
|
||||||
|
|
||||||
# Pick the linker scripts from the board level if they exist, if not
|
# Pick the linker scripts from the board level if they exist, if not
|
||||||
# pick the common linker scripts.
|
# pick the common linker scripts.
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_sections.ld),)
|
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_sections.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,protected_memory.ld)
|
||||||
|
ARCHSCRIPT += $(call FINDSCRIPT,kernel-space.ld)
|
||||||
else
|
else
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld)
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)kernel-space.ld
|
|
||||||
else
|
|
||||||
ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y)
|
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)mcuboot_sections.ld
|
|
||||||
else
|
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)legacy_sections.ld
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld),)
|
ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y)
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld)
|
||||||
else
|
else
|
||||||
ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
|
ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_memory.ld),)
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_memory.ld
|
|
||||||
else
|
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)protected_memory.ld
|
|
||||||
else
|
|
||||||
LDSCRIPT_TEMPLATE = $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)flat_memory.ld
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ARCHPICFLAGS = -fpic
|
ARCHPICFLAGS = -fpic
|
||||||
|
|||||||
@@ -55,18 +55,6 @@ ifeq ($(CONFIG_ESP32_TWAI),y)
|
|||||||
CSRCS += esp32_twai.c
|
CSRCS += esp32_twai.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SCRIPTOUT = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
|
|
||||||
|
|
||||||
.PHONY = context distclean
|
|
||||||
|
|
||||||
$(SCRIPTOUT): $(LDSCRIPT_TEMPLATE) $(CONFIGFILE)
|
|
||||||
$(Q) $(CC) -isystem $(TOPDIR)/include -I $(BOARD_COMMON_DIR)$(DELIM)scripts -C -P -x c -E $(LDSCRIPT_TEMPLATE) -o $@
|
|
||||||
|
|
||||||
context:: $(SCRIPTOUT)
|
|
||||||
|
|
||||||
distclean::
|
|
||||||
$(call DELFILE, $(SCRIPTOUT))
|
|
||||||
|
|
||||||
DEPPATH += --dep-path board
|
DEPPATH += --dep-path board
|
||||||
VPATH += :board
|
VPATH += :board
|
||||||
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
|
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
|
||||||
|
|||||||
@@ -525,6 +525,15 @@ define RWILDCARD
|
|||||||
$(foreach d,$(wildcard $1/*),$(call RWILDCARD,$d,$2)$(filter $(subst *,%,$2),$d))
|
$(foreach d,$(wildcard $1/*),$(call RWILDCARD,$d,$2)$(filter $(subst *,%,$2),$d))
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
# FINDSCRIPT - Find a given linker script. Prioritize the version from currently
|
||||||
|
# configured board. If not provided, use the linker script from the
|
||||||
|
# board common directory.
|
||||||
|
# Example: $(call FINDSCRIPT,script.ld)
|
||||||
|
|
||||||
|
define FINDSCRIPT
|
||||||
|
$(if $(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)$(1)),$(BOARD_DIR)$(DELIM)scripts$(DELIM)$(1),$(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)$(1))
|
||||||
|
endef
|
||||||
|
|
||||||
# CLEAN - Default clean target
|
# CLEAN - Default clean target
|
||||||
|
|
||||||
ifeq ($(CONFIG_ARCH_COVERAGE),y)
|
ifeq ($(CONFIG_ARCH_COVERAGE),y)
|
||||||
|
|||||||
Reference in New Issue
Block a user