diff options
Diffstat (limited to 'common/ratp')
| -rw-r--r-- | common/ratp/Kconfig | 3 | ||||
| -rw-r--r-- | common/ratp/Makefile | 2 | ||||
| -rw-r--r-- | common/ratp/getenv.c | 3 | ||||
| -rw-r--r-- | common/ratp/i2c.c | 4 | ||||
| -rw-r--r-- | common/ratp/md.c | 4 | ||||
| -rw-r--r-- | common/ratp/mw.c | 1 | ||||
| -rw-r--r-- | common/ratp/ratp.c | 2 |
7 files changed, 14 insertions, 5 deletions
diff --git a/common/ratp/Kconfig b/common/ratp/Kconfig index 25150addfd..43720e30a0 100644 --- a/common/ratp/Kconfig +++ b/common/ratp/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only config CONSOLE_RATP bool @@ -28,4 +29,4 @@ config RATP_CMD_GPIO depends on GENERIC_GPIO prompt "RATP GPIO support" help - This option adds support for GPIO get/set/direction commands via RATP.
\ No newline at end of file + This option adds support for GPIO get/set/direction commands via RATP. diff --git a/common/ratp/Makefile b/common/ratp/Makefile index 71288bcb8c..e37ccca1fa 100644 --- a/common/ratp/Makefile +++ b/common/ratp/Makefile @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only + obj-y += ratp.o obj-y += ping.o obj-y += getenv.o diff --git a/common/ratp/getenv.c b/common/ratp/getenv.c index 7b38d2e363..9617ab1b43 100644 --- a/common/ratp/getenv.c +++ b/common/ratp/getenv.c @@ -32,6 +32,9 @@ static int ratp_cmd_getenv(const struct ratp_bb *req, int req_len, value = getenv(varname); free(varname); + if (!value) + value = ""; + dlen = strlen(value); *rsp_len = sizeof(struct ratp_bb) + dlen; diff --git a/common/ratp/i2c.c b/common/ratp/i2c.c index c14bbbf9b9..404ddd2ece 100644 --- a/common/ratp/i2c.c +++ b/common/ratp/i2c.c @@ -162,7 +162,7 @@ out: *rsp = (struct ratp_bb *)i2c_read_rsp; *rsp_len = i2c_read_rsp_len; - return ret; + return 0; } BAREBOX_RATP_CMD_START(I2C_READ) @@ -271,7 +271,7 @@ out: *rsp = (struct ratp_bb *)i2c_write_rsp; *rsp_len = sizeof(*i2c_write_rsp); - return ret; + return 0; } BAREBOX_RATP_CMD_START(I2C_WRITE) diff --git a/common/ratp/md.c b/common/ratp/md.c index 3e258c59a0..8221afaebc 100644 --- a/common/ratp/md.c +++ b/common/ratp/md.c @@ -68,8 +68,10 @@ static int do_ratp_mem_md(const char *filename, char *buf = NULL; fd = open_and_lseek(filename, O_RWSIZE_1 | O_RDONLY, start); - if (fd < 0) + if (fd < 0) { + printf("Could not open \"%s\": %m\n", filename); return -errno; + } map = memmap(fd, PROT_READ); if (map != MAP_FAILED) { diff --git a/common/ratp/mw.c b/common/ratp/mw.c index 8945799f1d..87dc8cb95c 100644 --- a/common/ratp/mw.c +++ b/common/ratp/mw.c @@ -133,6 +133,7 @@ static int ratp_cmd_mw(const struct ratp_bb *req, int req_len, fd = open_and_lseek(path, O_RWSIZE_1 | O_WRONLY, addr); if (fd < 0) { + printf("Could not open \"%s\": %m\n", path); ret = -errno; goto out; } diff --git a/common/ratp/ratp.c b/common/ratp/ratp.c index 424c9406d2..fddb286e01 100644 --- a/common/ratp/ratp.c +++ b/common/ratp/ratp.c @@ -486,7 +486,7 @@ int barebox_ratp(struct console_device *cdev) ctx->cdev = cdev; ctx->have_synch = 1; - ret = ratp_establish(&ctx->ratp, false, 100); + ret = ratp_establish(&ctx->ratp, false, 1000); if (ret < 0) goto out; |