From patchwork Thu Nov 5 09:09:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1394812 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-windriversystems-onmicrosoft-com header.b=jqFzXgxd; 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 4CRd753XcZz9sRK for ; Thu, 5 Nov 2020 20:11:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E04848255A; Thu, 5 Nov 2020 10:11:02 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.b="jqFzXgxd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 76B3382517; Thu, 5 Nov 2020 10:10:56 +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=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on20627.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eab::627]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B0F4282517 for ; Thu, 5 Nov 2020 10:10:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d1Ae2qTkE2TfhhmTV2sTb6EPEbzDyu0nLJmizRH+8MADF0L5pil1HAPgwLynqs4c+CVF7mSGlwNTDX7TDj3BnWKlIEkPEALFVG/EE4TKVThs9QuV1cnpEofuu6rsNwZZnilI+/+ob9FGg7sryguBdb0N5h9may+q0/yQGXqgkPS2iG/tTNKyY3vYUD9BnKICqLT0aCBCC51K0ycVnoF1rCJoBuvJv5QCfFNGGNk+20yMQ4NiRVBjLYo6wZiJvMvSBPWs8jDZoyQ4JpSaPw/rpNrvMcuMPI0zWrkkLSN51d79myal51cjVWpl8/3BePiN56/vL4iPKyyWkMHlOWqv9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sVDESgEv+B+3/DHMc55/AWMai172W25S3WYwAiWUkbQ=; b=j02z62kdf5es4nvWAF2fTeWypi5FpZiBpUPeuZDhNpIszjHltYum04gqOE2gTFW/0hgii1dLDQDeolRZnlzYpl3cTgHfSQ9Suoff1SUt7ce48Zmpxfn4VO05bKM/iRHa1Ig/YelxFTRTirXj7pUkux7C8SRxN8xRNiPStcE78EoYisvJxZD0DWmNYNcVR8l+5cDJBzZhnbVSPxkPyFeJeecq1/sewcZk3wDVBaQzCJTOw6jO1ewh4F8XFaSqiQ0cTfA9KstiaQYiun37HRZqtyFRWKCmlGuzrhE2Pp2xMnIumQNhe1iFm6qIICfu7Ij2VTEUPA3greHUQqWgdmGJDg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriversystems.onmicrosoft.com; s=selector2-windriversystems-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sVDESgEv+B+3/DHMc55/AWMai172W25S3WYwAiWUkbQ=; b=jqFzXgxdl59F/58digcw9zSL37R3it6lnR4eHKEV1U+T2tAHTMN93jtEarc5Jeh8V3fabdXpp/ngXDn78VpGgZpLRZa6+RszDjnUfGrbN/CbaouXDm4Kup83237Qi9r0Jl6PfaSfmhf0om4wx2RC/hNZ9fe75pEyZGBF7QWmAsQ= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=windriver.com; Received: from BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) by MN2PR11MB4333.namprd11.prod.outlook.com (2603:10b6:208:195::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.27; Thu, 5 Nov 2020 09:10:45 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::a464:f45d:2dc9:f8df]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::a464:f45d:2dc9:f8df%5]) with mapi id 15.20.3499.032; Thu, 5 Nov 2020 09:10:45 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH 04/18] common: board_f: Use IS_ENABLED(CONFIG_OF_EMBED) in reserve_fdt, reloc_fdt Date: Thu, 5 Nov 2020 11:09:41 +0200 Message-Id: <20201105090955.29641-5-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201105090955.29641-1-ovidiu.panait@windriver.com> References: <20201105090955.29641-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR06CA0198.eurprd06.prod.outlook.com (2603:10a6:802:2c::19) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VI1PR06CA0198.eurprd06.prod.outlook.com (2603:10a6:802:2c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.19 via Frontend Transport; Thu, 5 Nov 2020 09:10:44 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 471d032f-635b-4aca-ad6f-08d8816aad8d X-MS-TrafficTypeDiagnostic: MN2PR11MB4333: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3276; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Zg2zrGaPNCrTnF08vbLOIaX2EHt6JrSs6sLcYNIb4w64jHjwSGQZnn62+NGBqKEWWjorayhFGdEx0FwqtebAzijxI6QuWtaAiTXsB/mObkLjjCX0kItxERMfvIRupAJb8uWlNKdj0undHIhHY5NlxNJUX2APSfdnSdKI8Pgivv2i+pzQJ8TBR49WdoH2PBHKQdmMVmwi+wLWoEhlUTNfve16wnFIWGk24WgPzkespMCt+c8QAKWpLOt+S3jWzizrIsVEcslnZKLCgeOGh8zX3ZokjYfRVtWKXnyz8FCFPEWg3wPv9/3FL8WXUb03SBdSnBRJYj0vhiRMejFMtlGbzA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(136003)(39850400004)(346002)(396003)(376002)(83380400001)(2906002)(66556008)(36756003)(66476007)(66946007)(6916009)(478600001)(4326008)(8936002)(6666004)(16526019)(26005)(44832011)(6506007)(5660300002)(86362001)(8676002)(6486002)(6512007)(1076003)(186003)(52116002)(956004)(2616005)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: /G8BTw2N4UWKkX/MPWsM1YbiQVF5dbp8G3TwHxV3T837phjJjvQRaKTzw3TkNgeUOBff1CNCvcw4QHKbEnSHbr49+1J/XxjcCHidGLXdxTGfMb+52CwYpKNopTUM6KhTMDLaO4S9zW/7yQskdNv4s/iapCGpbw3qLLwoIPUB/1daJs2BRZWYksS/rGo1AF4Z8DXmDwuY5PPsx6KSL/fY8sMa2GBwgPovm9ZbVk8eh1gabokDkh098JwOFamqb/Vx/ZDLXFS3Bs1GDWE9w81vfGe2JatDNYHd4/faGtYUKHuPKTaKlQjwUG3Dlojt3Y9WxWpkRtgAwqtXzqderXgf8L7SDJTG/OGli/v2qRC07uchaEdUyqrbxr5n0bMX9dMGYV2qGBBR7SAe95tlHueFtoDzMCCKu5HPvUTCJd5+UQmtJnNDJMUubmVCvRlCH/+kUpXvTbm9eDcA5HeZgQnmE3TnZiwV8rLhK4Su1C8x2jIh4YKrve7FTb+3f2T5mAhEWfXdIMbjc/Cwz5ax8kWxppHXjhZ0e2Qy9HrA5jKnixFL61rsJL5GBCOhiTAaezzpHWYv8HWFgUPm+ZocPbTqPQ3eqMhyklgbmba5wxXpOVtpmVh20yO2H5HZOe1VE+E1/oovNyk7gkgUZgicCvwEbg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 471d032f-635b-4aca-ad6f-08d8816aad8d X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2020 09:10:45.3983 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: yIM/tQZaKAXxLz+wKfbnr2vWa/J38AVL5aVqIvLIMuA0gnr9OB9Ds+3fsNnWjhi7lENAyTbaDEmW4xqkOWEhyDucxzmasnNtRw+UjvNagW8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4333 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 Use IS_ENABLED(CONFIG_OF_EMBED) in instead of #ifdefs in reserve_fdt, reloc_fdt functions. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- common/board_f.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index 408b95826a..b6175196a5 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -514,21 +514,21 @@ static int reserve_global_data(void) static int reserve_fdt(void) { -#ifndef CONFIG_OF_EMBED - /* - * If the device tree is sitting immediately above our image then we - * must relocate it. If it is embedded in the data section, then it - * will be relocated with other data. - */ - if (gd->fdt_blob) { - gd->fdt_size = ALIGN(fdt_totalsize(gd->fdt_blob), 32); + if (!IS_ENABLED(CONFIG_OF_EMBED)) { + /* + * If the device tree is sitting immediately above our image + * then we must relocate it. If it is embedded in the data + * section, then it will be relocated with other data. + */ + if (gd->fdt_blob) { + gd->fdt_size = ALIGN(fdt_totalsize(gd->fdt_blob), 32); - gd->start_addr_sp = reserve_stack_aligned(gd->fdt_size); - gd->new_fdt = map_sysmem(gd->start_addr_sp, gd->fdt_size); - debug("Reserving %lu Bytes for FDT at: %08lx\n", - gd->fdt_size, gd->start_addr_sp); + gd->start_addr_sp = reserve_stack_aligned(gd->fdt_size); + gd->new_fdt = map_sysmem(gd->start_addr_sp, gd->fdt_size); + debug("Reserving %lu Bytes for FDT at: %08lx\n", + gd->fdt_size, gd->start_addr_sp); + } } -#endif return 0; } @@ -616,14 +616,15 @@ static int init_post(void) static int reloc_fdt(void) { -#ifndef CONFIG_OF_EMBED - if (gd->flags & GD_FLG_SKIP_RELOC) - return 0; - if (gd->new_fdt) { - memcpy(gd->new_fdt, gd->fdt_blob, fdt_totalsize(gd->fdt_blob)); - gd->fdt_blob = gd->new_fdt; + if (!IS_ENABLED(CONFIG_OF_EMBED)) { + if (gd->flags & GD_FLG_SKIP_RELOC) + return 0; + if (gd->new_fdt) { + memcpy(gd->new_fdt, gd->fdt_blob, + fdt_totalsize(gd->fdt_blob)); + gd->fdt_blob = gd->new_fdt; + } } -#endif return 0; }