diff options
| author | Tom Rini <trini@konsulko.com> | 2023-03-31 12:02:41 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-03-31 12:02:41 -0400 |
| commit | 897d634a9861feedbccf63fad5383670dd973276 (patch) | |
| tree | 2be8e2916284f13f29cda0f75c01eeeb3ffad485 | |
| parent | 565681e596381b5b6db59cf06931e698f2d829e5 (diff) | |
| parent | a47164dfc1ef899ef9ddc6d8f2a17f0e9e90ef34 (diff) | |
| download | u-boot-897d634a9861feedbccf63fad5383670dd973276.zip u-boot-897d634a9861feedbccf63fad5383670dd973276.tar.gz u-boot-897d634a9861feedbccf63fad5383670dd973276.tar.bz2 | |
Merge tag 'dm-pull-31mar23' of https://source.denx.de/u-boot/custodians/u-boot-dm
Fixes for buildman and sysreset
| -rw-r--r-- | drivers/sysreset/sysreset_gpio.c | 7 | ||||
| -rw-r--r-- | tools/buildman/toolchain.py | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/sysreset/sysreset_gpio.c b/drivers/sysreset/sysreset_gpio.c index dfca10c..de42b59 100644 --- a/drivers/sysreset/sysreset_gpio.c +++ b/drivers/sysreset/sysreset_gpio.c @@ -17,6 +17,7 @@ struct gpio_reboot_priv { static int gpio_reboot_request(struct udevice *dev, enum sysreset_t type) { struct gpio_reboot_priv *priv = dev_get_priv(dev); + int ret; /* * When debug log is enabled please make sure that chars won't end up @@ -26,7 +27,11 @@ static int gpio_reboot_request(struct udevice *dev, enum sysreset_t type) debug("GPIO reset\n"); /* Writing 1 respects polarity (active high/low) based on gpio->flags */ - return dm_gpio_set_value(&priv->gpio, 1); + ret = dm_gpio_set_value(&priv->gpio, 1); + if (ret < 0) + return ret; + + return -EINPROGRESS; } static struct sysreset_ops gpio_reboot_ops = { diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index ea1ad1b..6bae913 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -420,7 +420,7 @@ class Toolchains: Returns: Resolved string - >>> bsettings.Setup() + >>> bsettings.Setup(None) >>> tcs = Toolchains() >>> tcs.Add('fred', False) >>> var_dict = {'oblique' : 'OBLIQUE', 'first' : 'fi${second}rst', \ |