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

Minor bugfixes 

-----BEGIN PGP SIGNATURE-----
 
 iQFFBAABCgAvFiEEslwAIq+Gp8wWVbYnfxc6PpAIreYFAl/FYSgRHHNqZ0BjaHJv
 bWl1bS5vcmcACgkQfxc6PpAIreaQ7Af9GScewoTZPCadXHmBilFH5Z+fetKINuio
 rJNctzLxtq6OBzdjNkB7zU/29tuWDlFuMSoNbnHXyoezAgwCfssGz85G1Ecxl+pN
 pr/iQNXDe+7yfILE6DZGJz7oTCkBPT15nMOxXRdqzP2ZkC7GpDeHxThogbv5ceny
 EwYc3/aOvUk/v0eIUZoNewf4xbJQjrByYHfTjBB8C1NonYpCKvaXdyuOFllLREqE
 OLhcNaiRc8383WWKoHOuSN1foZEX5hbFzwJ/ZeLH/lD1bstQrGPoiFGBh+pq//Cv
 ETDqVua/1HE3fxFPwFeSEK4HKlGaR44Z0YPAWdlcG1af00B46VxhbQ==
 =bRhi
 -----END PGP SIGNATURE-----

Merge tag 'dm-pull-30nov20' of git://git.denx.de/u-boot-dm

Minor bugfixes
This commit is contained in:
Tom Rini 2020-12-02 11:36:51 -05:00
parent 80cbd731df a9e73d287b
commit ab31883ae7
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/core/device-remove.c
View File

@ -152,7 +152,7 @@ void device_free(struct udevice *dev)
static bool flags_remove(uint flags, uint drv_flags) static bool flags_remove(uint flags, uint drv_flags)
{ {
if ((flags & DM_REMOVE_NORMAL) || if ((flags & DM_REMOVE_NORMAL) ||
(flags & (drv_flags & (DM_FLAG_ACTIVE_DMA | DM_FLAG_OS_PREPARE)))) (flags && (drv_flags & (DM_FLAG_ACTIVE_DMA | DM_FLAG_OS_PREPARE))))
return true; return true;
return false; return false;

18
drivers/misc/cros_ec_sandbox.c
View File

@ -460,16 +460,14 @@ static int process_cmd(struct ec_state *ec,
case EC_CMD_ENTERING_MODE: case EC_CMD_ENTERING_MODE:
len = 0; len = 0;
break; break;
case EC_CMD_GET_NEXT_EVENT: case EC_CMD_GET_NEXT_EVENT: {
/* struct ec_response_get_next_event *resp = resp_data;
* TODO:
* This driver emulates an old keyboard device supporting resp->event_type = EC_MKBP_EVENT_KEY_MATRIX;
* EC_CMD_MKBP_STATE. Current Chrome OS keyboards use cros_ec_keyscan(ec, resp->data.key_matrix);
* EC_CMD_GET_NEXT_EVENT. Cf. len = sizeof(*resp);
* "mkbp: Add support for buttons and switches" break;
* https://chromium.googlesource.com/chromiumos/platform/ec/+/87a071941b89e3f7fd3eb329b682e60b3fbd6c73 }
*/
return -EC_RES_INVALID_COMMAND;
default: default:
printf(" ** Unknown EC command %#02x\n", req_hdr->command); printf(" ** Unknown EC command %#02x\n", req_hdr->command);
return -1; return -1;

2
lib/binman.c
View File

@ -104,6 +104,6 @@ int binman_init(void)
binman->image = node; binman->image = node;
} }
binman_set_rom_offset(ROM_OFFSET_NONE); binman_set_rom_offset(ROM_OFFSET_NONE);
\
return 0; return 0;
} }

1
tools/patman/tools.py
View File

@ -333,6 +333,7 @@ def Run(name, *args, **kwargs):
elif for_host: elif for_host:
name, extra_args = GetHostCompileTool(name) name, extra_args = GetHostCompileTool(name)
args = tuple(extra_args) + args args = tuple(extra_args) + args
name = os.path.expanduser(name) # Expand paths containing ~
all_args = (name,) + args all_args = (name,) + args
result = command.RunPipe([all_args], capture=True, capture_stderr=True, result = command.RunPipe([all_args], capture=True, capture_stderr=True,
env=env, raise_on_error=False, binary=binary) env=env, raise_on_error=False, binary=binary)