diff options
| author | Tom Rini | 2019-12-12 08:18:59 -0500 |
|---|---|---|
| committer | Tom Rini | 2019-12-12 08:18:59 -0500 |
| commit | 553cb06887825314e74a9bdac337467c77d1db88 (patch) | |
| tree | 0c73f29d194d17a52ed7a4480f68b13f162147ca /drivers | |
| parent | f39abbbc531eb7b246d83dbb765e65afcc0989f8 (diff) | |
| parent | b4f98b3b16ec513f7fa6b97ec49792a5e99ec165 (diff) | |
Merge tag 'dm-next-13dec19' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm into next
buildman improvements including toolchain environment feature
sandbox unicode support in serial
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/misc/cros_ec.c | 2 | ||||
| -rw-r--r-- | drivers/serial/sandbox.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c index 382f8262863..fa9984f6bd9 100644 --- a/drivers/misc/cros_ec.c +++ b/drivers/misc/cros_ec.c @@ -313,7 +313,7 @@ static int send_command(struct cros_ec_dev *dev, uint cmd, int cmd_version, * @param din_len Maximum size of response in bytes * @return number of bytes in response, or -ve on error */ -static int ec_command_inptr(struct udevice *dev, uint8_t cmd, +static int ec_command_inptr(struct udevice *dev, uint cmd, int cmd_version, const void *dout, int dout_len, uint8_t **dinp, int din_len) { diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c index 2f7bc248871..1af5cc12f35 100644 --- a/drivers/serial/sandbox.c +++ b/drivers/serial/sandbox.c @@ -33,7 +33,7 @@ DECLARE_GLOBAL_DATA_PTR; * serial_buf_write == serial_buf_read -> empty buffer * (serial_buf_write + 1) % 16 == serial_buf_read -> full buffer */ -static char serial_buf[16]; +static unsigned char serial_buf[16]; static unsigned int serial_buf_write; static unsigned int serial_buf_read; |