colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'dm-pull-31mar23' of https://source.denx.de/u-boot/custodians/u-boot-dm

Browse Source 
Fixes for buildman and sysreset
This commit is contained in:
Tom Rini
2023-03-31 12:02:41 -04:00
parent 565681e596 a47164dfc1
commit 897d634a98
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/sysreset/sysreset_gpio.c
View File

@@ -17,6 +17,7 @@ struct gpio_reboot_priv {
static int gpio_reboot_request(struct udevice *dev, enum sysreset_t type) static int gpio_reboot_request(struct udevice *dev, enum sysreset_t type)
{ {
struct gpio_reboot_priv *priv = dev_get_priv(dev); 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 * 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"); debug("GPIO reset\n");
/* Writing 1 respects polarity (active high/low) based on gpio->flags */ /* 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 = { static struct sysreset_ops gpio_reboot_ops = {

2
tools/buildman/toolchain.py
View File

@@ -420,7 +420,7 @@ class Toolchains:
Returns: Returns:
Resolved string Resolved string
>>> bsettings.Setup() >>> bsettings.Setup(None)
>>> tcs = Toolchains() >>> tcs = Toolchains()
>>> tcs.Add('fred', False) >>> tcs.Add('fred', False)
>>> var_dict = {'oblique' : 'OBLIQUE', 'first' : 'fi${second}rst', \ >>> var_dict = {'oblique' : 'OBLIQUE', 'first' : 'fi${second}rst', \