commit | 923c9a2efe93ab75bbeb98d393c21dd3c9b916db | [log] [tgz] |
---|---|---|
author | Eli Lipsitz <elipsitz@pigweed.infra.roller.google.com> | Wed Feb 01 00:07:28 2023 +0000 |
committer | CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> | Wed Feb 01 00:07:28 2023 +0000 |
tree | e432cbc81054947338d60e9340d923ef51bed5d4 | |
parent | 6399b8960ffbf830928fbc20a906aa8335df3e0b [diff] |
[roll third_party/pigweed] pw_rust: Make rust_bin tool definition more robust The existing rust_bin tool definition in the generate_toolchain template is missing a few critical pieces: 1) depfile generation -- without this, Ninja won't recompile Rust targets when a module (rather than the main.rs or lib.rs) changes. 2) Unused GN rust_bin toolchain arguments. rustenv, crate_name, crate_type, rustflags, rustdeps, externs all are provided by GN for Rust targets and are necessary to get proper compilation, dependencies, flags, etc. This commit adds the missing pieces. The depfile arguments to rustc look a little bit arbitrary, but they're just what's required to get rustc to output depfiles that Ninja can understand (borrowed from Fuchsia). Tested: Set some rustflags in a target, verified they're set properly. Added a Rust target that depends on a module in another file, verified that without this change, changes to that module do not cause a rebuild, and after this change, they do. Original-Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/127013 https://pigweed.googlesource.com/pigweed/pigweed third_party/pigweed Rolled-Commits: 3865a74f02bb498..b5f05fbb0869ab2 Roller-URL: https://ci.chromium.org/b/8790409024776794305 GitWatcher: ignore CQ-Do-Not-Cancel-Tryjobs: true Change-Id: Ia6372c1685ecc2ac3694a160dc54b60c6c85af98 Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/experimental/+/127094 Commit-Queue: Pigweed Integration Roller <pigweed-integration-roller@pigweed.google.com.iam.gserviceaccount.com> Bot-Commit: Pigweed Integration Roller <pigweed-integration-roller@pigweed.google.com.iam.gserviceaccount.com>
This repository contains experimental pigweed modules.
Clone this repo with --recursive
to get all required submodules.
git clone --recursive https://pigweed.googlesource.com/pigweed/experimental
This will pull the Pigweed source repository into third_party/pigweed
. If you already cloned but forgot to --recursive
run git submodule update --init
to pull all submodules.
The //pw_graphics folder contains some libraries for drawing to an RGB565 framebuffer and displaying it on various platforms.
The demo applications that make use of these libraries are:
First time setup:
git clone --recursive https://pigweed.googlesource.com/pigweed/experimental cd experimental . ./bootstrap.sh pw package install imgui pw package install glfw pw package install stm32cube_f4 pw package install pico_sdk
Compile:
gn gen out --export-compile-commands --args=" dir_pw_third_party_stm32cube_f4=\"$PW_PROJECT_ROOT/environment/packages/stm32cube_f4\" " ninja -C out
Flash:
openocd -f third_party/pigweed/targets/stm32f429i_disc1/py/stm32f429i_disc1_utils/openocd_stm32f4xx.cfg -c "program out/stm32f429i_disc1_stm32cube_debug/obj/applications/terminal_display/bin/terminal_demo.elf verify reset exit"
First time setup:
pw package install stm32cube_f7
Compile:
gn gen out --export-compile-commands --args=" dir_pw_third_party_stm32cube_f7=\"//environment/packages/stm32cube_f7\" " ninja -C out
Flash:
openocd -f targets/stm32f769i_disc0/py/stm32f769i_disc0_utils/openocd_stm32f7xx.cfg \ -c "program out/stm32f769i_disc0_debug/obj/applications/blinky/bin/blinky.elf verify reset exit"
Compile:
gn gen out --export-compile-commands --args=" dir_pw_third_party_imgui=\"$PW_PROJECT_ROOT/environment/packages/imgui\" dir_pw_third_party_glfw=\"$PW_PROJECT_ROOT/environment/packages/glfw\" " ninja -C out
Run:
out/host_debug/obj/applications/terminal_display/bin/terminal_demo
Working displays:
Compile:
gn gen out --export-compile-commands --args=" PICO_SRC_DIR=\"$PW_PROJECT_ROOT/environment/packages/pico_sdk\" " ninja -C out
Flash:
Using a uf2 file:
./out/host_debug/obj/targets/rp2040/bin/elf2uf2 ./out/rp2040/obj/applications/terminal_display/bin/terminal_demo.elf ./out/rp2040/obj/applications/terminal_display/bin/terminal_demo.uf2
Copy ./out/rp2040/obj/applications/terminal_display/bin/terminal_demo.uf2
to your Pi Pico.
Using a Pico Probe and openocd:
This requires installing the Raspberry Pi foundation's OpenOCD fork for the Pico probe. More details including how to connect the two Pico boards is available at Raspberry Pi Pico and RP2040 - C/C++ Part 2: Debugging with VS Code
Install RaspberryPi's OpenOCD Fork:
git clone https://github.com/raspberrypi/openocd.git \ --branch picoprobe \ --depth=1 \ --no-single-branch \ openocd-picoprobe cd openocd-picoprobe ./bootstrap ./configure --enable-picoprobe --prefix=$HOME/apps/openocd --disable-werror make -j2 make install
Setup udev rules (Linux only):
cat <<EOF > 49-picoprobe.rules SUBSYSTEMS=="usb", ATTRS{idVendor}=="2e8a", ATTRS{idProduct}=="0004", MODE:="0666" KERNEL=="ttyACM*", ATTRS{idVendor}=="2e8a", ATTRS{idProduct}=="0004", MODE:="0666" EOF sudo cp 49-picoprobe.rules /usr/lib/udev/rules.d/49-picoprobe.rules sudo udevadm control --reload-rules
Flash the Pico:
~/apps/openocd/bin/openocd -f ~/apps/openocd/share/openocd/scripts/interface/picoprobe.cfg -f ~/apps/openocd/share/openocd/scripts/target/rp2040.cfg -c 'program out/rp2040/obj/applications/terminal_display/bin/terminal_demo.elf verify reset exit'
Setup NXP SDK:
Compile:
gn gen out --export-compile-commands --args=" pw_MIMXRT595_EVK_SDK=\"//environment/SDK_2_12_1_EVK-MIMXRT595\" pw_target_mimxrt595_evk_MANIFEST=\"//environment/SDK_2_12_1_EVK-MIMXRT595/EVK-MIMXRT595_manifest_v3_10.xml\" pw_third_party_mcuxpresso_SDK=\"//targets/mimxrt595_evk:mimxrt595_sdk\" " ninja -C out
Flash the MIMXRT595-EVK:
Follow the instructions to flash the MIMXRT595-EVK with the SEGGER J-Link firmware and using arm-none-eabi-gdb
at https://pigweed.dev/targets/mimxrt595_evk/target_docs.html#running-and-debugging.
https://www.pjrc.com/teensy/loader_cli.html
brew install teensy_loader_cli
OBJCOPY=/Applications/Arduino.app/Contents/Java/hardware/tools/avr/bin/avr-objcopy INFILE=out/arduino_debug/obj/applications/terminal_display/bin/terminal_demo.elf OUTFILE=foo.hex $OBJCOPY -O ihex -R .eeprom -R .fuse -R .lock -R .signature $INFILE $OUTFILE teensy_loader_cli --mcu=TEENSY41 -w -v $OUTFILE