diff options
author | Tom Rini <trini@konsulko.com> | 2021-08-27 15:33:02 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-08-27 15:33:02 +0300 |
commit | b9cb74a5aa256fc34a1b2b9dd847a985b91f34f6 (patch) | |
tree | a618344b253ec3164848e797a2636bbd8f060223 /cmd | |
parent | 7bfa565453ec5f63668a3464da21629055c3053f (diff) | |
parent | 229cb5c6ba3469cbc4a0bcc69389fe61c51fd3b4 (diff) | |
download | u-boot-b9cb74a5aa256fc34a1b2b9dd847a985b91f34f6.tar.xz |
Merge tag 'xilinx-for-v2021.10-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze
Xilinx changes for v2021.10-rc3
xilinx:
- Disable CONFIG_ARCH_FIXUP_FDT_MEMORY
- Print information about cpu via soc drivers and enable DISPLAY_CPUINFO
- Wire infrastructure for DTB_RESELECT and MULTI_DTB_FIT
zynq:
- Wire single QSPI
- Use power-source instead of io-standard properties
- Enable nor on zc770-xm012
zynqmp:
- Change handling around multi_boot()
- Setup offset for u-boot.itb in spi
- Generate run time dfu_alt_info for capsule update
- Use explicit values for enums (zynqmp_firmware.h)
- Enable RTC/SHA1/BUTTON/BUTTON_GPIO command
- Disable WDT driver by default
- Bind usb/scsi via preboot because of EFI
- DT updates/fixes
- Add soc driver
- Fix SPL SPI boot mode
versal:
- Add soc driver
sdhci:
- Update tap delay programming for zynq_sdhci driver
cmd:
- Fix RTC uclass handling in date command
- Update pwm help message
- Update reset help message
watchdog:
- Fix wwdt compilation
rtc:
- Deal with seq alias in rtc uclass
- Add zynqmp RTC driver
fdt:
- Add kernel-doc for fdt_fixup_memory_banks()
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/boot.c | 3 | ||||
-rw-r--r-- | cmd/date.c | 9 | ||||
-rw-r--r-- | cmd/pwm.c | 7 |
3 files changed, 12 insertions, 7 deletions
diff --git a/cmd/boot.c b/cmd/boot.c index fab294e622..be67a5980d 100644 --- a/cmd/boot.c +++ b/cmd/boot.c @@ -58,7 +58,8 @@ U_BOOT_CMD( U_BOOT_CMD( reset, 2, 0, do_reset, "Perform RESET of the CPU", - "" + "- cold boot without level specifier\n" + "reset -w - warm reset if implemented" ); #ifdef CONFIG_CMD_POWEROFF diff --git a/cmd/date.c b/cmd/date.c index e377cfe165..149ca426e8 100644 --- a/cmd/date.c +++ b/cmd/date.c @@ -41,10 +41,13 @@ static int do_date(struct cmd_tbl *cmdtp, int flag, int argc, #ifdef CONFIG_DM_RTC struct udevice *dev; - rcode = uclass_get_device(UCLASS_RTC, 0, &dev); + rcode = uclass_get_device_by_seq(UCLASS_RTC, 0, &dev); if (rcode) { - printf("Cannot find RTC: err=%d\n", rcode); - return CMD_RET_FAILURE; + rcode = uclass_get_device(UCLASS_RTC, 0, &dev); + if (rcode) { + printf("Cannot find RTC: err=%d\n", rcode); + return CMD_RET_FAILURE; + } } #elif defined(CONFIG_SYS_I2C_LEGACY) old_bus = i2c_get_bus_num(); @@ -108,7 +108,8 @@ static int do_pwm(struct cmd_tbl *cmdtp, int flag, int argc, U_BOOT_CMD(pwm, 6, 0, do_pwm, "control pwm channels", - "pwm <invert> <pwm_dev_num> <channel> <polarity>\n" - "pwm <config> <pwm_dev_num> <channel> <period_ns> <duty_ns>\n" - "pwm <enable/disable> <pwm_dev_num> <channel>\n" + "invert <pwm_dev_num> <channel> <polarity> - invert polarity\n" + "pwm config <pwm_dev_num> <channel> <period_ns> <duty_ns> - config PWM\n" + "pwm enable <pwm_dev_num> <channel> - enable PWM output\n" + "pwm disable <pwm_dev_num> <channel> - eisable PWM output\n" "Note: All input values are in decimal"); |