April 2020 - U-Boot

[PATCH 0/6] rk3399: Sync linux v5.7-rc1 dts(i)
by Jagan Teki 25 Apr '20

25 Apr '20

This would help to add new boards along with new drivers like PCIe on rk3399 platform. So, add v5.7-rc1 linux-next dts(i) files on rk3399 platform. Any inputs? Jagan. Jagan Teki (5): arm64: dts: rk3399-puma: Move u-boot properties into -u-boot.dtsi arm64: dts: rk3399-evb: Move u-boot properties into -u-boot.dtsi clk: rk3399: Set empty for HCLK_SD assigned-clocks arm64: dts: rk3399: Sync v5.7-rc1 from Linux arm: dts: rk3399: Sync roc-pc-mezzanine from v5.7-rc1 Suniel Mahesh (1): rk3399: Add ROC-RK3399-PC Mezzanine board arch/arm/dts/Makefile | 1 + arch/arm/dts/cros-ec-keyboard.dtsi | 10 +- arch/arm/dts/cros-ec-sbs.dtsi | 39 +- arch/arm/dts/rk3399-evb-u-boot.dtsi | 8 + arch/arm/dts/rk3399-evb.dts | 522 ++++++++---- arch/arm/dts/rk3399-ficus.dts | 6 + arch/arm/dts/rk3399-firefly.dts | 251 ++++-- arch/arm/dts/rk3399-gru-bob.dts | 16 +- arch/arm/dts/rk3399-gru-chromebook.dtsi | 40 +- arch/arm/dts/rk3399-gru-kevin.dts | 34 +- arch/arm/dts/rk3399-gru.dtsi | 90 +- arch/arm/dts/rk3399-khadas-edge.dtsi | 3 + arch/arm/dts/rk3399-leez-p710.dts | 36 +- arch/arm/dts/rk3399-nanopc-t4.dts | 47 +- arch/arm/dts/rk3399-nanopi4.dtsi | 66 +- arch/arm/dts/rk3399-orangepi.dts | 79 +- arch/arm/dts/rk3399-puma-u-boot.dtsi | 31 +- arch/arm/dts/rk3399-puma.dtsi | 578 +++++-------- .../dts/rk3399-roc-pc-mezzanine-u-boot.dtsi | 26 + arch/arm/dts/rk3399-roc-pc-mezzanine.dts | 93 ++ arch/arm/dts/rk3399-roc-pc.dts | 3 +- arch/arm/dts/rk3399-roc-pc.dtsi | 35 +- arch/arm/dts/rk3399-rock-pi-4.dts | 129 +++ arch/arm/dts/rk3399-rock960.dts | 49 ++ arch/arm/dts/rk3399-rock960.dtsi | 13 +- arch/arm/dts/rk3399-rockpro64.dts | 751 +---------------- arch/arm/dts/rk3399-rockpro64.dtsi | 797 ++++++++++++++++++ arch/arm/dts/rk3399-u-boot.dtsi | 1 + arch/arm/dts/rk3399.dtsi | 583 ++++++++----- board/firefly/roc-pc-rk3399/MAINTAINERS | 2 + configs/roc-pc-mezzanine-rk3399_defconfig | 67 ++ drivers/clk/rockchip/clk_rk3399.c | 1 + 32 files changed, 2747 insertions(+), 1660 deletions(-) create mode 100644 arch/arm/dts/rk3399-roc-pc-mezzanine-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-roc-pc-mezzanine.dts create mode 100644 arch/arm/dts/rk3399-rockpro64.dtsi create mode 100644 configs/roc-pc-mezzanine-rk3399_defconfig -- 2.17.1

1 6

[PATCHv2 0/9] fsl: layerscape: Initialize the GIC redistributor
by Zhiqiang Hou 25 Apr '20

25 Apr '20

From: Hou Zhiqiang <Zhiqiang.Hou(a)nxp.com> This patch set is to initialize the GIC redistributor tables and add the tables to kernel DT's reserved memeory node. Hou Zhiqiang (9): board: lx2160a: Add header file cpu_func.h arm64: fsl-layerscape: Assign addr to resv_ram if enabled RESV_RAM config board: lx2160a: Don't program the GIC RD tables if failed to reserve memory board: lx2160a: Make sure the RD tables address align to 64KB fsl-layerscape: Kconfig: Select RESV_RAM config if GIC_V3_ITS is enabled arm64: layerscape: Move GIC RD tables initialization to CPU setup function configs: ls1088a: Enable GIC_V3_ITS config configs: ls1028a: Enable GIC_V3_ITS config configs: ls208xa: Enable GIC_V3_ITS config Depends on: https://patchwork.ozlabs.org/project/uboot/list/?series=158486 arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 4 ++ arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 8 ++-- arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 4 ++ arch/arm/cpu/armv8/fsl-layerscape/soc.c | 44 +++++++++++++++++++ .../arm/include/asm/arch-fsl-layerscape/soc.h | 4 ++ board/freescale/lx2160a/lx2160a.c | 24 ---------- configs/ls1028aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1028aqds_tfa_defconfig | 1 + configs/ls1028ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1028ardb_tfa_defconfig | 1 + configs/ls1088aqds_defconfig | 1 + configs/ls1088aqds_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1088aqds_qspi_defconfig | 1 + configs/ls1088aqds_sdcard_ifc_defconfig | 1 + configs/ls1088aqds_sdcard_qspi_defconfig | 1 + configs/ls1088aqds_tfa_defconfig | 1 + configs/ls1088ardb_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1088ardb_qspi_defconfig | 1 + ...1088ardb_sdcard_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1088ardb_sdcard_qspi_defconfig | 1 + configs/ls1088ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1088ardb_tfa_defconfig | 1 + configs/ls2080aqds_SECURE_BOOT_defconfig | 1 + configs/ls2080aqds_defconfig | 1 + configs/ls2080aqds_nand_defconfig | 1 + configs/ls2080aqds_qspi_defconfig | 1 + configs/ls2080aqds_sdcard_defconfig | 1 + configs/ls2080ardb_SECURE_BOOT_defconfig | 1 + configs/ls2080ardb_defconfig | 1 + configs/ls2080ardb_nand_defconfig | 1 + configs/ls2081ardb_defconfig | 1 + configs/ls2088aqds_tfa_defconfig | 1 + configs/ls2088ardb_qspi_SECURE_BOOT_defconfig | 1 + configs/ls2088ardb_qspi_defconfig | 1 + configs/ls2088ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls2088ardb_tfa_defconfig | 1 + 36 files changed, 90 insertions(+), 28 deletions(-) -- 2.17.1

4 30

[PATCH] dlmalloc: Add an option to default malloc to init
by marek.bykowski＠gmail.com 25 Apr '20

25 Apr '20

From: Marek Bykowski <marek.bykowski(a)gmail.com> If a system wants the malloc to get moved around from one to another memory range it should call mem_malloc_init() with the updated memory ranges. However setting aside the new memory alone isn't enough. It should also bring the bins and static bookkeeping data to init. One of the use cases could be SPL U-Boot that allocates first to the (limited) static memory and then when needs more memory, and the DDR memory becomes available, moves the pools around. Note that defaulting the malloc to init discards all the memory previously allocated. Signed-off-by: Marek Bykowski <marek.bykowski(a)gmail.com> --- Kconfig | 14 ++++++++++++++ common/dlmalloc.c | 41 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/Kconfig b/Kconfig index 1f0904f704..958553c90a 100644 --- a/Kconfig +++ b/Kconfig @@ -209,6 +209,20 @@ if EXPERT When disabling this, please check if malloc calls, maybe should be replaced by calloc - if one expects zeroed memory. +config SYS_MALLOC_DEFAULT_TO_INIT + bool "Default malloc to init while reserving the memory for it" + default n + help + It may happen that one needs to move the dynamic allocation + from one to another memory range, eg. when moving the malloc + from the limited static to a potentially large dynamic (DDR) + memory. + + If so then on top of setting the updated memory aside one + needs to bring the malloc init. + + If such a scenario is sought choose yes. + config TOOLS_DEBUG bool "Enable debug information for tools" help diff --git a/common/dlmalloc.c b/common/dlmalloc.c index 6f12a18d54..8b2796e280 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -280,6 +280,7 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Unused space (may be 0 bytes long) . . . . | + nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ `foot:' | Size of chunk, in bytes | +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ @@ -574,6 +575,10 @@ static void malloc_bin_reloc(void) static inline void malloc_bin_reloc(void) {} #endif +#ifdef CONFIG_SYS_MALLOC_DEFAULT_TO_INIT +static void malloc_init(void); +#endif + ulong mem_malloc_start = 0; ulong mem_malloc_end = 0; ulong mem_malloc_brk = 0; @@ -604,6 +609,10 @@ void mem_malloc_init(ulong start, ulong size) mem_malloc_end = start + size; mem_malloc_brk = start; +#ifdef CONFIG_SYS_MALLOC_DEFAULT_TO_INIT + malloc_init(); +#endif + debug("using memory %#lx-%#lx for malloc()\n", mem_malloc_start, mem_malloc_end); #ifdef CONFIG_SYS_MALLOC_CLEAR_ON_INIT @@ -708,7 +717,36 @@ static unsigned int max_n_mmaps = 0; static unsigned long max_mmapped_mem = 0; #endif +#ifdef CONFIG_SYS_MALLOC_DEFAULT_TO_INIT +static void malloc_init(void) +{ + int i, j; + + debug("bins (av_ array) are at %p\n", (void *)av_); + + av_[0] = NULL; av_[1] = NULL; + for (i = 2, j = 2; i < NAV * 2 + 2; i += 2, j++) { + av_[i] = bin_at(j - 2); + av_[i + 1] = bin_at(j - 2); + + /* Just print the first few bins so that + * we can see there are alright. + */ + if (i < 10) + debug("av_[%d]=%lx av_[%d]=%lx\n", + i, (ulong)av_[i], + i + 1, (ulong)av_[i + 1]); + } + /* Init the static bookkeeping as well */ + sbrk_base = (char *)(-1); + max_sbrked_mem = 0; + max_total_mem = 0; +#ifdef DEBUG + memset((void *)&current_mallinfo, 0, sizeof(struct mallinfo)); +#endif +} +#endif /* Debugging support @@ -1051,9 +1089,6 @@ static mchunkptr mremap_chunk(p, new_size) mchunkptr p; size_t new_size; #endif /* HAVE_MMAP */ - - - /* Extend the top-most chunk by obtaining memory from system. Main interface to sbrk (but see also malloc_trim). -- 2.21.0.896.g6a6c0f1

4 6

[PATCH 1/1] doc: correct detection of Sphinx version
by Heinrich Schuchardt 24 Apr '20

24 Apr '20

Starting with Sphinx 1.3 sphinx.ext.pngmath was replaced by sphinx.ext.imgmath. Unfortunately conf.py does not detect that version 2.4 is greater 1.3. This results in an error Could not import extension sphinx.ext.pngmath (exception: No module named 'sphinx.ext.pngmath') in Debian Bullseye which uses Sphinx 2.4 since this month. Fix the detection of the Sphinx version. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- The Linux kernel starts recommending Sphinx 2.4. Cf. https://lkml.org/lkml/2020/4/14/1037 --- doc/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/conf.py b/doc/conf.py index 0772fb6f0c..50518a4b2c 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -37,7 +37,7 @@ needs_sphinx = '1.3' extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain', 'kfigure'] # The name of the math extension changed on Sphinx 1.4 -if major == 1 and minor > 3: +if major > 1 or major == 1 and minor > 3: extensions.append("sphinx.ext.imgmath") else: extensions.append("sphinx.ext.pngmath") -- 2.26.2

1 1

[PATCH 00/14] ARC: add HSDK-4xD board support
by Eugeniy Paltsev 24 Apr '20

24 Apr '20

Eugeniy Paltsev (14): ARC: ARCv2: handle DSP presence in HW ARC: HSDK: CGU: add support for timer clock ARC: HSDK-4xD: add initial board support ARC: HSDK: split HSDK and HSDK-4xD DTS ARC: HSDK-4xD: use active low polarity of cpu_start pulse ARC: HSDK-4xD: fix headerize script for HSDK-4xD compatibility ARC: HSDK-4xD: print info about HDMI clocks ARC: HSDK-4xD: drop additional GPU clock info ARC: HSDK-4xD: print timer clock value ARC: HSDK-4xD: add support for SLC enable/disable ARC: HSDK-4xD: add CSM configuration support ARC: HSDK-4xD: tweak memory map ARC: HSDK-4xD: use separate config file ARC: HSDK-4xD: make init status resistant to U-boot reloading arch/arc/Kconfig | 2 +- arch/arc/dts/Makefile | 2 +- arch/arc/dts/hsdk-4xd.dts | 12 ++ arch/arc/dts/hsdk-common.dtsi | 152 +++++++++++++ arch/arc/dts/hsdk.dts | 145 +------------ arch/arc/include/asm/arcregs.h | 4 + arch/arc/lib/start.S | 15 ++ board/synopsys/hsdk/Kconfig | 20 +- board/synopsys/hsdk/MAINTAINERS | 5 +- board/synopsys/hsdk/config.mk | 16 ++ board/synopsys/hsdk/headerize-hsdk.py | 2 +- board/synopsys/hsdk/hsdk.c | 251 ++++++++++++++++++++-- configs/hsdk_4xd_defconfig | 67 ++++++ drivers/clk/clk-hsdk-cgu.c | 9 +- include/configs/hsdk-4xd.h | 120 +++++++++++ include/dt-bindings/clock/snps,hsdk-cgu.h | 5 +- 16 files changed, 657 insertions(+), 170 deletions(-) create mode 100644 arch/arc/dts/hsdk-4xd.dts create mode 100644 arch/arc/dts/hsdk-common.dtsi create mode 100644 configs/hsdk_4xd_defconfig create mode 100644 include/configs/hsdk-4xd.h -- 2.21.1

1 14

[PATCH] lib: strto: Fix parsing MTD partition size
by Pali Rohár 24 Apr '20

24 Apr '20

Commit 0486497e2b5f ("lib: Improve _parse_integer_fixup_radix base 16 detection") broke parsing MTD partition sizes specified in decimal base. E.g. "128k(bootloader)" is parsed by drivers/mtd/mtdpart.c as hexadecimal number (0x128 << 10) because character 'a' in substring "bootloader" caused parsing whole number as hexadecimal. This patch stop doing hexadecimal base heuristic on first non-valid hexadecimal number, so "128k(bootloader)" is parsed as decimal number 128. Fixes: 0486497e2b5f ("lib: Improve _parse_integer_fixup_radix base 16...") Signed-off-by: Pali Rohár <pali(a)kernel.org> --- lib/strto.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/strto.c b/lib/strto.c index 1ac2b09c72..060b66b915 100644 --- a/lib/strto.c +++ b/lib/strto.c @@ -30,6 +30,9 @@ static const char *_parse_integer_fixup_radix(const char *s, unsigned int *base) do { var = tolower(s[i++]); + if (!(var >= '0' && var <= '9') && + !(var >= 'a' && var <= 'f')) + break; if (var >= 'a' && var <= 'f') { *base = 16; break; -- 2.20.1

2 6

support of rockchip nanopiM4 2GB board
by Deepak Das 24 Apr '20

24 Apr '20

Hi Jagan, upstream uboot has the support for nanopi M4 board with 4GB LPDDR3 RAM. I have a nanopi M4 board with 2GB DDR3 RAM and able to boot this board by using ddr3 configuration. +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> + */ + +#include "rk3399-nanopi4-u-boot.dtsi" +#include "rk3399-sdram-ddr3-1866.dtsi" + +/* #include "rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi" */ how to handle this situation? do we need to treat this as a new board support? regards, Deepak

3 3

Partial fix for RTL8211CL connectivity issue
by Dario 24 Apr '20

24 Apr '20

Hello, My A20-OLinuXino-LIME2 has a RTL8211CL network adapter and is affected by the same issue described for RTL8211F_PHY_FORCE_EEE_RXC_ON. In u-boot/drivers/net/phy/realtek.c I copied «phydev->flags |= PHY_RTL8211F_FORCE_EEE_RXC_ON;» inside rtl8211b_probe() and the following portion of code enabled by the fix at the beginning of rtl8211x_config(): if (phydev->flags & PHY_RTL8211F_FORCE_EEE_RXC_ON) { unsigned int reg; reg = phy_read_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1); reg &= ~MDIO_PCS_CTRL1_CLKSTOP_EN; phy_write_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1, reg); } When rebooting from GNU/Linux in Das U-Boot, issuing «dhcp» gives me this: => dhcp ethernet@1c50000 Waiting for PHY auto negotiation to complete......... TIMEOUT ! Could not initialize PHY ethernet@1c50000 using musb-hdrc, OUT ep1out IN ep1in STATUS ep2in MAC de:ad:be:ef:00:01 HOST MAC de:ad:be:ef:00:00 RNDIS ready The remote end did not respond in time. If I issue the same command once again immediately after, it will instantly report the device as connected, with no delay at all, as if it was already connected the first time, but the driver failed to report the device as connected. If you have no clue for a proper fix, I will try to set up a GDB environment to see what's going on. I am no expert though.

1 0

[PATCH v2] travis: Correct error checking when building boards
by Simon Glass 24 Apr '20

24 Apr '20

At present if buildman reports an error, the travis build still succeeds. This is because the travis script does not stop when it sees errors; nor does it automatically return the exit code. Also the current error checking never triggers since 'ret' is not set. Fix this by setting 'ret' correctly. Signed-off-by: Simon Glass <sjg(a)chromium.org> Reported-by: Michal Simek <michal.simek(a)xilinx.com> --- Changes in v2: - Fix missing ret=0 .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b3253da13c..1dbc63cadf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -208,7 +208,8 @@ script: # # Build a selection of boards if TEST_PY_BD is empty - if [[ "${BUILDMAN}" != "" ]]; then - tools/buildman/buildman -P -E -W ${BUILDMAN} ${OVERRIDE}; + ret=0 + tools/buildman/buildman -P -E -W ${BUILDMAN} ${OVERRIDE} || ret=$?; if [[ $ret -ne 0 ]]; then tools/buildman/buildman -seP ${BUILDMAN}; exit $ret; -- 2.26.1.301.g55bc3eb7cb9-goog

3 2

[PATCH 1/3] tools: Remove the out-of-date MinGW support codes
by Bin Meng 24 Apr '20

24 Apr '20

From: Bin Meng <bin.meng(a)windriver.com> MinGW build for U-Boot tools has been broken for years. The official support of Windows build is now MSYS2. Remove the MinGW support codes. Signed-off-by: Bin Meng <bin.meng(a)windriver.com> --- README | 10 ----- tools/mingw_support.c | 113 -------------------------------------------------- tools/mingw_support.h | 45 -------------------- tools/os_support.c | 7 ++-- tools/os_support.h | 3 -- 5 files changed, 3 insertions(+), 175 deletions(-) delete mode 100644 tools/mingw_support.c delete mode 100644 tools/mingw_support.h diff --git a/README b/README index 19dae14..d0af6c6 100644 --- a/README +++ b/README @@ -3186,16 +3186,6 @@ 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 Windows 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 - toolchain 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 running 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/tools/mingw_support.c b/tools/mingw_support.c deleted file mode 100644 index 2b17bf7..0000000 --- a/tools/mingw_support.c +++ /dev/null @@ -1,113 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * 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 <sherpya(a)netfarm.it> - * Parts by Kees Zeelenberg <kzlg(a)users.sourceforge.net> (LibGW32C) - */ - -#include "mingw_support.h" -#include <stdio.h> -#include <stdint.h> -#include <string.h> -#include <errno.h> -#include <assert.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; -} - -/* Reentrant string tokenizer. Generic version. - Copyright (C) 1991,1996-1999,2001,2004,2007 Free Software Foundation, Inc. - This file is part of the GNU C Library. - */ - -/* Parse S into tokens separated by characters in DELIM. - If S is NULL, the saved pointer in SAVE_PTR is used as - the next starting point. For example: - char s[] = "-abc-=-def"; - char *sp; - x = strtok_r(s, "-", &sp); // x = "abc", sp = "=-def" - x = strtok_r(NULL, "-=", &sp); // x = "def", sp = NULL - x = strtok_r(NULL, "=", &sp); // x = NULL - // s = "abc\0-def\0" -*/ -char *strtok_r(char *s, const char *delim, char **save_ptr) -{ - char *token; - - if (s == NULL) - s = *save_ptr; - - /* Scan leading delimiters. */ - s += strspn(s, delim); - if (*s == '\0') { - *save_ptr = s; - return NULL; - } - - /* Find the end of the token. */ - token = s; - s = strpbrk (token, delim); - if (s == NULL) { - /* This token finishes the string. */ - *save_ptr = memchr(token, '\0', strlen(token)); - } else { - /* Terminate the token and make *SAVE_PTR point past it. */ - *s = '\0'; - *save_ptr = s + 1; - } - return token; -} - -#include "getline.c" diff --git a/tools/mingw_support.h b/tools/mingw_support.h deleted file mode 100644 index e0b8ac3..0000000 --- a/tools/mingw_support.h +++ /dev/null @@ -1,45 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.0+ */ -/* - * Copyright 2008 Extreme Engineering Solutions, Inc. - */ - -#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 */ - -/* File perms */ -#ifndef S_IRGRP -# define S_IRGRP 0 -#endif -#ifndef S_IWGRP -# define S_IWGRP 0 -#endif - -/* Windows 64-bit access macros */ -#define LODWORD(x) ((DWORD)((DWORDLONG)(x))) -#define HIDWORD(x) ((DWORD)(((DWORDLONG)(x) >> 32) & 0xffffffff)) - -typedef UINT uint; -typedef ULONG ulong; - -int fsync(int fd); -void *mmap(void *, size_t, int, int, int, int); -int munmap(void *, size_t); -char *strtok_r(char *s, const char *delim, char **save_ptr); -#include "getline.h" - -#endif /* __MINGW_SUPPORT_H_ */ diff --git a/tools/os_support.c b/tools/os_support.c index 21e43c8..6890c31 100644 --- a/tools/os_support.c +++ b/tools/os_support.c @@ -3,13 +3,12 @@ * Copyright 2009 Extreme Engineering Solutions, Inc. */ +#include "compiler.h" + /* * Include additional files required for supporting different operating systems */ -#include "compiler.h" -#ifdef __MINGW32__ -#include "mingw_support.c" -#endif + #if defined(__APPLE__) && __DARWIN_C_LEVEL < 200809L #include "getline.c" #endif diff --git a/tools/os_support.h b/tools/os_support.h index 3a2106e..471d605 100644 --- a/tools/os_support.h +++ b/tools/os_support.h @@ -11,9 +11,6 @@ /* * Include additional files required for supporting different operating systems */ -#ifdef __MINGW32__ -#include "mingw_support.h" -#endif #if defined(__APPLE__) && __DARWIN_C_LEVEL < 200809L #include "getline.h" -- 2.7.4

2 5