Browse Source

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

Minor bugfixes
Tom Rini 3 years ago
parent
commit
ab31883ae7
4 changed files with 11 additions and 12 deletions
  1. 1 1
      drivers/core/device-remove.c
  2. 8 10
      drivers/misc/cros_ec_sandbox.c
  3. 1 1
      lib/binman.c
  4. 1 0
      tools/patman/tools.py

+ 1 - 1
drivers/core/device-remove.c

@@ -152,7 +152,7 @@ void device_free(struct udevice *dev)
 static bool flags_remove(uint flags, uint drv_flags)
 {
 	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 false;

+ 8 - 10
drivers/misc/cros_ec_sandbox.c

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

+ 1 - 1
lib/binman.c

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

+ 1 - 0
tools/patman/tools.py

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