diff options
| author | Tom Rini <[email protected]> | 2021-04-20 07:32:04 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-04-20 07:32:04 -0400 |
| commit | 842d049be23976ebcbb2522fa8d752d3aae8631a (patch) | |
| tree | ca4ff1ffa3d447d51e945ce4cd9f75f6e80babe9 /cmd/boot.c | |
| parent | eed05148c261e3b5f00b11a7a14bf0222b80a0ac (diff) | |
| parent | 4e9bce12432492aa7a7c2121d9fae1640606ace5 (diff) | |
Merge branch '2021-04-20-assorted-improvements'
- ARM64 GIC fix, CONFIG_IRQ now moved to Kconfig
- IDE, lz4 fixes
- octeontx cleanups / enhancements
- highbank DM migration
- psci updates
- Enable use of -fstack-protector
Diffstat (limited to 'cmd/boot.c')
| -rw-r--r-- | cmd/boot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/boot.c b/cmd/boot.c index 36aba22b301..b84c0ed89ec 100644 --- a/cmd/boot.c +++ b/cmd/boot.c @@ -56,7 +56,7 @@ U_BOOT_CMD( #endif U_BOOT_CMD( - reset, 1, 0, do_reset, + reset, 2, 0, do_reset, "Perform RESET of the CPU", "" ); |