[22/31] sandbox: Fix up setting of monitor_len on MSYS2

Message ID	20230424230836.630907-23-sjg@chromium.org
State	Changes Requested
Delegated to:	Tom Rini
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Bin Meng <bmeng.cn@gmail.com>, Simon Glass <sjg@chromium.org>, Michal Suchanek <msuchanek@suse.de>, Ovidiu Panait <ovpanait@gmail.com>, =?utf-8?q?Pali_Roh=C3=A1r?= <pali@kernel.org>, Rasmus Villemoes <rasmus.villemoes@prevas.dk>, Stefan Roese <sr@denx.de> Subject: [PATCH 22/31] sandbox: Fix up setting of monitor_len on MSYS2 Date: Mon, 24 Apr 2023 17:08:27 -0600 Message-ID: <20230424230836.630907-23-sjg@chromium.org> In-Reply-To: <20230424230836.630907-1-sjg@chromium.org> References: <20230424230836.630907-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	Allow building sandbox with MSYS2 \| expand [00/31] Allow building sandbox with MSYS2 [01/31] patman: Declare the future Series memory [02/31] u_boot_pylib: Correct name of readme [03/31] u_boot_pylib: Make pty optional [04/31] binman: Avoid using a symlink [05/31] binman: Don't require a HOME directory [06/31] pylibfdt: Allow building on Windows [07/31] Fix Makefile warning about parallel targets [08/31] mkimage: Correct checking of configuration node [09/31] Kbuild: Detect including an MSYS2 path [10/31] sandbox: Provide a linker script for MSYS2 [11/31] sandbox: Provide an EFI link script for PE [12/31] sandbox: Drop dead code from Makefile [13/31] sandbox: Disable raw Ethernet on MSYS2 [14/31] sandbox: Drop signal handling for MSYS2 [15/31] sandbox: Correct SDL.h header inclusion [16/31] sandbox: Include errno.h in the test header [17/31] sandbox: Allow weak symbols to be dropped [18/31] sections: Drop use of linux/types.h [19/31] sandbox: Drop incorrect inclusion of linux/types.h [20/31] sandbox: Drop inclusion of os.h in sscanf.c [21/31] test: Avoid strange symbols in the assembler file [22/31] sandbox: Fix up setting of monitor_len on MSYS2 [23/31] ctype: Avoid using a symlink [24/31] build: Disable weak symbols for MSYS2 [25/31] Makefile: Disable unsupported compiler options with PE [26/31] Makefile: Correct the ans1_compiler rule for MSYS2 [27/31] Makefile: Disable LTO when building with MSYS2 [28/31] doc: Update the MSYS2 packages and versions [29/31] doc: Show how to build sandbox for MSYS2 [30/31] Makefile: Drop unwind tables [31/31] CI: Enable sandbox build for Windows

Message ID

20230424230836.630907-23-sjg@chromium.org

State

Changes Requested

Delegated to:

Tom Rini

Headers

From: Simon Glass <sjg@chromium.org>
To: U-Boot Mailing List <u-boot@lists.denx.de>
Cc: Bin Meng <bmeng.cn@gmail.com>, Simon Glass <sjg@chromium.org>,
 Michal Suchanek <msuchanek@suse.de>, Ovidiu Panait <ovpanait@gmail.com>,
	=?utf-8?q?Pali_Roh=C3=A1r?= <pali@kernel.org>,
 Rasmus Villemoes <rasmus.villemoes@prevas.dk>, Stefan Roese <sr@denx.de>
Subject: [PATCH 22/31] sandbox: Fix up setting of monitor_len on MSYS2
Date: Mon, 24 Apr 2023 17:08:27 -0600
Message-ID: <20230424230836.630907-23-sjg@chromium.org>
In-Reply-To: <20230424230836.630907-1-sjg@chromium.org>
References: <20230424230836.630907-1-sjg@chromium.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

Allow building sandbox with MSYS2 | expand

Commit Message

Simon Glass April 24, 2023, 11:08 p.m. UTC

The required linker symbols are not present. For now just return 0 in
this case.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 common/board_f.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/board_f.c b/common/board_f.c
index 1688e27071fc..4f380d7c82c8 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -290,7 +290,7 @@  static int setup_mon_len(void)
 {
 #if defined(__ARM__) || defined(__MICROBLAZE__)
 	gd->mon_len = (ulong)&__bss_end - (ulong)_start;
-#elif defined(CONFIG_SANDBOX) && !defined(__riscv)
+#elif defined(CONFIG_SANDBOX) && !defined(__riscv) && !defined(__MSYS__)
 	gd->mon_len = (ulong)&_end - (ulong)_init;
 #elif defined(CONFIG_SANDBOX)
 	/* gcc does not provide _init in crti.o on RISC-V */

[22/31] sandbox: Fix up setting of monitor_len on MSYS2

Commit Message

Patch