gustavonihei commented on code in PR #7500: URL: https://github.com/apache/incubator-nuttx/pull/7500#discussion_r1011705029
########## boards/xtensa/esp32s3/esp32s3-eye/scripts/Make.defs: ########## @@ -23,13 +23,26 @@ include $(TOPDIR)/tools/Config.mk include $(TOPDIR)/tools/esp32s3/Config.mk include $(TOPDIR)/arch/xtensa/src/lx7/Toolchain.defs -ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32s3_out.ld -ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32s3.ld -ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32s3_rom.ld -ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32s3_peripherals.ld +# Pick the linker scripts from the board level if they exist, if not +# pick the common linker scripts. + +ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32s3_peripherals.ld +ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32s3_rom.ld + +ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32s3_memory.ld),) + ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32s3_memory.ld Review Comment: Yes, that's exactly my point, NuttX coding standard does not provide any guideline to Makefile formatting and there is simply no consistency as of today. Still, I've applied your suggestions. ########## boards/xtensa/esp32s3/esp32s3-eye/scripts/Make.defs: ########## @@ -23,13 +23,26 @@ include $(TOPDIR)/tools/Config.mk include $(TOPDIR)/tools/esp32s3/Config.mk include $(TOPDIR)/arch/xtensa/src/lx7/Toolchain.defs -ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32s3_out.ld -ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32s3.ld -ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32s3_rom.ld -ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32s3_peripherals.ld +# Pick the linker scripts from the board level if they exist, if not +# pick the common linker scripts. + +ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32s3_peripherals.ld +ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32s3_rom.ld + +ifneq ($(wildcard $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32s3_memory.ld),) + ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32s3_memory.ld Review Comment: Yes, that's exactly my point, NuttX coding standard does not provide any guideline to Makefile formatting and there is simply no consistency as of today. Still, I've applied your suggestions. Thanks. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
