From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 5/7] scripts: kwboot: simplify kwboot_mmap_image
Date: Wed, 28 Sep 2016 20:50:15 +0200 [thread overview]
Message-ID: <20160928185017.25002-6-u.kleine-koenig@pengutronix.de> (raw)
In-Reply-To: <20160928185017.25002-1-u.kleine-koenig@pengutronix.de>
There was only a single caller who passes prot=PROT_READ unconditionally.
So drop this parameter and simplify accordingly.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
scripts/kwboot.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/scripts/kwboot.c b/scripts/kwboot.c
index 58ea1ad7a7b3..1fcb49b7acda 100644
--- a/scripts/kwboot.c
+++ b/scripts/kwboot.c
@@ -657,9 +657,9 @@ kwboot_check_image(const unsigned char *img, size_t size)
}
static void *
-kwboot_mmap_image(const char *path, size_t *size, int prot)
+kwboot_mmap_image(const char *path, size_t *size)
{
- int rc, fd, flags;
+ int rc, fd;
struct stat st;
void *img;
@@ -674,9 +674,7 @@ kwboot_mmap_image(const char *path, size_t *size, int prot)
if (rc)
goto out;
- flags = (prot & PROT_WRITE) ? MAP_PRIVATE : MAP_SHARED;
-
- img = mmap(NULL, st.st_size, prot, flags, fd, 0);
+ img = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
if (img == MAP_FAILED) {
img = NULL;
goto out;
@@ -793,7 +791,7 @@ main(int argc, char **argv)
}
if (imgpath) {
- img = kwboot_mmap_image(imgpath, &size, PROT_READ);
+ img = kwboot_mmap_image(imgpath, &size);
if (!img) {
perror(imgpath);
goto out;
--
2.9.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2016-09-28 18:51 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-28 18:50 [PATCH 0/7] scripts: kwboot: various improvements Uwe Kleine-König
2016-09-28 18:50 ` [PATCH 1/7] scripts: kwboot: try to resync on packet boundary after receiving a NAK Uwe Kleine-König
2016-09-28 18:50 ` [PATCH 2/7] scripts: kwboot: flush input and output only once Uwe Kleine-König
2016-09-28 18:50 ` [PATCH 3/7] scripts: kwboot: improve diagnostic output Uwe Kleine-König
2016-09-28 18:50 ` [PATCH 4/7] scripts: kwboot: shorten delay between two boot messages Uwe Kleine-König
2016-09-28 18:50 ` Uwe Kleine-König [this message]
2016-09-28 18:50 ` [PATCH 6/7] scripts: kwboot: set boot source to UART before sending Uwe Kleine-König
2016-09-28 18:50 ` [PATCH 7/7] images: mvebu: don't generate uart images Uwe Kleine-König
2016-10-04 6:05 ` [PATCH 0/7] scripts: kwboot: various improvements Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160928185017.25002-6-u.kleine-koenig@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox