tools: Support building U-Boot host tools for Windows via MSYS2
Subsystems (3)
v3 cover tools: Support building U-Boot host tools for Windows via MSYS2
Per current U-Boot README, building Windows versions of the utilities in the tools directory is done via the MinGW toolchain. But testing shows that it is broken and actually it must have been broken for quite a long time.
Fixing MinGW build seems quite amount of work as developers of U-Boot normally work on Linux boxes hence codes written are mainly for Linux or POSIX OSes. We must investigate another way of building host tools for Windows, and now we have MSYS2, a software distro and building platform for Windows, to build POSIX compliant software on Windows using an emulation layer.
This small series fixes several issues in current U-Boot tools codes, that only assume a Linux host is used. Cases are using standard C typedefs whenever possbile, or using compiler builtin functions to improve portability, etc.
A reST document for how to build U-Boot host tools for both platforms is added.
A new CI pipeline configuration for Microsoft Azure Pipelines is added for U-Boot. We rely on it to ensure future host tools for Windows build does not break.
I've also investigated putting what we have for now on GitLab-CI and Travis-CI to Azure Pipelines, and it turns out there are several issues that should be fixed. I will post a follow-up patch series for enabling full CI testing on Azure Pipelines.
Changes in v3:
- new patch: tools: ifwitool: Define __packed when it is not defined
- rename to .azure-pipelines.yml
- correct typo in the commit summary
Changes in v2:
- new patch: Add .gitattributes for line endings
- new patch: tools: Avoid creating symbolic links for tools/version.h
- new patch: Add Microsoft Azure pipelines configuration
Bin Meng (9):
tools: image.h: Use portable uint32_t instead of linux-specific __be32
tools: mtk_image.h: Use portable uintXX_t instead of linux-specific
__leXX
tools: zynqmpbif: Use compiler builtin instead of linux-specific
__swab32 linux/types.h: Surround 'struct ustat' with __linux__
tools: ifwitool: Define __packed when it is not defined
doc: Add documentation for how to build U-Boot host tools Add .gitattributes for line endings
tools: Avoid creating symbolic links for tools/version.h Add Microsoft Azure Pipelines configuration
.azure-pipelines.yml | 38 +++++++++++++++++++++++ .gitattributes | 2 ++ Makefile | 9 ++++-- doc/build/index.rst | 9 ++++++ doc/build/tools.rst | 47 ++++++++++++++++++++++++++++ doc/index.rst | 11 +++++++ include/image.h | 14 ++++----- include/linux/types.h | 2 ++ tools/.gitignore | 1 + tools/ifwitool.c | 2 ++ tools/mtk_image.h | 86 +++++++++++++++++++++++++-------------------------- tools/version.h | 1 - tools/zynqmpbif.c | 2 +- 13 files changed, 169 insertions(+), 55 deletions(-) create mode 100644 .azure-pipelines.yml create mode 100644 .gitattributes create mode 100644 doc/build/index.rst create mode 100644 doc/build/tools.rst delete mode 120000 tools/version.h
Signature · 1 line
2.7.4
PATCH v3 1/9 tools: image.h: Use portable uint32_t instead of linux-specific __be32
__be32 has Linux kernel specific __attribute__((bitwise)) which is not portable. Use uint32_t instead.
---
Changes in v3: None
Changes in v2: None
include/image.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
include/image.h +7 -7
@@ -319,13 +319,13 @@ enum {* all data in network byte order (aka natural aka bigendian). */ typedef struct image_header { - __be32 ih_magic; /* Image Header Magic Number */ - __be32 ih_hcrc; /* Image Header CRC Checksum */ - __be32 ih_time; /* Image Creation Timestamp */ - __be32 ih_size; /* Image Data Size */ - __be32 ih_load; /* Data Load Address */ - __be32 ih_ep; /* Entry Point Address */ - __be32 ih_dcrc; /* Image Data CRC Checksum */ + uint32_t ih_magic; /* Image Header Magic Number */ + uint32_t ih_hcrc; /* Image Header CRC Checksum */ + uint32_t ih_time; /* Image Creation Timestamp */ + uint32_t ih_size; /* Image Data Size */ + uint32_t ih_load; /* Data Load Address */ + uint32_t ih_ep; /* Entry Point Address */ + uint32_t ih_dcrc; /* Image Data CRC Checksum */ uint8_t ih_os; /* Operating System */ uint8_t ih_arch; /* CPU architecture */ uint8_t ih_type; /* Image Type */
Signature · 1 line
2.7.4
PATCH v3 1/9 tools: image.h: Use portable uint32_t instead of linux-specific __be32
Quoted 4 lines · Bin Meng
__be32has Linux kernel specific __attribute__((bitwise)) which is not portable. Useuint32_tinstead.Signed-off-by Bin Meng <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191030/544dd277/attachment.sig>
PATCH v3 2/9 tools: mtk_image.h: Use portable uintXX_t instead of linux-specific __leXX
In reply to Bin Meng__leXX has Linux kernel specific __attribute__((bitwise)) which is not portable. Use corresponding uintXX_t instead.
---
Changes in v3: None
Changes in v2: None
tools/mtk_image.h | 86 +++++++++++++++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 43 deletions(-)
tools/mtk_image.h +43 -43
@@ -9,14 +9,14 @@ #ifndef _MTK_IMAGE_H #define _MTK_IMAGE_H -/* Device header definitions */ +/* Device header definitions, all fields are little-endian */ /* Header for NOR/SD/eMMC */ union gen_boot_header { struct { char name[12]; - __le32 version; - __le32 size; + uint32_t version; + uint32_t size; }; uint8_t pad[0x200];
@@ -32,14 +32,14 @@ union nand_boot_header {char name[12 ];char version[4 ];char id[8 ]; -__le16 ioif; -__le16 pagesize; -__le16 addrcycles; -__le16 oobsize; -__le16 pages_of_block; -__le16 numblocks; -__le16 writesize_shift; -__le16 erasesize_shift; +uint16_t ioif; +uint16_t pagesize; +uint16_t addrcycles; +uint16_t oobsize; +uint16_t pages_of_block; +uint16_t numblocks; +uint16_t writesize_shift; +uint16_t erasesize_shift;uint8_t dummy[60 ];uint8_t ecc_parity[28 ]; };
@@ -54,14 +54,14 @@ union nand_boot_header {/* BootROM layout header */ struct brom_layout_header {char name[8 ]; -__le32 version; -__le32 header_size; -__le32 total_size; -__le32 magic; -__le32 type; -__le32 header_size_2; -__le32 total_size_2; -__le32 unused; +uint32_t version; +uint32_t header_size; +uint32_t total_size; +uint32_t magic; +uint32_t type; +uint32_t header_size_2; +uint32_t total_size_2; +uint32_t unused; };#define BRLYT_NAME "BRLYT"
@@ -90,8 +90,8 @@ struct gen_device_header {struct gfh_common_header {uint8_t magic[3 ];uint8_t version; -__le16 size; -__le16 type; +uint16_t size; +uint16_t type; };#define GFH_HEADER_MAGIC "MMM"
@@ -106,17 +106,17 @@ struct gfh_common_header {struct gfh_file_info {struct gfh_common_header gfh;char name[12 ]; -__le32 unused; -__le16 file_type; +uint32_t unused; +uint16_t file_type;uint8_t flash_type;uint8_t sig_type; -__le32 load_addr; -__le32 total_size; -__le32 max_size; -__le32 hdr_size; -__le32 sig_size; -__le32 jump_offset; -__le32 processed; +uint32_t load_addr; +uint32_t total_size; +uint32_t max_size; +uint32_t hdr_size; +uint32_t sig_size; +uint32_t jump_offset; +uint32_t processed; };#define GFH_FILE_INFO_NAME "FILE_INFO"
@@ -129,16 +129,16 @@ struct gfh_file_info {struct gfh_bl_info {struct gfh_common_header gfh; -__le32 attr; +uint32_t attr; };struct gfh_brom_cfg {struct gfh_common_header gfh; -__le32 cfg_bits; -__le32 usbdl_by_auto_detect_timeout_ms; +uint32_t cfg_bits; +uint32_t usbdl_by_auto_detect_timeout_ms;uint8_t unused[0x48 ]; -__le32 usbdl_by_kcol0_timeout_ms; -__le32 usbdl_by_flag_timeout_ms; +uint32_t usbdl_by_kcol0_timeout_ms; +uint32_t usbdl_by_flag_timeout_ms;uint32_t pad; };
@@ -157,15 +157,15 @@ struct gfh_anti_clone {uint8_t ac_b2k;uint8_t ac_b2c;uint16_t pad; -__le32 ac_offset; -__le32 ac_len; +uint32_t ac_offset; +uint32_t ac_len; };struct gfh_brom_sec_cfg {struct gfh_common_header gfh; -__le32 cfg_bits; +uint32_t cfg_bits;char customer_name[0x20 ]; -__le32 pad; +uint32_t pad; };#define BROM_SEC_CFG_JTAG_EN 1
@@ -184,11 +184,11 @@ struct gfh_header {union lk_hdr {struct { -__le32 magic; -__le32 size; +uint32_t magic; +uint32_t size;char name[32 ]; -__le32 loadaddr; -__le32 mode; +uint32_t loadaddr; +uint32_t mode; };uint8_t data[512 ];
Signature · 1 line
2.7.4
PATCH v3 2/9 tools: mtk_image.h: Use portable uintXX_t instead of linux-specific __leXX
Quoted 4 lines · Bin Meng
__leXXhas Linux kernel specific __attribute__((bitwise)) which is not portable. Use correspondinguintXX_tinstead.Signed-off-by Bin Meng <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191030/95f8c037/attachment.sig>
PATCH v3 3/9 tools: zynqmpbif: Use compiler builtin instead of linux-specific __swab32
In reply to Bin Meng__swab32() is a Linux specific macro defined in linux/swab.h. Let's use the compiler equivalent builtin function __builtin_bswap32() for better portability.
---
Changes in v3: None
Changes in v2: None
tools/zynqmpbif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/zynqmpbif.c +1 -1
@@ -517,7 +517,7 @@ static int bif_add_bit(struct bif_entry *bf)debug ("Bitstream Length: 0x%x\n" , bitlen);for (i =0 ; i < bitlen; i +=sizeof (uint32_t )) {uint32_t *bitbin32 = (uint32_t *)&bitbin[i]; - *bitbin32 =__swab32 (*bitbin32); + *bitbin32 =__builtin_bswap32 (*bitbin32); }if (!bf->dest_dev)
Signature · 1 line
2.7.4
PATCH v3 3/9 tools: zynqmpbif: Use compiler builtin instead of linux-specific __swab32
Quoted 5 lines · Bin Meng
__swab32()is a Linux specific macro defined inlinux/swab.h. Let's use the compiler equivalent builtin function__builtin_bswap32()for better portability.Signed-off-by Bin Meng <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191030/c209a9a0/attachment.sig>
PATCH v3 4/9 linux/types.h: Surround 'struct ustat' with __linux__
In reply to Bin Meng'struct ustat' uses linux-specific typedefs to declare its memebers:__kernel_daddr_t and __kernel_ino_t. It is currently not used by any U-Boot codes, but when we build U-Boot tools for other platform like Windows, this becomes a problem.
Let's surround it with __linux__.
---
Changes in v3: None
Changes in v2: None
include/linux/types.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/types.h +2 -0
@@ -151,12 +151,14 @@ typedef __u32 __bitwise __wsum;typedef unsigned __bitwise__ gfp_t ; +#ifdef __linux__struct ustat {__kernel_daddr_t f_tfree;__kernel_ino_t f_tinode;char f_fname[6 ];char f_fpack[6 ]; }; +#endif #define DECLARE_BITMAP (name, bits) \ unsigned long name[BITS_TO_LONGS(bits)]
Signature · 1 line
2.7.4
PATCH v3 4/9 linux/types.h: Surround 'struct ustat' with __linux__
Quoted 8 lines · Bin Meng
'struct ustat' uses linux-specific typedefs to declare its memebers:
__kernel_daddr_tand__kernel_ino_t. It is currently not used by any U-Boot codes, but when we build U-Boot tools for other platform like Windows, this becomes a problem.Let's surround it with
__linux__.Signed-off-by Bin Meng <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191030/3b2eaab2/attachment.sig>
PATCH v3 5/9 tools: ifwitool: Define __packed when it is not defined
In reply to Bin MengSome compilers may provide __packed define for us.
---
Changes in v3:
- new patch: tools: ifwitool: Define __packed when it is not defined
Changes in v2: None
tools/ifwitool.c | 2 ++ 1 file changed, 2 insertions(+)
tools/ifwitool.c +2 -0
@@ -10,7 +10,9 @@#include <getopt.h> #include "os_support.h" +#ifndef __packed#define __packed __attribute__((packed)) +#endif #define KiB 1024#define ALIGN (x, a) __ALIGN_MASK((x), (typeof(x))(a) - 1)#define __ALIGN_MASK (x, mask) (((x) + (mask)) & ~(mask))
Signature · 1 line
2.7.4
PATCH v3 5/9 tools: ifwitool: Define __packed when it is not defined
Quoted 3 lines · Bin Meng
Some compilers may provide
__packeddefine for us.Signed-off-by Bin Meng <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191030/058e2346/attachment.sig>
PATCH v3 6/9 doc: Add documentation for how to build U-Boot host tools
In reply to Bin MengThis adds a reST document for how to build U-Boot host tools, including information for both Linux and Windows.
---
Changes in v3: None
Changes in v2: None
doc/build/index.rst | 9 +++++++++ doc/build/tools.rst | 47 +++++++++++++++++++++++++++++++++++++++++++++++ doc/index.rst | 11 +++++++++++ 3 files changed, 67 insertions(+) create mode 100644 doc/build/index.rst create mode 100644 doc/build/tools.rst
doc/build/index.rst new file +9 -0
@@ -0,0 +1,9 @@ +.. SPDX-License-Identifier: GPL-2.0+ + +Build U-Boot +============ + +.. toctree:: + :maxdepth: 2 + + tools
doc/build/tools.rst new file +47 -0
47 lines not on this page · raw message
doc/index.rst +11 -0
@@ -15,6 +15,17 @@ if you want to help out. .. toctree:: :maxdepth: 2 +User-oriented documentation +--------------------------- + +The following manuals are written for *users* of the U-Boot - those who are +trying to get it to work optimally on a given system. + +.. toctree:: + :maxdepth: 2 + + build/index + Unified Extensible Firmware (UEFI) ----------------------------------
Signature · 1 line
2.7.4
PATCH v3 6/9 doc: Add documentation for how to build U-Boot host tools
Quoted 4 lines · Bin Meng
This adds a reST document for how to build U-Boot host tools, including information for both Linux and Windows.
Signed-off-by Bin Meng <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191030/9d5b4ae5/attachment.sig>
PATCH v3 7/9 Add .gitattributes for line endings
In reply to Bin MengWhen building U-Boot host tools for Windows from Microsoft Azure Pipelines, we see tons of weird warnings and errors emitted from every Kconfig files:
Kconfig:6:warning: ignoring unsupported character '' Kconfig:6:warning: ignoring unsupported character '' Kconfig:8:warning: ignoring unsupported character '' Kconfig:9:warning: ignoring unsupported character '' Kconfig:10:warning: ignoring unsupported character '' Kconfig:10:warning: ignoring unsupported character '' Kconfig:13:warning: ignoring unsupported character '' arch/Kconfig:1:warning: ignoring unsupported character '' arch/Kconfig:2:warning: ignoring unsupported character '' arch/Kconfig:2:warning: ignoring unsupported character '' arch/Kconfig:4:warning: ignoring unsupported character ''
...
After several rounds of experiments, it turns out this is caused by line endings. Historically, Linux and macOS used linefeed (LF) characters while Windows used a carriage return plus a linefeed (CRLF). When Azure Pipelines checks out the U-Boot repo, Git tries to compensate for the difference by automatically making lines end in CRLF in the working directory on Windows, which confuses the Kconfig file parsing logic.
Fortunately Git provides a way for repos to tell Git not to do such automatical line endings conversion via .gitattributes file below:
* text eol=lf
---
Changes in v3: None
Changes in v2:
- new patch: Add .gitattributes for line endings
.gitattributes | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitattributes
.gitattributes new file +2 -0
@@ -0,0 +1,2 @@ +# Declare files that always have LF line endings on checkout +* text eol=lf
Signature · 1 line
2.7.4
PATCH v3 7/9 Add .gitattributes for line endings
Quoted 25 lines · Bin Meng
When building U-Boot host tools for Windows from Microsoft Azure Pipelines, we see tons of weird warnings and errors emitted from every
Kconfigfiles:Kconfig:6:warning: ignoring unsupported character '' Kconfig:6:warning: ignoring unsupported character '' Kconfig:8:warning: ignoring unsupported character '' Kconfig:9:warning: ignoring unsupported character '' Kconfig:10:warning: ignoring unsupported character '' Kconfig:10:warning: ignoring unsupported character '' Kconfig:13:warning: ignoring unsupported character '' arch/Kconfig:1:warning: ignoring unsupported character '' arch/Kconfig:2:warning: ignoring unsupported character '' arch/Kconfig:2:warning: ignoring unsupported character '' arch/Kconfig:4:warning: ignoring unsupported character ''
...After several rounds of experiments, it turns out this is caused by line endings. Historically, Linux and macOS used linefeed (LF) characters while Windows used a carriage return plus a linefeed (CRLF). When Azure Pipelines checks out the U-Boot repo, Git tries to compensate for the difference by automatically making lines end in CRLF in the working directory on Windows, which confuses the
Kconfigfile parsing logic.
Quoted 6 lines
Fortunately Git provides a way for repos to tell Git not to do such automatical line endings conversion via .gitattributes file below:
* text eol=lf
Signed-off-by Bin Meng <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191030/eea667c9/attachment.sig>
PATCH v3 8/9 tools: Avoid creating symbolic links for tools/version.h
In reply to Bin MengWhen building U-Boot host tools for Windows from Microsoft Azure Pipelines, the following errors were seen:
HOSTCC tools/mkenvimage.o
In file included from tools/mkenvimage.c:25:
./tools/version.h:1:1: error: expected identifier or ‘(’ before ‘.’ token
1 | ../include/version.h
| ^
tools/mkenvimage.c: In function ‘main’:
tools/mkenvimage.c:117:4: warning: implicit declaration of function ‘usage’ [-Wimplicit-function-declaration]
117 | usage(prg);
| ^~~~~
tools/mkenvimage.c:120:35: error: ‘PLAIN_VERSION’ undeclared (first use in this function)
120 | printf("%s version %s\n", prg, PLAIN_VERSION);
| ^~~~~~~~~~~~~ tools/mkenvimage.c:120:35: note: each undeclared identifier is reported only once for each function it appears in make[2]: *** [scripts/Makefile.host:114: tools/mkenvimage.o] Error 1
It turns out tools/version.h is a symbolic link and with Windows default settings it is unsupported hence the actual content of tools/version.h is not what file include/version.h has, but the the linked file path, which breaks the build.
To fix this, remove the symbolic links for tools/version.h. Instead we perform a copy from include/version.h during the build.
---
Changes in v3: None
Changes in v2:
- new patch: tools: Avoid creating symbolic links for tools/version.h
Makefile | 9 ++++++--- tools/.gitignore | 1 + tools/version.h | 1 - 3 files changed, 7 insertions(+), 4 deletions(-) delete mode 120000 tools/version.h
Makefile +6 -3
@@ -1837,11 +1837,14 @@ checkarmreloc: u-boot false; \ fi -envtools: scripts_basic $(version_h) $(timestamp_h) +tools/version.h: include/version.h + $(call if_changed,copy) + +envtools: scripts_basic $(version_h) $(timestamp_h) tools/version.h $(Q)$(MAKE) $(build)=tools/env tools-only: export TOOLS_ONLY=y -tools-only: scripts_basic $(version_h) $(timestamp_h) +tools-only: scripts_basic $(version_h) $(timestamp_h) tools/version.h $(Q)$(MAKE) $(build)=tools tools-all: export HOST_TOOLS_ALL=y
@@ -1869,7 +1872,7 @@ CLEAN_DIRS += $(MODVERDIR) \ $(foreach d, spl tpl, $(patsubst %,$d/%, \ $(filter-out include, $(shell ls -1 $d 2>/dev/null)))) -CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h \ +CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h tools/version.h \ boot* u-boot* MLO* SPL System.map fit-dtb.blob* # Directories & files removed with 'make mrproper'
tools/.gitignore +1 -0
@@ -31,4 +31,5 @@ /spl_size_limit /sunxi-spl-image-builder /ubsha1 +/version.h /xway-swap-bytes
tools/version.h deleted +0 -1
@@ -1 +0,0 @@ -../include/version.h
Signature · 1 line
2.7.4
PATCH v3 8/9 tools: Avoid creating symbolic links for tools/version.h
Quoted 23 lines · Bin Meng
When building U-Boot host tools for Windows from Microsoft Azure Pipelines, the following errors were seen:
HOSTCC
tools/mkenvimage.o
In file included fromtools/mkenvimage.c:25:
./tools/version.h:1:1: error: expected identifier or ‘(’ before ‘.’ token1 | ../include/version.h | ^ tools/mkenvimage.c: In function ‘main’: tools/mkenvimage.c:117:4: warning: implicit declaration of function ‘usage’ [-Wimplicit-function-declaration] 117 | usage(prg); | ^~~~~ tools/mkenvimage.c:120:35: error: ‘PLAIN_VERSION’ undeclared (first use in this function) 120 | printf("%s version %s\n", prg, PLAIN_VERSION); | ^~~~~~~~~~~~~
tools/mkenvimage.c:120:35: note: each undeclared identifier is reported only once for each function it appears in make[2]: *** [scripts/Makefile.host:114:tools/mkenvimage.o] Error 1It turns out
tools/version.his a symbolic link and with Windows default settings it is unsupported hence the actual content oftools/version.his not what fileinclude/version.hhas, but the the linked file path, which breaks the build.
Quoted 4 lines
To fix this, remove the symbolic links for
tools/version.h. Instead we perform a copy frominclude/version.hduring the build.Signed-off-by Bin Meng <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191030/eb7b72ba/attachment.sig>
PATCH v3 9/9 Add Microsoft Azure Pipelines configuration
In reply to Bin MengMicrosoft Azure Pipelines [1] provides unlimited CI/CD minutes and 10 parallel jobs to every open source project for free.
This adds a configuration file for Azure Pipelines to utilize the free Windows VM hosted by Microsoft to ensure no build broken in building U-Boot host tools for Windows.
---
See the build result at:
https://dev.azure.com/bmeng/GitHub/_build/results?buildId=53
Changes in v3:
- rename to .azure-pipelines.yml
- correct typo in the commit summary
Changes in v2:
- new patch: Add Microsoft Azure pipelines configuration
.azure-pipelines.yml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .azure-pipelines.yml
.azure-pipelines.yml new file +38 -0
@@ -0,0 +1,38 @@ +variables: + windows_vm: vs2015-win2012r2 + +jobs: + - job: tools_only_windows + displayName: 'Ensure host tools build for Windows' + pool: + vmImage: $(windows_vm) + strategy: + matrix: + i686: + MSYS_DIR: msys32 + BASE_REPO: msys2-ci-base-i686 + x86_64: + MSYS_DIR: msys64 + BASE_REPO: msys2-ci-base + steps: + - script: | + git clone https://github.com/msys2/$(BASE_REPO).git %CD:~0,2%\$(MSYS_DIR) + displayName: 'Install MSYS2' + - script: | + set PATH=%CD:~0,2%\$(MSYS_DIR)\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem + %CD:~0,2%\$(MSYS_DIR)\usr\bin\pacman --noconfirm -Syyuu + displayName: 'Update MSYS2' + - script: | + set PATH=%CD:~0,2%\$(MSYS_DIR)\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem + %CD:~0,2%\$(MSYS_DIR)\usr\bin\pacman --noconfirm --needed -S make gcc bison diffutils openssl-devel + displayName: 'Install Toolchain' + - script: | + set PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem + echo make tools-only_defconfig tools-only NO_SDL=1 > build-tools.sh + %CD:~0,2%\$(MSYS_DIR)\usr\bin\bash -lc "bash build-tools.sh" + displayName: 'Build Host Tools' + env: + # Tell MSYS2 we need a POSIX emulation layer + MSYSTEM: MSYS + # Tell MSYS2 not to ‘cd’ our startup directory to HOME + CHERE_INVOKING: yes
Signature · 1 line
2.7.4
PATCH v3 9/9 Add Microsoft Azure Pipelines configuration
Quoted 10 lines · Bin Meng
Microsoft Azure Pipelines [1] provides unlimited CI/CD minutes and 10 parallel jobs to every open source project for free.
This adds a configuration file for Azure Pipelines to utilize the free Windows VM hosted by Microsoft to ensure no build broken in building U-Boot host tools for Windows.
Signed-off-by Bin Meng <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191030/af5ad7c1/attachment.sig>
v3 cover tools: Support building U-Boot host tools for Windows via MSYS2
In reply to Bin MengHi Tom,
Quoted 30 lines · Bin Meng
Per current U-Boot README, building Windows versions of the utilities in the tools directory is done via the MinGW toolchain. But testing shows that it is broken and actually it must have been broken for quite a long time.
Fixing MinGW build seems quite amount of work as developers of U-Boot normally work on Linux boxes hence codes written are mainly for Linux or POSIX OSes. We must investigate another way of building host tools for Windows, and now we have MSYS2, a software distro and building platform for Windows, to build POSIX compliant software on Windows using an emulation layer.
This small series fixes several issues in current U-Boot tools codes, that only assume a Linux host is used. Cases are using standard C typedefs whenever possbile, or using compiler builtin functions to improve portability, etc.
A reST document for how to build U-Boot host tools for both platforms is added.
A new CI pipeline configuration for Microsoft Azure Pipelines is added for U-Boot. We rely on it to ensure future host tools for Windows build does not break.
I've also investigated putting what we have for now on GitLab-CI and Travis-CI to Azure Pipelines, and it turns out there are several issues that should be fixed. I will post a follow-up patch series for enabling full CI testing on Azure Pipelines.
Quoted 5 lines
Changes in v3:
- new patch: tools: ifwitool: Define__packedwhen it is not defined
- rename to .azure-pipelines.yml
- correct typo in the commit summary
If there is no issue, could we get this series applied in v2020.01-rc1?
Quoted 29 lines
Changes in v2:
- new patch: Add .gitattributes for line endings
- new patch: tools: Avoid creating symbolic links fortools/version.h
- new patch: Add Microsoft Azure pipelines configurationBin Meng (9):
tools:image.h: Use portableuint32_tinstead of linux-specific__be32
tools:mtk_image.h: Use portableuintXX_tinstead of linux-specific__leXX tools: zynqmpbif: Use compiler builtin instead of linux-specific __swab32
linux/types.h: Surround 'struct ustat' with__linux__
tools: ifwitool: Define__packedwhen it is not defined
doc: Add documentation for how to build U-Boot host tools Add .gitattributes for line endings
tools: Avoid creating symbolic links fortools/version.hAdd Microsoft Azure Pipelines configuration.azure-pipelines.yml | 38 +++++++++++++++++++++++ .gitattributes | 2 ++ Makefile | 9 ++++-- doc/build/index.rst | 9 ++++++ doc/build/tools.rst | 47 ++++++++++++++++++++++++++++ doc/index.rst | 11 +++++++ include/image.h | 14 ++++----- include/linux/types.h | 2 ++ tools/.gitignore | 1 + tools/ifwitool.c | 2 ++ tools/mtk_image.h | 86 +++++++++++++++++++++++++--------------------------
Quoted 8 lines
tools/version.h | 1 - tools/zynqmpbif.c | 2 +- 13 files changed, 169 insertions(+), 55 deletions(-) create mode 100644 .azure-pipelines.yml create mode 100644 .gitattributes create mode 100644 doc/build/index.rst create mode 100644 doc/build/tools.rst delete mode 120000 tools/version.h
Regards,
Bin
v3 cover tools: Support building U-Boot host tools for Windows via MSYS2
Quoted 33 lines · Bin Meng
Hi Tom,
Quoted 30 lines · Bin Meng
Per current U-Boot README, building Windows versions of the utilities in the tools directory is done via the MinGW toolchain. But testing shows that it is broken and actually it must have been broken for quite a long time.
Fixing MinGW build seems quite amount of work as developers of U-Boot normally work on Linux boxes hence codes written are mainly for Linux or POSIX OSes. We must investigate another way of building host tools for Windows, and now we have MSYS2, a software distro and building platform for Windows, to build POSIX compliant software on Windows using an emulation layer.
This small series fixes several issues in current U-Boot tools codes, that only assume a Linux host is used. Cases are using standard C typedefs whenever possbile, or using compiler builtin functions to improve portability, etc.
A reST document for how to build U-Boot host tools for both platforms is added.
A new CI pipeline configuration for Microsoft Azure Pipelines is added for U-Boot. We rely on it to ensure future host tools for Windows build does not break.
I've also investigated putting what we have for now on GitLab-CI and Travis-CI to Azure Pipelines, and it turns out there are several issues that should be fixed. I will post a follow-up patch series for enabling full CI testing on Azure Pipelines.
Quoted 6 lines
Quoted 4 lines
Changes in v3:
- new patch: tools: ifwitool: Define__packedwhen it is not defined
- rename to .azure-pipelines.yml
- correct typo in the commit summaryIf there is no issue, could we get this series applied in v2020.01-rc1?
Yes, I would like to, and I think I've gotten far enough along with my account setup that I should be able to test this as well.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191028/92328c07/attachment.sig>