From patchwork Sat May 9 20:37:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1286871 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=EjDW22A6; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49KJtZ1mGbz9sNH for ; Sun, 10 May 2020 06:38:14 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5E27380398; Sat, 9 May 2020 22:38:11 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EjDW22A6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 41BDE80398; Sat, 9 May 2020 22:38:10 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DCC57801B2 for ; Sat, 9 May 2020 22:38:07 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut@gmail.com Received: by mail-wm1-x344.google.com with SMTP id r26so14457726wmh.0 for ; Sat, 09 May 2020 13:38:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=me4SYe9pgbrK24dRiJeLv6l7KWZDsUvmpl6OdQMkFRI=; b=EjDW22A6ZIyloFmBfWdaXgJq/ttS7OeJtFAv68BGv8gU6ib8kz5rxnOECqQMh/r8z+ b4A0WL683il4wQ4kI34P9BMUGhgt+SEPMN/y9O9pcVROGim9p3HkvFnErVzJx2ACIrbq 0qYYa36byJnk7vT9MiLf51LN4owjSYmLaIwXgAzRnV+oZw0gpFLTyAo78UFln9AUULjz pj7iGU8V+TMMgjf5f+iFIuTWXp2CKm6kix1UjzVNW9X0aV9zXcJHwenPBjCs+Sqnr4Fi MXdR6jHVuQfWGjjaiC1+3UhDE8YBEP7aOZeI9g4pCllH/EsrEcUqSHXfspPGjBYdGit2 d+7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=me4SYe9pgbrK24dRiJeLv6l7KWZDsUvmpl6OdQMkFRI=; b=OG/vHVWYofqP1e0p4hMVutwQopXsOD0lDyOLZbvcOmf7UIEuiL0bCSBWWfOpQJBcCu Ii8j0FF0jtYDRSJ6/lAQBOsz6aXwd0DSTJwCKHH5DyEN4V20dfrLdKydIbXfbcJWtwLh U8a8tA61R05FZLIRFlY7E5YVkGbjirs3IAQB6jEwTb+/G9PGWPZYL7YGrIuyATV+PPhR OM6zv2aYdmwO/k1N14W+8dcsgoORohFFy7V1JDWP8eFCNYzcBN22P6tDYNHNuxGVXv1q /+men2OvMrab+NxaWfjogRfMg5uxtZeH2vBGLwKql8QuIyzLuCmg8IDK2ysR4pNS5hPe Uzxw== X-Gm-Message-State: AGi0PuZ5KVF6v8zjNKKfCM1TTAjSSXndCeO8Q+XQk8VP75bN1DJLSTld pqXu2+sVBknEjnmt7OPwPPV/2udH X-Google-Smtp-Source: APiQypK/3BNC1VZHX/7waYwUUtCjDJMxPjmszpPNGFllMPHb7URKuXCcBO+FYz/XJOs5OswukEmdjw== X-Received: by 2002:a1c:e903:: with SMTP id q3mr22045033wmc.76.1589056687209; Sat, 09 May 2020 13:38:07 -0700 (PDT) Received: from desktop.lan (ip-86-49-35-8.net.upcbroadband.cz. [86.49.35.8]) by smtp.gmail.com with ESMTPSA id f8sm9384508wrm.8.2020.05.09.13.38.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 May 2020 13:38:06 -0700 (PDT) From: Marek Vasut X-Google-Original-From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Nobuhiro Iwamatsu Subject: [PATCH 1/5] sh: Set gd->malloc_base if MALLOC_F_LEN is set Date: Sat, 9 May 2020 22:37:58 +0200 Message-Id: <20200509203802.821856-1-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean The gd->malloc_base must be set before the C runtime if the MALLOC_F_LEN is non-zero, otherwise we hit assertion in dlmalloc.c initf_malloc(). So set it. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu --- arch/sh/lib/start.S | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/sh/lib/start.S b/arch/sh/lib/start.S index f9f26d3779..d6342a16da 100644 --- a/arch/sh/lib/start.S +++ b/arch/sh/lib/start.S @@ -53,7 +53,10 @@ _start: mov.l ._gd_init, r13 /* global data */ mov.l ._stack_init, r15 /* stack */ - +#if CONFIG_VAL(SYS_MALLOC_F_LEN) + mov.l ._gd_malloc_base, r14 + mov.l r15, @r14 +#endif mov.l ._sh_generic_init, r0 jsr @r0 mov #0, r4 @@ -70,5 +73,6 @@ loop: ._bss_start: .long bss_start ._bss_end: .long bss_end ._gd_init: .long (_start - GENERATED_GBL_DATA_SIZE) +._gd_malloc_base: .long (_start - GENERATED_GBL_DATA_SIZE + GD_MALLOC_BASE) ._stack_init: .long (_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16) ._sh_generic_init: .long board_init_f