Add support for compiling the host tools in the tools directory using
the MinGW toolchain. This produces executables which can be used on
standard Windows computers without requiring cygwin.
One must specify the MinGW compiler and strip utilities as if they
were the host toolchain in order to build win32 executables, eg:
make HOSTCC=i586-mingw32msvc-gcc HOSTSTRIP=i586-mingw32msvc-strip tools
Signed-off-by: Peter Tyser <pty...@xes-inc.com>
---
README | 10 ++++++
include/image.h | 2 +
include/libfdt_env.h | 12 +++++++
include/linux/types.h | 5 ++-
tools/Makefile | 15 +++++++--
tools/mingw_support.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++
tools/mingw_support.h | 48 +++++++++++++++++++++++++++++
tools/mkimage.c | 4 ++
tools/mkimage.h | 5 +++
tools/ubsha1.c | 6 +++-
10 files changed, 181 insertions(+), 5 deletions(-)
create mode 100644 tools/mingw_support.c
create mode 100644 tools/mingw_support.h
diff --git a/README b/README
index 43fb1c0..3609eca 100644
--- a/README
+++ b/README
@@ -2710,6 +2710,16 @@ necessary. For example using the ELDK on a 4xx CPU,
please enter:
$ CROSS_COMPILE=ppc_4xx-
$ export CROSS_COMPILE
+Note: If you wish to generate WIN32 versions of the utilities in
+ the tools directory you can use the MinGW toolchain
+ (http://www.mingw.org). Set your HOST tools to the MinGW
+ binaries and execute 'make tools'. For example:
+
+ $ make HOSTCC=i586-mingw32msvc-gcc HOSTSTRIP=i586-mingw32msvc-strip
tools
+
+ Binaries such as tools/mkimage.exe will be created which can
+ be executed on computers using Windows.
+
U-Boot is intended to be simple to build. After installing the
sources you must configure U-Boot for one specific board type. This
is done by typing:
diff --git a/include/image.h b/include/image.h
index 74a1240..f183757 100644
--- a/include/image.h
+++ b/include/image.h
@@ -34,7 +34,9 @@
#define __IMAGE_H__
#if USE_HOSTCC
+#ifndef __MINGW32__
#include <endian.h>
+#endif
/* new uImage format support enabled on host */
#define CONFIG_FIT 1
diff --git a/include/libfdt_env.h b/include/libfdt_env.h
index ea474a5..1c67015 100644
--- a/include/libfdt_env.h
+++ b/include/libfdt_env.h
@@ -24,8 +24,13 @@
#ifdef USE_HOSTCC
#include <stdint.h>
#include <string.h>
+#ifdef __MINGW32__
+#include <linux/types.h>
+#include <linux/byteorder/swab.h>
+#else
#include <endian.h>
#include <byteswap.h>
+#endif /* __MINGW32__ */
#else
#include <linux/string.h>
#include <linux/types.h>
@@ -36,10 +41,17 @@
extern struct fdt_header *working_fdt; /* Pointer to the working fdt */
#if __BYTE_ORDER == __LITTLE_ENDIAN
+#ifdef __MINGW32__
+#define fdt32_to_cpu(x) ___swab32(x)
+#define cpu_to_fdt32(x) ___swab32(x)
+#define fdt64_to_cpu(x) ___swab64(x)
+#define cpu_to_fdt64(x) ___swab64(x)
+#else
#define fdt32_to_cpu(x) bswap_32(x)
#define cpu_to_fdt32(x) bswap_32(x)
#define fdt64_to_cpu(x) bswap_64(x)
#define cpu_to_fdt64(x) bswap_64(x)
+#endif
#else
#define fdt32_to_cpu(x) (x)
#define cpu_to_fdt32(x) (x)
diff --git a/include/linux/types.h b/include/linux/types.h
index 1b0b4a4..90c0695 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -10,10 +10,13 @@
#ifndef __KERNEL_STRICT_NAMES
+#ifndef __MINGW32__
+/* prevent mingw overlaps for certain typedefs */
typedef __kernel_fd_set fd_set;
typedef __kernel_dev_t dev_t;
typedef __kernel_ino_t ino_t;
typedef __kernel_mode_t mode_t;
+#endif
typedef __kernel_nlink_t nlink_t;
typedef __kernel_off_t off_t;
typedef __kernel_pid_t pid_t;
@@ -54,7 +57,7 @@ typedef __kernel_loff_t loff_t;
typedef __kernel_size_t size_t;
#endif
-#ifndef _SSIZE_T
+#if !defined(_SSIZE_T) && !defined(__MINGW32__)
#define _SSIZE_T
typedef __kernel_ssize_t ssize_t;
#endif
diff --git a/tools/Makefile b/tools/Makefile
index 429f741..9b40276 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -79,6 +79,14 @@ SFX =
endif
#
+# mingw toolchain requires mingw_support.c and generates .exe files
+#
+ifneq (,$(findstring mingw,$(shell $(HOSTCC) -v 2>&1 | grep mingw)))
+MINGW_OBJ_FILES-y += mingw_support.o
+SFX = .exe
+endif
+
+#
# Include this after HOSTOS HOSTARCH check
# so that we can act intelligently.
#
@@ -140,6 +148,7 @@ endif
SRCS := $(addprefix $(obj),$(OBJ_LINKS-y:.o=.c)) $(OBJ_FILES-y:.o=.c)
BINS := $(addprefix $(obj),$(BIN_FILES-y))
LIBFDT_OBJS := $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y))
+MINGW_OBJS := $(addprefix $(obj),$(MINGW_OBJ_FILES-y))
#
# Use native tools and options
@@ -163,7 +172,7 @@ all: $(obj).depend $(BINS) $(LOGO-y) subdirs
$(obj)envcrc$(SFX): $(obj)envcrc.o $(obj)crc32.o $(obj)env_embedded.o
$(obj)sha1.o
$(CC) $(CFLAGS) -o $@ $^
-$(obj)ubsha1$(SFX): $(obj)ubsha1.o $(obj)sha1.o
+$(obj)ubsha1$(SFX): $(obj)ubsha1.o $(obj)sha1.o $(MINGW_OBJS)
$(CC) $(CFLAGS) -o $@ $^
$(obj)img2srec$(SFX): $(obj)img2srec.o
@@ -171,7 +180,7 @@ $(obj)img2srec$(SFX): $(obj)img2srec.o
$(STRIP) $@
$(obj)mkimage$(SFX): $(obj)mkimage.o $(obj)crc32.o $(obj)image.o $(obj)md5.o
\
- $(obj)sha1.o $(LIBFDT_OBJS)
+ $(obj)sha1.o $(LIBFDT_OBJS) $(MINGW_OBJS)
$(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
$(STRIP) $@
@@ -318,7 +327,7 @@ $(obj)libfdt_internal.h:
@rm -f $(obj)libfdt_internal.h
ln -s $(src)../libfdt/libfdt_internal.h $(obj)libfdt_internal.h
-$(LOGO_H): $(obj)bmp_logo $(LOGO_BMP)
+$(LOGO_H): $(obj)bmp_logo$(SFX) $(LOGO_BMP)
$(obj)./bmp_logo $(LOGO_BMP) >$@
#########################################################################
diff --git a/tools/mingw_support.c b/tools/mingw_support.c
new file mode 100644
index 0000000..67cd6e1
--- /dev/null
+++ b/tools/mingw_support.c
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2008 Extreme Engineering Solutions, Inc.
+ *
+ * mmap/munmap implementation derived from:
+ * Clamav Native Windows Port : mmap win32 compatibility layer
+ * Copyright (c) 2005-2006 Gianluigi Tiesi <sher...@netfarm.it>
+ * Parts by Kees Zeelenberg <k...@users.sourceforge.net> (LibGW32C)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this software; if not, write to the
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "mingw_support.h"
+#include <stdio.h>
+#include <stdint.h>
+#include <errno.h>
+#include <io.h>
+
+int fsync(int fd)
+{
+ return _commit(fd);
+}
+
+void *mmap(void *addr, size_t len, int prot, int flags, int fd, int offset)
+{
+ void *map = NULL;
+ HANDLE handle = INVALID_HANDLE_VALUE;
+ DWORD cfm_flags = 0, mvf_flags = 0;
+
+ switch (prot) {
+ case PROT_READ | PROT_WRITE:
+ cfm_flags = PAGE_READWRITE;
+ mvf_flags = FILE_MAP_ALL_ACCESS;
+ break;
+ case PROT_WRITE:
+ cfm_flags = PAGE_READWRITE;
+ mvf_flags = FILE_MAP_WRITE;
+ break;
+ case PROT_READ:
+ cfm_flags = PAGE_READONLY;
+ mvf_flags = FILE_MAP_READ;
+ break;
+ default:
+ return MAP_FAILED;
+ }
+
+ handle = CreateFileMappingA((HANDLE) _get_osfhandle(fd), NULL,
+ cfm_flags, HIDWORD(len), LODWORD(len), NULL);
+ if (!handle)
+ return MAP_FAILED;
+
+ map = MapViewOfFile(handle, mvf_flags, HIDWORD(offset),
+ LODWORD(offset), len);
+ CloseHandle(handle);
+
+ if (!map)
+ return MAP_FAILED;
+
+ return map;
+}
+
+int munmap(void *addr, size_t len)
+{
+ if (!UnmapViewOfFile(addr))
+ return -1;
+
+ return 0;
+}
diff --git a/tools/mingw_support.h b/tools/mingw_support.h
new file mode 100644
index 0000000..b4011a6
--- /dev/null
+++ b/tools/mingw_support.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2008 Extreme Engineering Solutions, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this software; if not, write to the
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef __MINGW_SUPPORT_H_
+#define __WINGW_SUPPORT_H_ 1
+
+/* Defining __INSIDE_MSYS__ helps to prevent u-boot/mingw overlap */
+#define __INSIDE_MSYS__ 1
+
+#include <windows.h>
+
+/* mmap protections */
+#define PROT_READ 0x1 /* Page can be read */
+#define PROT_WRITE 0x2 /* Page can be written */
+#define PROT_EXEC 0x4 /* Page can be executed */
+#define PROT_NONE 0x0 /* Page can not be accessed */
+
+/* Sharing types (must choose one and only one of these) */
+#define MAP_SHARED 0x01 /* Share changes */
+#define MAP_PRIVATE 0x02 /* Changes are private */
+
+/* Return value of `mmap' in case of an error */
+#define MAP_FAILED ((void *) -1)
+
+/* Windows 64-bit access macros */
+#define LODWORD(l) ((DWORD)((DWORDLONG)(l)))
+#define HIDWORD(l) ((DWORD)(((DWORDLONG)(l)>>32)&0xFFFFFFFF))
+
+int fsync(int fd);
+void *mmap(void *, size_t, int, int, int, int);
+int munmap(void *, size_t);
+
+#endif /* __MINGW_SUPPORT_H_ */
diff --git a/tools/mkimage.c b/tools/mkimage.c
index 967fe9a..380b535 100644
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -25,6 +25,10 @@
#include "mkimage.h"
#include <image.h>
+#ifdef __MINGW32__
+#include "mingw_support.h"
+#endif
+
extern int errno;
#ifndef MAP_FAILED
diff --git a/tools/mkimage.h b/tools/mkimage.h
index a2d5248..6974fa4 100644
--- a/tools/mkimage.h
+++ b/tools/mkimage.h
@@ -28,7 +28,11 @@
#ifndef __WIN32__
#include <netinet/in.h> /* for host / network byte order
conversions */
#endif
+#ifdef __MINGW32__
+#include <stdint.h>
+#else
#include <sys/mman.h>
+#endif
#include <sys/stat.h>
#include <time.h>
#include <unistd.h>
@@ -65,6 +69,7 @@ typedef unsigned int __u32;
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
typedef unsigned int uint32_t;
+typedef unsigned long ulong;
#define ntohl(a) SWAP_LONG(a)
#define htonl(a) SWAP_LONG(a)
diff --git a/tools/ubsha1.c b/tools/ubsha1.c
index b37b2b7..604921d 100644
--- a/tools/ubsha1.c
+++ b/tools/ubsha1.c
@@ -27,9 +27,13 @@
#include <fcntl.h>
#include <errno.h>
#include <string.h>
-#include <sys/mman.h>
#include <sys/stat.h>
#include "sha1.h"
+#ifdef __MINGW32__
+#include "mingw_support.h"
+#else
+#include <sys/mman.h>
+#endif
#ifndef __ASSEMBLY__
#define __ASSEMBLY__ /* Dirty trick to get only #defines
*/
--
1.6.0.2.GIT
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
