Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 2 additions & 88 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ members = [
"cmd/exec",
"cmd/extract",
"cmd/flash",
"cmd/gdb",
"cmd/gimlet",
"cmd/gpio",
"cmd/hash",
Expand All @@ -54,7 +53,6 @@ members = [
"cmd/monorail",
"cmd/mwocp",
"cmd/net",
"cmd/openocd",
"cmd/pmbus",
"cmd/power",
"cmd/probe",
Expand Down Expand Up @@ -144,7 +142,6 @@ cmd-ereport = { path = "./cmd/ereport", package = "humility-cmd-ereport" }
cmd-exec = { path = "./cmd/exec", package = "humility-cmd-exec" }
cmd-extract = { path = "./cmd/extract", package = "humility-cmd-extract" }
cmd-flash = { path = "./cmd/flash", package = "humility-cmd-flash" }
cmd-gdb = { path = "./cmd/gdb", package = "humility-cmd-gdb" }
cmd-gimlet = { path = "./cmd/gimlet", package = "humility-cmd-gimlet" }
cmd-gpio = { path = "./cmd/gpio", package = "humility-cmd-gpio" }
cmd-hash = { path = "./cmd/hash", package = "humility-cmd-hash" }
Expand All @@ -161,7 +158,6 @@ cmd-map = { path = "./cmd/map", package = "humility-cmd-map" }
cmd-monorail = { path = "./cmd/monorail", package = "humility-cmd-monorail" }
cmd-mwocp = { path = "./cmd/mwocp", package = "humility-cmd-mwocp" }
cmd-net = { path = "./cmd/net", package = "humility-cmd-net" }
cmd-openocd = { path = "./cmd/openocd", package = "humility-cmd-openocd" }
cmd-pmbus = { path = "./cmd/pmbus", package = "humility-cmd-pmbus" }
cmd-power = { path = "./cmd/power", package = "humility-cmd-power" }
cmd-powershelf = { path = "./cmd/powershelf", package = "humility-cmd-powershelf" }
Expand Down
40 changes: 0 additions & 40 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,6 @@ a specified target. (In the above example, one could execute `humility
- [humility exec](#humility-exec): execute command within context of an environment
- [humility extract](#humility-extract): extract all or part of a Hubris archive
- [humility flash](#humility-flash): flash archive onto attached device
- [humility gdb](#humility-gdb): Attach to a running system using GDB
- [humility gimlet](#humility-gimlet): Gimlet-specific diagnostic commands
- [humility gpio](#humility-gpio): GPIO pin manipulation
- [humility hash](#humility-hash): Access to the HASH block
Expand All @@ -262,7 +261,6 @@ a specified target. (In the above example, one could execute `humility
- [humility monorail](#humility-monorail): Management network control and debugging
- [humility mwocp](#humility-mwocp): Murata power shelf operations
- [humility net](#humility-net): Management network device-side control and debugging
- [humility openocd](#humility-openocd): Run OpenOCD for the given archive
- [humility pmbus](#humility-pmbus): scan for and read PMBus devices
- [humility power](#humility-power): show power-related information
- [humility powershelf](#humility-powershelf): inspect powershelf over the management network
Expand Down Expand Up @@ -815,41 +813,12 @@ by specifying `-V` (`--verify`). Similarly, if one wishes to *only*
check the image against the archive (and not flash at all), specify
`-C` (`--check`).

This attempts to natively flash the part within Humility using probe-rs,
but for some parts or configurations, it may need to use OpenOCD as a
child process to flash it. If OpenOCD is required but not installed (or
isn't in the path), this will fail. If OpenOCD is used, temporary files
are created as part of this process; if they are to be retained, the `-R`
(`--retain-temporaries`) flag should be set. To see what would be
executed without actually executing any commands, use the `-n`
(`--dry-run`) flag. Should use of OpenOCD need to be forced (that is,
should probe-rs flashing fail), the `-O` (`--force-openocd`) flag can be
used. That said, OpenOCD should generally be discouraged; the disposition
is to extend probe-rs to support any parts that must be flashed via
OpenOCD.

If the specified archive includes auxiliary flash data and the new image
includes a task with the `AuxFlash` API, two slots of auxiliary flash
will be programmed after the image is written. See RFD 311 for more
information about auxiliary flash management.


### `humility gdb`

This command launches GDB and attaches to a running device.

By default, the user must be running `openocd` or `pyocd` in a separate
terminal.

The `--run-openocd` option automatically launches `openocd` based on the
`openocd.cfg` file included in the build archive.

When using `pyocd`, it must be launched with the `--persist` option,
because `humility gdb` connects to it multiple times (once to check the
app id, then again to run the console).



### `humility gimlet`

`humility gimlet` contacts a (recent firmware version) Gimlet over the
Expand Down Expand Up @@ -1847,15 +1816,6 @@ addition, the MAC-side counters are only supported on the VSC8562, not the
VSC8552; this is indicated with `--` in the relevant table positions.


### `humility openocd`

This command launches OpenOCD based on the config file in a build archive,
which then allows one to connect with either GDB or directly via telnet.
If the intention is to only run GDB, note that `humility gdb --run-openocd`
will both run OpenOCD and run a foreground GDB that is connected to it.



### `humility pmbus`

Operates on PMBus devices in the system. To list all PMBus devices, use
Expand Down
Loading
Loading