diff options
| author | Antony Pavlov <antonynpavlov@gmail.com> | 2016-05-20 08:25:51 +0300 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-05-23 09:33:21 +0200 |
| commit | fc71878c1f96cf0ee1737c57092849328f662c5a (patch) | |
| tree | a4d84d78cc092a1b1707d1317ea652f137bb97ba /common/imd.c | |
| parent | b2b000699b3e0f17e5f209ed8e1dd7f0437fb34b (diff) | |
| download | barebox-fc71878c1f96cf0ee1737c57092849328f662c5a.tar.gz barebox-fc71878c1f96cf0ee1737c57092849328f662c5a.tar.xz | |
imd: make it work on big-endian machines
The commit
commit 5e335773e0814173b40873a891964a7858d64688
Author: Sascha Hauer <s.hauer@pengutronix.de>
Date: Tue Mar 29 10:06:46 2016 +0200
imd: use struct imd_header * as argument
introduces additional imd type checks like this
if (!imd_is_string(imd->type))
return NULL;
These checks work incorrectly on any big-endian machine
because the imd->type field needs addition conversion
to little-endian byteorder before use.
Here is the imd command output on big-endian qemu-malta:
barebox:/ imd /dev/nor0.barebox
release: <NULL>
build: <NULL>
This patch fixes the problem by adding necessary conversion
via imd_read_type().
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common/imd.c')
| -rw-r--r-- | common/imd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/imd.c b/common/imd.c index 159b73a828..a8a10fc9bb 100644 --- a/common/imd.c +++ b/common/imd.c @@ -212,7 +212,7 @@ const char *imd_string_data(struct imd_header *imd, int index) int len = imd_read_length(imd); char *p = (char *)(imd + 1); - if (!imd_is_string(imd->type)) + if (!imd_is_string(imd_read_type(imd))) return NULL; for (i = 0; total < len; total += l, p += l) { @@ -239,7 +239,7 @@ char *imd_concat_strings(struct imd_header *imd) char *str; char *data = (char *)(imd + 1); - if (!imd_is_string(imd->type)) + if (!imd_is_string(imd_read_type(imd))) return NULL; str = malloc(len); |