Message ID | 1447333811-31720-1-git-send-email-fabio.estevam@freescale.com |
---|---|
State | Superseded |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id A3D77140549 for <incoming@patchwork.ozlabs.org>; Fri, 13 Nov 2015 00:10:38 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C8F144B80A; Thu, 12 Nov 2015 14:10:35 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ORvLfjYIJd_8; Thu, 12 Nov 2015 14:10:35 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3D7644B7F6; Thu, 12 Nov 2015 14:10:35 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4B7414B7F6 for <u-boot@lists.denx.de>; Thu, 12 Nov 2015 14:10:32 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nVeWncyvILv4 for <u-boot@lists.denx.de>; Thu, 12 Nov 2015 14:10:32 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0119.outbound.protection.outlook.com [65.55.169.119]) by theia.denx.de (Postfix) with ESMTPS id 970EB4B7EF for <u-boot@lists.denx.de>; Thu, 12 Nov 2015 14:10:27 +0100 (CET) Received: from BY2PR03CA011.namprd03.prod.outlook.com (10.255.93.28) by CY1PR0301MB1307.namprd03.prod.outlook.com (10.161.212.17) with Microsoft SMTP Server (TLS) id 15.1.318.15; Thu, 12 Nov 2015 13:10:25 +0000 Received: from BL2FFO11FD049.protection.gbl (10.255.93.4) by BY2PR03CA011.outlook.office365.com (10.255.93.28) with Microsoft SMTP Server (TLS) id 15.1.325.17 via Frontend Transport; Thu, 12 Nov 2015 13:10:24 +0000 Authentication-Results: spf=permerror (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; Received-SPF: PermError (protection.outlook.com: domain of freescale.com used an invalid SPF mechanism) Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11FD049.mail.protection.outlook.com (10.173.161.211) with Microsoft SMTP Server (TLS) id 15.1.325.5 via Frontend Transport; Thu, 12 Nov 2015 13:10:23 +0000 Received: from fabio-Latitude-E6410.am.freescale.net (fabio-Latitude-E6410.am.freescale.net [10.29.244.21]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id tACDAKLp027471; Thu, 12 Nov 2015 06:10:21 -0700 From: Fabio Estevam <fabio.estevam@freescale.com> To: <albert.u.boot@aribaud.net> Date: Thu, 12 Nov 2015 11:10:10 -0200 Message-ID: <1447333811-31720-1-git-send-email-fabio.estevam@freescale.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD049; 1:RfaRGBAI8gDGVFPMVlm6atlZt+QJjoPv5XxUF3kq8qamWbPyriPe8QLthWZsuJsnaqJeQfQsS0P/rQstYVL0yvc8g3fRaviXirBH+OiIbHViAC+nTyCmHFNuWZ6STOwcvnqEB1sO7Tcw4sQgZxFDhCPSQ9gdHyR1VGPtowqaYXmAiOUStIg0V0WzEoZ/5IA6LH/Mhd3YakcjZNMjVcfWMy0OLfMLgiAw8roT69ffYsztDfDnZQ3LoQ07H1fskKgsXa87TGAeodGmJHag1EKbux6U2kOgBTFvXXJLuGm04/7HrullQduxGa6nGsOGFDcmu7JWXtUUkc74LhOjB3LVDWW3ci0iEwrGGIya8cGyzQD8zfReDPpTs1OppZ3UXojepKsEUNio0/7y4nqdrIgY8LTljtMG2gep4brV76km8IaTGwhyHCFliWjmYJo7qaZx X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(448002)(3190300001)(199003)(189002)(5008740100001)(19580395003)(104016004)(106466001)(50466002)(229853001)(189998001)(5007970100001)(97736004)(69596002)(81156007)(50226001)(6806005)(50986999)(2351001)(48376002)(87936001)(33646002)(77096005)(85326001)(19580405001)(92566002)(86362001)(110136002)(47776003)(5001960100002)(5003940100001)(107886002)(4001430100002)(36756003); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR0301MB1307; H:az84smr01.freescale.net; FPR:; SPF:PermError; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1307; 2:+KOK6IXSr9cPkncYc7fTCPRBrEwZanmnwc3FkxsQb+deKGhFYobMV+Gsge/JH0cgNnlsMtds1fBVKKWZQ8vn9JSo7bjB/Xw0vi+LxZgIbNn2lhVMQtIulq1RBeD8T9VPeF8oPyhCVk/+NFu+WCZ2I/PghBvWnsY7LWU3yZd0ayg=; 3:wXJvjldYoBAQ0mG+q+kQW0BjHo/YubDloFWF/d9uinNvN3y6M4i7hqiKsrXGC2H/A0da9sBiRI36qCMyVsnM+zjvlcAPg2AqyJsr4FP6caEXWqM/ulFwTaie6AmCGTDq+CVt7NbXUFd8z9Xp/lzSeg3H6hbXfFYQQl16GOCuKExDF6kvOzd/EIVOaSOu301dVfdc94GSu38XdHMLTjGJV/vcTFAFK4NqOc6uMCD9Tls=; 25:56xi2txftlzG42i0n1FJWudIWOGEhm9w6pPg5EnAd+dxRPcqxKNgoOBZofPwCGbeKJjIVWk7IeBSp93VXxajuMbFnke2jNT0JzUqK5+CvdD1MNk2/lnTf53y6NwrnbUURjxBRC7LeG6WZphNW6yLrahArpbTMQtucqhaI4QVDTtJvTU+GFcq3C5SHBLAlgFsoY+9r46Bd8K4JuofrDRsE9zjy6T2Su2D1Hi0FvzQDvP70+MssXDtqkX5/h73pA+RVL7atGTrd0mQUPzKbsb7vw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1307; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1307; 20:Ij1J217jRhX00CjayLk15v5WtxhZLXmF9EciMR1bcvrtYgjzyrZDtD6DqGJC+S/iSk1Mkj4hfDdXEy1O+x07l9a8TljbXbIBmL53eL3slEb0YvtBV9NGYgLo3U1PXcHwEDL5Mr/RhBf3jKuPZtzFelgvnzVa3dMnib1qhJUxNxnKZUAIzFcCi6oBcRZXMLMukD1dT5OwLIj5NEsybB+g1pH1lLdwtyAVLrKgVkORBfJBwsd4DB5MsRy3CvN3ZVpeQoeYbxQ3sUptpWBpgyqj+KQTbiFVjc/VcTiBEpCosjHykTJXbmCLc2YMNjYN/CRbCDlmuChIDmjkl5kvZ1A8JA2oTHZURMLv9lUwqD8+aBM=; 4:d32bHTaGcB28MTGVjO5Fs2JUUYpIiexrMfnjYMcl7K2Yxtq4yz+iCENHbNXCsN088uTJnIn7IcIefgZpzHApprh/Z84eRAa7OhmlHZeExmgretTG4Eq5C7oLMC5fzQZg7KNzk7KCYqIRPzTrJ8QdeegwJHnE9B7obErVeXT2Ec0XPsUm0D6Qph1IJFIx0zJoR7/3Swl8W8FBe6BdpG0sfrL3nBDdBNxajABxoaFsrl7zkh37TNbcmIDkvTDZlOwO30yopm/ALIXfNWkN0MRuDkS+rVMjQNhmT7eI8Ei4SdjigxNg1rpnGlAarWKppE2WLQ9vPk0tH0IHvwMmqUhsOZWdhgKG608++BF8sPklExmywjP1UfsISJ9m1g2EGDVU X-Microsoft-Antispam-PRVS: <CY1PR0301MB1307EB36945FFAEC4988B6B2E9120@CY1PR0301MB1307.namprd03.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(520078)(10201501046)(3002001); SRVR:CY1PR0301MB1307; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0301MB1307; X-Forefront-PRVS: 07584EDBCD X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1307; 23:0vmU6MNvZVXTdNLUt4EvGBkVhA4XoNAFqUq3VST?= =?us-ascii?Q?EZMfvHwaoIScUR6HE+RDk8iRPxMKgARU/JbEBZfGINIXsrANh6ZplUqAMyIt?= =?us-ascii?Q?+pN4Zf4I1SWwXVp3iaLjuC8Nz68QvipuzT78mHroYFJ+pno1R8BVvKrjDXip?= =?us-ascii?Q?XFyh2JFqPX2u/TjGZQKw5DikZJh4sKStvml79ImtQWIGmZ6DGmqev3uVNUht?= =?us-ascii?Q?ogFT00pUEz1OpYd2rFDrpnJazOD8MN67gYkXaFWmYCJqB59tMMTKrAC8d9tr?= =?us-ascii?Q?IsPD3T7WuY4xSD8k6kTu8gZXRXkdS/nkWBk7QdfSxzxRhh8lmT10Jd/2n5R+?= =?us-ascii?Q?XtnSrA7CYIAFrxZqiLGMN/XkuFAt1u4ZuMRahshgCL7lmkT47hLVoHr+NKRJ?= =?us-ascii?Q?Rk/0rxJWhJh6E2qLSrPmV+/+pPP7kb/D4/gSQdzAli2c2a1C2XV0IM5pHWCN?= =?us-ascii?Q?LLc43PUF8V0w0nCIndaC8adjJ5UGDVNHhmBtlPBvwQFhHDuXoqzubXrsxKu0?= =?us-ascii?Q?iiOJVdKQwxpCR7zq9y3OfPNYvv88q9IBpYKvag6Ecq82c5u4H1RrijJjUAzE?= =?us-ascii?Q?A5yBCU/t0ew7JTzDACRfabZkUlppQhtmowgwreaIswMyeo+izlS2hXjWEeJg?= =?us-ascii?Q?ZbU0HV1rs7gJjJddkiwPo9a/XHGe9qomYsvh963jtND8pOTcThsAkkGjWh+C?= =?us-ascii?Q?qWnnachyzlxkybf+LSSdZerNxM39fGqFfKGUj6IMXsidP90k58PDJXCqtC/Q?= =?us-ascii?Q?pLIGh2Xp8UGtVykzl9314HhvlVvM8anlfD2xUaNHv2CsNc+Zk8JcOpAC1AOa?= =?us-ascii?Q?dR3DgMwfC7bkBrrvH24rqMLUdpf879FVBlxDskM+KqZOaZU91ons85Soiqp6?= =?us-ascii?Q?F4QB05uVIpKWgiurO+1RuOAcvhuHlNPtIYhMU6rQI/WPALYw121ML1nApUXd?= =?us-ascii?Q?IqwGCLoCZyOBqCii4vbHh+GNllHvaYUUvAeq06W1wQg+kv+2ta2BQglpwhHH?= =?us-ascii?Q?nq4s=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1307; 5:jPJWIGoQYJBWIpBYxmOsYPLP4QrQDT5UjRbV8yChR6hP9J511QLWyQTH2Ko0R7QTj2pc2y7YNdkcYF9PyYa4DkdAXFo5DEzx72f9J8fpYpIsXpZqEGRAIzpXWFhm9ogpQrmw4M/gb3fVQT1BMlRR2w==; 24:H2NUPwCzdeyZxWOhGY2K4Zc1Guyglox4BrnjDhbObK5G2jgh6/yiNubJvn1kHpjvTzx9QMfevCc60PdA50A32BXYumhFw8dY+ChtifmEzaw=; 20:lqZdb1aVWBYFYVFklLQaCcnFFEM59f3MSFaneUxMzqkCsrdKWMVketRi/GykOeCkyVGmstIP/6A/ktGtXZe8VQ== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2015 13:10:23.4959 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB1307 Cc: Fabio Estevam <fabio.estevam@freescale.com>, trini@konsulko.com, u-boot@lists.denx.de Subject: [U-Boot] [PATCH v2 1/2] board_init: Change the logic to setup malloc_base X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <http://lists.denx.de/mailman/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <http://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <http://lists.denx.de/mailman/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> |
diff --git a/common/init/board_init.c b/common/init/board_init.c index e74b63b..1c6126d 100644 --- a/common/init/board_init.c +++ b/common/init/board_init.c @@ -50,8 +50,7 @@ ulong board_init_f_mem(ulong top) #endif arch_setup_gd(gd_ptr); -#if defined(CONFIG_SYS_MALLOC_F) && \ - (!defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SYS_SPL_MALLOC_START)) +#if defined(CONFIG_SYS_MALLOC_F) top -= CONFIG_SYS_MALLOC_F_LEN; gd->malloc_base = top; #endif
Prior to commit 5ba534d247d418 ("arm: Switch 32-bit ARM to using generic global_data setup") we used to have assembly code that configured the malloc_base address. Since this commit we use the board_init_f_mem() function in C to setup malloc_base address. In board_init_f_mem() there was a deliberate choice to support only early malloc() or full malloc() in SPL, but not both. Adapt this logic to allow both to be used, one after the other, in SPL. This issue has been observed in a Congatec board, where we need to retrieve the manufacturing information from the SPI NOR (the SPI API calls malloc) prior to configuring the DRAM. In this case as malloc_base was not configured we always see malloc to fail. With this change we are able to use malloc in SPL prior to DRAM gets initialized. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> --- Changes since v1: - Improve commit log (Simon) common/init/board_init.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)