commit | 473d7d70c0ce3e770f763b7c8b41d6166409e87d | [log] [tgz] |
---|---|---|
author | pigweed-roller <pigweed-roller@pigweed-service-accounts.iam.gserviceaccount.com> | Wed Jan 08 22:57:02 2025 -0800 |
committer | CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> | Wed Jan 08 22:57:02 2025 -0800 |
tree | eafb23d2143510f42f24e75eb9f45390b212a063 | |
parent | 3bca0eb22193859718cc1f9ca4d620df8c014d23 [diff] |
roll: third_party/pigweed 7a1c27a..8a5fc59 (20 commits) 8a5fc59:https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/247972 pw_digital_io_mcuxpresso: Add McuxpressoDigitalInOutInterrupt support 34521ea:https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/258994 pw_digital_io_mcuxpresso: Introduce McuxpressoPintInterrupt 3085c62:https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/256593 pw_perf_test: Remove multiplexer d93f986:https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/259013 pw_chrono: Don't import individual types in py aef6fca:https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/251712 pw_tokenizer: CSV parser 483a24a:https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/229672 pw_crypto: Remove micro_ecc support b03ff49:https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/258772 pw_bluetooth_proxy: Allow Write(MultiBuf) for gatt notify 56d9d44:https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/258712 pw_bluetooth_proxy: Allow Write(MultiBuf) for rfcomm and basic b129282:https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/258533 pw_bluetooth_proxy: Move Write(MultiBuf) to L2capChannel 88e93b8:https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/258422 pw_bluetooth_proxy: Rename L2capChannel incoming functions to use Handle 9925b31:https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/258456 pw_bluetooth_proxy: Move functions to protected 0f95b66:https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/258454 pw_bluetooth_proxy: Remove deprecated L2apCoc::Write(span) 413a815:https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/252472 pw_toolchain_bazel: Remove contents 3e0b832:https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/258833 docs: Remove admonition about Bazel version pin 736d6a3:https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/239049 pw_fuzzer: Make FuzzTest usable be external CMake projects 0a9be2a:https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/256116 pw_bluetooth_proxy: Remove old cid fields a16e8fa:https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/258812 pw_bluetooth_sapphire: Simplify LESupportedFeatures 22b2528:https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/258774 pw_watch: Move path filtering code to separate module b13f7bf:https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/242033 bazel: Update to Bazel 8.0.0 f51ac28:https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/258832 pw_bluetooth_proxy: Retain 'source_cid' name for pending connections Rolled-Repo: https://pigweed.googlesource.com/pigweed/pigweed Rolled-Commits: 7a1c27a34bab9c..8a5fc59a80af2f Roll-Count: 1 Roller-URL: https://cr-buildbucket.appspot.com/build/8726242769344936385 GitWatcher: ignore CQ-Do-Not-Cancel-Tryjobs: true Change-Id: I8a7412a4ae800c1f9cb517da32b472dfc3f572e9 Reviewed-on: https://pigweed-review.googlesource.com/c/gonk/+/258949 Commit-Queue: Pigweed Roller <pigweed-roller@pigweed-service-accounts.iam.gserviceaccount.com> Lint: Lint 🤖 <android-build-ayeaye@system.gserviceaccount.com> Bot-Commit: Pigweed Roller <pigweed-roller@pigweed-service-accounts.iam.gserviceaccount.com>
NOTE: If you are using a
gonk_tools.zip
bundle follow the instructions in the//tools
directory: https://pigweed.googlesource.com/gonk/+/refs/heads/main/tools/
Clone the repo
git clone https://pigweed.googlesource.com/gonk
Source bootstrap.sh
to download all compilers and tooling into the environment
directory:
. ./bootstrap.sh
This should init all git submodules for you.
From here on the Pigweed environment is activated. You can activate the environment in a new shell without re-running bootstrap by sourcing activate.sh
. ./activate.sh
First bootstrap, run pw build
and flash gonk using DFU.
. ./bootstrap.sh
pw build
Unplug gonk from USB and replug with MODE button held down.
Run gonk-flash
on the MCU binary. This uses pyfu-usb
.
gonk-flash ./out/gn/arduino_size_optimized/obj/applications/gonk/gonk.bin
Start capturing ADC samples with:
gonk \ --bitstream-file DEFAULT \ --log-to-stderr
Enter
to stop or start ADC continuous updates. It will begin automatically on startup.ctrl-c
to quit.Plot the logs from gonk-csv-log.txt
with:
python tools/gonk_tools/plot.py -i gonk-csv-log.txt -o plot.svg
Build for the host and device by running:
pw build
This is mostly a shortcut with nice output for running gn gen out/gn
and ninja -C out/gn
.
The build commands are defined in: //tools/gonk_tools/build_project.py
.
The Verilog build requires the following to be installed on Linux:
sudo apt install fpga-icestorm nextpnr-ice40 yosys
Running pw build
will run the FPGA toolchain if these commands are available on the $PATH
:
icepack
icetime
nextpnr-ice40
yosys
The bitstream files will be written with the .bin
extenson under ./out/gn/obj/fpga/*/*.bin
along with log output files.
For example:
$ ls ./out/gn/obj/fpga/toplevel/ nextpnr-log.txt toplevel.asc toplevel.bin toplevel.json toplevel_timing_report.json toplevel_timing_report.txt yosys-log.txt
Flash the stm32f7 and launch the gonk.py
script on a bitstream file.
Unplug gonk from USB and replug with MODE button held down.
Run gonk-flash
which uses pyfu-usb
. The --bin-file
argument is optional.
gonk-flash --bin-file ./out/gn/arduino_size_optimized/obj/applications/gonk/bin/gonk.elf
This is more useful if you are doing firmware debugging.
./scripts/flash-with-blackmagic-probe.sh ./out/gn/arduino_size_optimized/obj/applications/gonk/bin/gonk.elf
This is a distibutable python wheel that can be used without the Gonk source checkout or compiling anything.
On Linux with the FPGA toolchain available run:
pw build
The zip file containing all the dependencies for the gonk python tooling is located in:
out/gn/obj/gonk_bundle.zip
Inside are the Python wheels for gonk_dist
, gonk_firmware
, and all third_party dependencies.
gonk_bundle ├── python_wheels │ ├── appdirs-1.4.4-py2.py3-none-any.whl │ ├── astroid-3.0.1-py3-none-any.whl │ ├── ... │ ├── gonk_dist-0.0.1+20240305140627-py3-none-any.whl │ ├── gonk_firmware-0.0.1+20240305140542-py3-none-any.whl │ ├── ... │ └── wheel-0.40.0-py3-none-any.whl ├── requirements.txt ├── setup.bat └── setup.sh
%Y%m%d %H:%M:%S.%f
Example separated into multiple lines (with an empty comment field)
20240813 14:16:35.176433, 283, 0.8148437500000001, 0.8892578125, 5.212109375000001, 1.087109375, 0.8904296875000001, 3.3820312500000003, 1.8125, 0.058447916666666676, 0.031546875, 0.13443125, 0.015902343750000002, 0.0009143518518518518, 0.16081250000000002, 0.004143750000000001, 0.04762591959635418, 0.02805330505371094, 0.7006703784179689, 0.01728758697509766, 0.0008141660337094908, 0.5438729003906251, 0.007510546875000001,
When GPIOs are pulled LOW (to ground) a line in the CSV will appear with delta_micros = 0 and empty measurement values. The Comment field will contain the GPIO assert log message.
Example:
20240813 14:12:32.930888, 0, ,,,,,,, ,,,,,,, ,,,,,,, Header pin assert: 2
See https://github.com/YosysHQ/yosys for more instructions.
On Ubuntu/Debian install the deps:
sudo apt-get install build-essential clang lld bison flex \ libreadline-dev gawk tcl-dev libffi-dev git \ graphviz xdot pkg-config python3 libboost-system-dev \ libboost-python-dev libboost-filesystem-dev zlib1g-dev
Activate the bootstrap environment . ./bootstraph.sh
then compile yosys.
git clone https://github.com/YosysHQ/yosys cd yosys git submodule update --init make config-clang make -j8
Install it to a known directory and add it to your $PATH
:
make DESTDIR=$HOME/ice40-fpga-tools install export $PATH=$PATH:$HOME/ice40-fpga-tools/usr/local/bin
TODO: Document compiling from source.
TODO: Document compiling from source.
Checkout the desired commits in each of these submodules:
third_party/stm32cube_f7/cmsis_core third_party/stm32cube_f7/cmsis_device third_party/stm32cube_f7/hal_driver
Then run from Gonk root:
python -m pw_stm32cube_build gen_file_list third_party/stm32cube_f7
Net | STM32 Pin | STM32 Function | Function |
---|---|---|---|
STATUS | PB13 | GPIO_Output | STAT LED |
Visual header pin positions:
+------------- +------+--------+-----+ | | 2 | Ground | 6 | | USB-C +------+--------+-----+ | Port | 1 | 3 | VCC | | +------+--------+-----+ +-------------
Header Pin | Net | STM32 Pin |
---|---|---|
1 | SPI_HDR_IO3 | PB0 |
2 | SPI_HDR_IO1 | PA2 |
3 | SPI_HDR_IO2 | PA3 |
4 | GND | |
5 | VCC_GONK | |
6 | SPI_HDR_IO0 | PA1 |
Net | FPGA IO# | STM32 Pin | STM32 Function | Flash Pin |
---|---|---|---|---|
ICE_SPI_SS | 71 | PD2 | GPIO_Output | S# |
ICE_SPI_MISO | 68 | PB4 | SPI1_MISO | DQ1 |
ICE_SPI_MOSI | 67 | PB5 | SPI1_MOSI | DQ0 |
ICE_SPI_SCK | 70 | PB3 | SPI1_SCK | C |
FLASH_HOLD | 63 | PC11 | GPIO_Output | HOLD#/DQ3 |
FLASH_WP | 64 | PC12 | GPIO_Output | W#/VPP/DQ2 |
Net | Function | FPGA IO# | STM32 Pin | STM32 Function | Notes |
---|---|---|---|---|---|
FPGA_IO_SPARE_0_2 | rst_i | 135 | PA0 | GPIO_Output | Active high |
FPGA_IO_SPARE_0_0 | mode_i | 137 | PB11 | GPIO_Output | FPGA operation mode |
DSPI_CS | valid_o | 75 | PB6 | GPIO_Output | Data/Transfer Valid |
FPGA_IO_SPARE_1_1 | miso_i | 101 | PC2 | SPI1_MISO | |
FPGA_IO_SPARE_1_0 | mosi_i | 99 | PC3 | SPI1_MOSI | |
I2C_O_SDA | cs_n | 79 | PB9 | SPI1_NSS | |
FPGA_IO_SPARE_0_1 | sclk_i | 136 | PB10 | SPI1_SCK | |
FPGA_IO_SPARE_2_0 | 49 | PA7 | |||
FPGA_IO_SPARE_2_1 | 48 | PA6 | |||
FPGA_IO_SPARE_2_2 | 47 | PA5 | |||
FPGA_IO_SPARE_2_3 | 45 | PA4 |