diff options
| author | Vladimir Yakovlev <nagos@inbox.ru> | 2012-07-07 10:05:06 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-07-08 22:41:19 +0200 |
| commit | 8b6a4952e6064dc558cb7d5d375990b17491f26f (patch) | |
| tree | 97457abdb9280332b27841ad34eec716532d3f9e | |
| parent | db7720bad4ae0577c140fd72def24311afece894 (diff) | |
| download | u-boot-imx-8b6a4952e6064dc558cb7d5d375990b17491f26f.zip u-boot-imx-8b6a4952e6064dc558cb7d5d375990b17491f26f.tar.gz u-boot-imx-8b6a4952e6064dc558cb7d5d375990b17491f26f.tar.bz2 | |
tools: Fix mingw tools build
mkenvimage does not build due to missed os_support.o and unsupported
file modes S_IRGRP S_IWGRP.
Tested with mingw 4.2.1 on ubuntu 12.04.
Signed-off-by: Vladimir Yakovlev <nagos@inbox.ru>
| -rw-r--r-- | tools/Makefile | 3 | ||||
| -rw-r--r-- | tools/mkenvimage.c | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/tools/Makefile b/tools/Makefile index 8097d95..a7d1e18 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -196,7 +196,8 @@ $(obj)xway-swap-bytes$(SFX): $(obj)xway-swap-bytes.o $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ $(HOSTSTRIP) $@ -$(obj)mkenvimage$(SFX): $(obj)crc32.o $(obj)mkenvimage.o +$(obj)mkenvimage$(SFX): $(obj)crc32.o $(obj)mkenvimage.o \ + $(obj)os_support.o $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ $(HOSTSTRIP) $@ diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c index 5521268..4001d2f 100644 --- a/tools/mkenvimage.c +++ b/tools/mkenvimage.c @@ -46,6 +46,13 @@ #define CRC_SIZE sizeof(uint32_t) +#ifdef __MINGW32__ +#define FILE_PERM (S_IRUSR | S_IWUSR) +#else +#define FILE_PERM (S_IRUSR | S_IWUSR | S_IRGRP |\ + S_IWGRP) +#endif + static void usage(const char *exec_name) { fprintf(stderr, "%s [-h] [-r] [-b] [-p <byte>] -s <environment partition size> -o <output> <input file>\n" @@ -293,8 +300,7 @@ int main(int argc, char **argv) if (!bin_filename || strcmp(bin_filename, "-") == 0) { bin_fd = STDOUT_FILENO; } else { - bin_fd = creat(bin_filename, S_IRUSR | S_IWUSR | S_IRGRP | - S_IWGRP); + bin_fd = creat(bin_filename, FILE_PERM); if (bin_fd == -1) { fprintf(stderr, "Can't open output file \"%s\": %s\n", bin_filename, strerror(errno)); |