Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-29 04:19:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

tools/esp32: Remove some duplicated output.

Browse Source 
Redirect the first check of esptool to /dev/null as it will be printed
twice when esptool is called to convert the binary.

Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
This commit is contained in:
Abdelatif Guettouche
2021-02-03 23:12:14 +01:00
committed by Xiang Xiao
parent 053a560aa1
commit 0e8cce4dee
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/esp32/Config.mk
+5 -9
View File
@@ -39,18 +39,14 @@ else
endif endif
define POSTBUILD define POSTBUILD
@echo "MKIMAGE: ESP32 binary" $(Q)echo "MKIMAGE: ESP32 binary"
$(Q) if ! esptool.py version ; then \ $(Q) if ! esptool.py version 1>/dev/null 2>&1; then \
echo ""; \ echo ""; \
echo "Please install ESP-IDF tools"; \ echo "esptool.py not found. Please run: \"pip install esptool.py\""; \
echo "Or run: \"make -C tools/esp32\" to install all IDF tools."; \
echo ""; \ 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 "Run make again to create the nuttx.bin image."; \
echo ""; \
echo "cd tools/esp32 && make && cd ../.."; \
echo ""; \
echo "run make again to create the nuttx.bin image."; \
else \ else \
echo "Generating: $(NUTTXNAME).bin (ESP32 compatible)"; \
esptool.py --chip esp32 elf2image --flash_mode dio --flash_size 4MB -o $(NUTTXNAME).bin nuttx; \ esptool.py --chip esp32 elf2image --flash_mode dio --flash_size 4MB -o $(NUTTXNAME).bin nuttx; \
echo "Generated: $(NUTTXNAME).bin (ESP32 compatible)"; \ echo "Generated: $(NUTTXNAME).bin (ESP32 compatible)"; \
fi fi
tools/esp32/mk_qemu_img.sh
+3 -3
View File
@@ -44,9 +44,9 @@ printf "\tBootloader: %s\n" "${BOOTLOADER}"
printf "\tPartition Table: %s\n" "${PARTITION_TABLE}" printf "\tPartition Table: %s\n" "${PARTITION_TABLE}"
dd if=/dev/zero bs=1024 count=4096 of=esp32_qemu_image.bin && \ dd if=/dev/zero bs=1024 count=4096 of=esp32_qemu_image.bin && \
dd if="${BOOTLOADER}" bs=1 seek="$(printf '%d' 0x1000)" of=esp32_qemu_image.bin conv=notrunc && \ dd if="${BOOTLOADER}" bs=1 seek="$(printf '%d' 0x1000)" of=esp32_qemu_image.bin conv=notrunc && \
dd if="${PARTITION_TABLE}" bs=1 seek="$(printf '%d' 0x8000)" of=esp32_qemu_image.bin conv=notrunc && \ dd if="${PARTITION_TABLE}" bs=1 seek="$(printf '%d' 0x8000)" of=esp32_qemu_image.bin conv=notrunc && \
dd if="${NUTTXNAME}".bin bs=1 seek="$(printf '%d' 0x10000)" of=esp32_qemu_image.bin conv=notrunc dd if="${NUTTXNAME}".bin bs=1 seek="$(printf '%d' 0x10000)" of=esp32_qemu_image.bin conv=notrunc
if [ ${?} -ne 0 ]; then if [ ${?} -ne 0 ]; then
printf "Failed to generate esp32_qemu_image.bin.\n" printf "Failed to generate esp32_qemu_image.bin.\n"