Skip to content

cpu/esp_common: fix the dependency of the flash image on the ELF file#14041

Merged
benpicco merged 1 commit intoRIOT-OS:masterfrom
gschorcht:cpu/esp/fix_make_flash_dependency
May 8, 2020
Merged

cpu/esp_common: fix the dependency of the flash image on the ELF file#14041
benpicco merged 1 commit intoRIOT-OS:masterfrom
gschorcht:cpu/esp/fix_make_flash_dependency

Conversation

@gschorcht
Copy link
Copy Markdown
Contributor

@gschorcht gschorcht commented May 8, 2020

Contribution description

This PR fixes the dependency of the flash image on the ELF file for the ESP* make system.

Flashing an ESP board first requires the creation of a flash image from the ELF file. This is realized in the preflash target. However, the preflash target only depends on the variable BUILD_BEFORE_FLASH but on the ELF file. Therefore, the variable BUILD_BEFORE_FLASH must be set to the ELF file to ensure that when using multiple make processes, the compilation of the ELF file is completed before the flash image is created.

Testing procedure

  • In examples/hello-world run make BOARD=esp32-wroom-32 -j flash term.
  • Change the text in main.c, better yet print it in a while(1) loop.
  • Run make BOARD=esp32-wroom-32 -j flash term again

Issues/PRs references

Fixes #13492

@gschorcht
cpu/esp_common: fix dependency of flash target on ELF file
d0cc955 
Flashing an ESP board first requires the creation of a flash image from the ELF file.  This is realized in the `preflash` target. However, the `preflash` target only depends on the variable `BUILD_BEFORE_FLASH` but on the ELF file. Therefore, the variable `BUILD_BEFORE_FLASH` must be set to the ELF file to ensure that when using multiple make processes, the compilation of the ELF file is completed before the flash image is created.
@gschorcht gschorcht requested a review from benpicco May 8, 2020 09:09
@gschorcht gschorcht added Area: cpu Area: CPU/MCU ports CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Platform: ESP Platform: This PR/issue effects ESP-based platforms Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) labels May 8, 2020
@gschorcht gschorcht changed the title cpu/esp_common: fix the dependency of flash image on the ELF file cpu/esp_common: fix the dependency of the flash image on the ELF file May 8, 2020
benpicco
benpicco approved these changes May 8, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@benpicco benpicco left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for investigating this!
Now make -j flash works reliable as it should.

@benpicco benpicco merged commit 0bbc86a into RIOT-OS:master May 8, 2020
@gschorcht gschorcht mentioned this pull request May 12, 2020
Merged
1 task
@kaspar030
Copy link
Copy Markdown
Contributor

kaspar030 commented May 12, 2020

This broke "make flash-only".

@kaspar030
Copy link
Copy Markdown
Contributor

kaspar030 commented May 12, 2020

This is on master:

[kaspar@ng riot/examples/hello-world (master)]$ BOARD=esp32-wroom-32 make flash-only
ESP32_SDK_DIR should be defined as /path/to/esp-idf directory
ESP32_SDK_DIR is set by default to /opt/esp/esp-idf
ccache: error: Could not find compiler "xtensa-esp32-elf-gcc" in PATH
make[1]: *** [/home/kaspar/src/riot/Makefile.base:108: /home/kaspar/src/riot/examples/hello-world/bin/esp32-wroom-32/application_hello-world/main.o] Error 1
make: *** [/home/kaspar/src/riot/examples/hello-world/../../Makefile.include:568: /home/kaspar/src/riot/examples/hello-world/bin/esp32-wroom-32/application_hello-world.a] Error 2

make flash-only is required by CI testing to not recompile...

@kaspar030
Copy link
Copy Markdown
Contributor

kaspar030 commented May 12, 2020

Maybe FLASH_FILE should be the .bin? The compile worker could then create that.
We'd have to override the rule that creates the .bin to do the current preflasher stuff.

RIOT/Makefile.include

Lines 583 to 585 in 2444f06

%.bin: %.elf
$(Q)$(OBJCOPY) $(OFLAGS) -Obinary $< $@

@gschorcht
Copy link
Copy Markdown
Contributor Author

gschorcht commented May 12, 2020 •
edited
Loading

I'm under pressure due to the online summer term so that I'm not able to spend time at the moment. Maybe, we should revert this commit for the moment and reopen issue #13492.

@gschorcht gschorcht mentioned this pull request May 12, 2020
Closed
@miri64 miri64 added this to the Release 2020.07 milestone Jun 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@benpicco benpicco benpicco approved these changes

Assignees

No one assigned

Labels

Area: cpu Area: CPU/MCU ports CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Platform: ESP Platform: This PR/issue effects ESP-based platforms Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)

Projects

None yet

Milestone

Release 2020.07

Development

Successfully merging this pull request may close these issues.

make -j flash broken on esp* (will always flash the previous binary)

4 participants

@gschorcht @kaspar030 @benpicco @miri64