This is an automated email from the ASF dual-hosted git repository. acassis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 053a560aa127599f151815bc8f7664f1471562f6 Author: Gustavo Henrique Nihei <[email protected]> AuthorDate: Wed Feb 3 11:55:59 2021 -0300 esp32: Make esp32 boards share a common Config.mk with POSTBUILD command --- .../xtensa/esp32/esp32-devkitc/scripts/Make.defs | 2 +- .../esp32/esp32-ethernet-kit/scripts/Config.mk | 58 ---------------------- .../esp32/esp32-ethernet-kit/scripts/Make.defs | 2 +- .../esp32/esp32-wrover-kit/scripts/Config.mk | 58 ---------------------- .../esp32/esp32-wrover-kit/scripts/Make.defs | 2 +- .../scripts => tools/esp32}/Config.mk | 2 +- 6 files changed, 4 insertions(+), 120 deletions(-) diff --git a/boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs b/boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs index 669ca47..0b4d7f6 100644 --- a/boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs +++ b/boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs @@ -35,7 +35,7 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)/boards/xtensa/esp32/esp32-devkitc/scripts/Config.mk +include $(TOPDIR)/tools/esp32/Config.mk include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs LDSCRIPT1 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/scripts/Config.mk b/boards/xtensa/esp32/esp32-ethernet-kit/scripts/Config.mk deleted file mode 100644 index 6891b49..0000000 --- a/boards/xtensa/esp32/esp32-ethernet-kit/scripts/Config.mk +++ /dev/null @@ -1,58 +0,0 @@ -############################################################################ -# boards/xtensa/esp32/esp32-ethernet-kit/scripts/Config.mk -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. The -# ASF licenses this file to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance with the -# License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -############################################################################ - -# These are the macros that will be used in the NuttX make system to compile -# and assemble source files and to insert the resulting object files into an -# archive. These replace the default definitions at tools/Config.mk - -# POSTBUILD -- Perform post build operations - -ifdef BLOBDIR - BOOTLOADER=${BLOBDIR}/esp32core/bootloader.bin - PARTITION_TABLE=${BLOBDIR}/esp32core/partition-table.bin -else - BOOTLOADER=$(IDF_PATH)/hello_world/build/bootloader/bootloader.bin - PARTITION_TABLE=$(IDF_PATH)/hello_world/build/partition_table/partition-table.bin -endif - -ifeq ($(CONFIG_ESP32_QEMU_IMAGE),y) - MK_QEMU_IMG=$(TOPDIR)/tools/esp32/mk_qemu_img.sh $(BOOTLOADER) $(PARTITION_TABLE) $(NUTTXNAME) -else - MK_QEMU_IMG= -endif - -define POSTBUILD - @echo "MKIMAGE: ESP32 binary" - $(Q) if ! esptool.py version ; then \ - echo ""; \ - echo "Please install ESP-IDF tools"; \ - echo ""; \ - echo "Check https://docs.espressif.com/projects/esp-idf/en/v4.0/get-started/index.html#installation-step-by-step or run the following command"; \ - echo ""; \ - echo "cd tools/esp32 && make && cd ../.."; \ - echo ""; \ - echo "run make again to create the nuttx.bin image."; \ - else \ - echo "Generating: $(NUTTXNAME).bin (ESP32 compatible)"; \ - esptool.py --chip esp32 elf2image --flash_mode dio --flash_size 4MB -o $(NUTTXNAME).bin nuttx; \ - echo "Generated: $(NUTTXNAME).bin (ESP32 compatible)"; \ - fi - $(MK_QEMU_IMG) -endef diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/scripts/Make.defs b/boards/xtensa/esp32/esp32-ethernet-kit/scripts/Make.defs index f5df0f3..920c9c4 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/scripts/Make.defs +++ b/boards/xtensa/esp32/esp32-ethernet-kit/scripts/Make.defs @@ -20,7 +20,7 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)/boards/xtensa/esp32/esp32-ethernet-kit/scripts/Config.mk +include $(TOPDIR)/tools/esp32/Config.mk include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs LDSCRIPT1 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld diff --git a/boards/xtensa/esp32/esp32-wrover-kit/scripts/Config.mk b/boards/xtensa/esp32/esp32-wrover-kit/scripts/Config.mk deleted file mode 100644 index 428c35f..0000000 --- a/boards/xtensa/esp32/esp32-wrover-kit/scripts/Config.mk +++ /dev/null @@ -1,58 +0,0 @@ -############################################################################ -# boards/xtensa/esp32/esp32-wrover-kit/scripts/Config.mk -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. The -# ASF licenses this file to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance with the -# License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -############################################################################ - -# These are the macros that will be used in the NuttX make system to compile -# and assemble source files and to insert the resulting object files into an -# archive. These replace the default definitions at tools/Config.mk - -# POSTBUILD -- Perform post build operations - -ifdef BLOBDIR - BOOTLOADER=${BLOBDIR}/esp32core/bootloader.bin - PARTITION_TABLE=${BLOBDIR}/esp32core/partition-table.bin -else - BOOTLOADER=$(IDF_PATH)/hello_world/build/bootloader/bootloader.bin - PARTITION_TABLE=$(IDF_PATH)/hello_world/build/partition_table/partition-table.bin -endif - -ifeq ($(CONFIG_ESP32_QEMU_IMAGE),y) - MK_QEMU_IMG=$(TOPDIR)/tools/esp32/mk_qemu_img.sh $(BOOTLOADER) $(PARTITION_TABLE) $(NUTTXNAME) -else - MK_QEMU_IMG= -endif - -define POSTBUILD - @echo "MKIMAGE: ESP32 binary" - $(Q) if ! esptool.py version ; then \ - echo ""; \ - echo "Please install ESP-IDF tools"; \ - echo ""; \ - echo "Check https://docs.espressif.com/projects/esp-idf/en/v4.0/get-started/index.html#installation-step-by-step or run the following command"; \ - echo ""; \ - echo "cd tools/esp32 && make && cd ../.."; \ - echo ""; \ - echo "run make again to create the nuttx.bin image."; \ - else \ - echo "Generating: $(NUTTXNAME).bin (ESP32 compatible)"; \ - esptool.py --chip esp32 elf2image --flash_mode dio --flash_size 4MB -o $(NUTTXNAME).bin nuttx; \ - echo "Generated: $(NUTTXNAME).bin (ESP32 compatible)"; \ - fi - $(MK_QEMU_IMG) -endef diff --git a/boards/xtensa/esp32/esp32-wrover-kit/scripts/Make.defs b/boards/xtensa/esp32/esp32-wrover-kit/scripts/Make.defs index 09406c3..1ec0f24 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/scripts/Make.defs +++ b/boards/xtensa/esp32/esp32-wrover-kit/scripts/Make.defs @@ -20,7 +20,7 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)/boards/xtensa/esp32/esp32-wrover-kit/scripts/Config.mk +include $(TOPDIR)/tools/esp32/Config.mk include $(TOPDIR)/arch/xtensa/src/lx6/Toolchain.defs LDSCRIPT1 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld diff --git a/boards/xtensa/esp32/esp32-devkitc/scripts/Config.mk b/tools/esp32/Config.mk similarity index 97% rename from boards/xtensa/esp32/esp32-devkitc/scripts/Config.mk rename to tools/esp32/Config.mk index 9ba9717..04b63b6 100644 --- a/boards/xtensa/esp32/esp32-devkitc/scripts/Config.mk +++ b/tools/esp32/Config.mk @@ -1,5 +1,5 @@ ############################################################################ -# boards/xtensa/esp32/esp32-devkitc/scripts/Config.mk +# tools/esp32/Config.mk # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with
