From patchwork Wed Feb 10 17:59:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1439177 X-Patchwork-Delegate: trini@ti.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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=AJ1HvBOQ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4DbSFs6fSTz9rx8 for ; Thu, 11 Feb 2021 04:59:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1555982A4D; Wed, 10 Feb 2021 18:59:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="AJ1HvBOQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D8B0682B61; Wed, 10 Feb 2021 18:59:31 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 199DF82A35 for ; Wed, 10 Feb 2021 18:59:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1612979967; bh=FHwEa0lrTDHjjd3LRAxo/vqwRNQOuujGKY//neNqK9o=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=AJ1HvBOQzl3X5WW3IkQtRiyGc7uKKPRceofeDDtp9j74xTtH6mgX3y+pfudA3Dmvj fhejvWtJEJ8tLQkth1JKStSsC+p3BdabTf5QMn4ywFT1M2b1GcdpEnWfB12j2a+yiV 1r+p9DHfputimtzSLX3wI8yY5tuuNQbyiBzyBQUo= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from workstation4.fritz.box ([62.143.246.89]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MJVHU-1lTl0J2w5w-00Ju5q; Wed, 10 Feb 2021 18:59:27 +0100 From: Heinrich Schuchardt To: Tom Rini Cc: u-boot@lists.denx.de, Simon Glass , Heinrich Schuchardt Subject: [PATCH 1/1] malloc: adjust memcpy() and memset() definitions. Date: Wed, 10 Feb 2021 18:59:21 +0100 Message-Id: <20210210175921.264801-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:3DTesbPsiwQkHH1riKnV9LeCY/tJ9KEY0Y+gmW+5AomWO8vsVFN 2KqWU5aIY19HwZIWW0m0sHPH/yXm5xRHotU9obpBYIXDAa5OfeaqiuOMviB3fYuPHZ+9111 0WqPdTU4JiXe4HIxBSJKr4fX2AhC5lwV1+TelVxU4mlWm4Jy5rW0y3yU/kSt5xFUcsfWIkM qFvpclTZYifbMeRkiuY0g== X-UI-Out-Filterresults: notjunk:1;V03:K0:XqhcVl5Kw4A=:QGSXh62OMedIa520gyBpqU LoPT6KConqNVa9l0b0pNg+etG+hmTvKmdw8f9+kCvd3V+TkYxWu0rQctU4X2cM0ZLkL67H8ik FYj3lmZqdzL6AaFRFK5tOLqdd9z6qeDOk3M6bwBftFMoSJtQujK6UNS2NjgrMtxC3Zj5xKA0F +qLPBVi5zdF/DtSZ/4Yt1TrERhsSjIoJ592wcFLoghZDsf1/3mVCI6gZ34PCSGY5Vs3Kkx3jU 9MftNgt4oCeFDCNn2a46fbh+JePfnwOQYa4qwh7zJlUXnrv2JfzhZqd0++BSaEwlLh3BMKxlu KIovItqzD6GFyJY7uz3ZV/BrH27pWdzELUTJRN8X4k3pupbIMk9//DlJgpAPzxJ+gMLoj3K9f 2IPywKsaJkvrziJYyxzoOsXWJJwFVajENdv+MagQopIsFdEF3zdXqk9WeCt7f2Pyxc+r0MDGE O+4NJcDh03bnnhzKErG+pAn1lNrqEfy6XptUPNegYa8KlPQhuuJ2JPwA260ZRBrfdSAoa5gDT MJAkYQ6ec9GrGRG/IVAOLbEnkNR3SgIv2bXs3qY3Nzor9rS6kuehSG6hp1o1Uc/Tll7p13oAR mojXJ7zCPBguccEJi4tFiI5oZqHpKzPw5/tzNOmlYjr3+uIAc2rGaBxSu0Vcq8EkCnDqFrY+q PFlGGFahr7Jxn3KAFEI/vYsDFzKCTDdZtF3yd6CHzfippnzkzSfzEzRCFY4WnZEmnhrZ1E1Ee riZWY7c5N2Pk627kqHLN7Iro/4LfS9Y2RqEqEAWQrxZsu/0czwrjsFGFlNIyn+XubFokEhW0V VJoZeZccfBxm5befmz+VCi8c5Xncgcq0w2MCStyuK4jOqvB62QtxIHYtwX4+gZC+zHivii1Kv dQozkf7C+vPs2IvDd9qg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.3 at phobos.denx.de X-Virus-Status: Clean Compiling the sandbox fails on armv7 due to conflicting definitions of memcpy() and memset() in include/malloc.h and include/linux/string.h. Use linux/string.h here. Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- include/malloc.h | 3 +++ 1 file changed, 3 insertions(+) -- 2.30.0 diff --git a/include/malloc.h b/include/malloc.h index f66c2e8617..e15e528a2e 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -361,8 +361,11 @@ extern "C" { #if (__STD_C || defined(HAVE_MEMCPY)) #if __STD_C +/* U-Boot defines memset() and memcpy in /include/linux/string.h void* memset(void*, int, size_t); void* memcpy(void*, const void*, size_t); +*/ +#include #else #ifdef WIN32 /* On Win32 platforms, 'memset()' and 'memcpy()' are already declared in */