From patchwork Mon Nov 23 13:16:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404781 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=IMr97dMd; 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 4Cfnr06VmSzB3tb for ; Tue, 24 Nov 2020 00:22:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 40E89825A1; Mon, 23 Nov 2020 14:19:20 +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="IMr97dMd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A0D34825C1; Mon, 23 Nov 2020 14:18:27 +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.6 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-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on20603.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eaa::603]) (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 AF8F18242B for ; Mon, 23 Nov 2020 14:18:12 +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=J28CeFGY0g+HBHWSD/RdoW7wluhNW7dvq1rHZYKWCR/fx3iIm8vcXI76IWJuwMhUDk1MEgmszr9BKmVYCKo1JkX7UgaIxqgGIv68QT8o4HpwEEqgV12YuCB6Pr+IFYvjIcvFvZZ7FEgphnX8DknUGoqhdA2VdMVnxcUad/TULROZnJl0XvPL/KBfxDBrVa1x1qKBNXcGsrk9X5/fwcFkmeuS1jlYai2yAWie6gGaZZnoAboBDaCuht+f4fh/Eo4iApKS4gYiFKO17QoZIaRxIwLXJhjfHa4hiz8gcnNKfmBaEgZYNv/0CF5TQijtBoBrP5eHqfz71iUwVxX6ho575Q== 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=gTXOsHcOzbeBnYgd4lrvQvG5rMWPC6FzWWeeGc0Qy0A=; b=bU596L7nr422kEH1Dv/SeUG80yAo8Pg90tGfjt+HgkcU4plUROgbv1Q7b58zJyVSg76y7jH9j8a2ziNOK6jIyv7EwTYxkLmej7Vi/+atXRmvycW9HuF6BU+IygYB7e4vWo9caaBlrINjJByywCMadegxcB1suP6DJjDB+3/V8VblCggn5ldhY7fEdGAbfzaOC1n/ZPkDN01qHwVhno974yxMZ0kPv+lXUncnC0GK6q8AvJVWNhyLwzW2DIV4J3goGGsjAEV9ou1XxjfczscQMkWaXdXw2iJa9MucnSs8sYcsdYiTDR1bIalnxeBV8KnhVxR+8KopMZS3o3oqVdpxYQ== 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=gTXOsHcOzbeBnYgd4lrvQvG5rMWPC6FzWWeeGc0Qy0A=; b=IMr97dMdlBC/ek+PGsVtk3iJF25XdSIrv9A78Z+3T3zYP+uooCDL5mZvReAvaU3pRTXTe+eZmt8g15s3B9V3AQBwWDUMQejYSFPy9mUUPr9QI++Hdu7cskNcE5bqVyD6qeZlPGbgcAa+PAOBHdb7fdqHEN7rgADglIOns20Iz1k= 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 MN2PR11MB4336.namprd11.prod.outlook.com (2603:10b6:208:18c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20; Mon, 23 Nov 2020 13:17:50 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0%5]) with mapi id 15.20.3589.025; Mon, 23 Nov 2020 13:17:50 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v3 05/18] common: board_f: Use IS_ENABLED(CONFIG_OF_EMBED) in reserve_fdt, reloc_fdt Date: Mon, 23 Nov 2020 15:16:38 +0200 Message-Id: <20201123131651.33032-6-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201123131651.33032-1-ovidiu.panait@windriver.com> References: <20201123131651.33032-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) 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 VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Mon, 23 Nov 2020 13:17:50 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1462f2ec-b768-4935-78e2-08d88fb22dbf X-MS-TrafficTypeDiagnostic: MN2PR11MB4336: 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: nn7UXv+J3e3+6iDTi4OQndVuC6dtq2LOh3ljqf2hLRIdGD9xZEuoVS8jUw2Yc5eps3c3d8mUjtgTPkC/NXhVC2FU6WM5gKJcawBMhcW1pj2TTUIJO5zvqd6Tc6Gc9uyj2FDhEL6+nI75Igphf7WtaQm1p3cM9gNy0s0LODvxxxe4pT4e52tRxkGAVy4/Q7rribxhj6WYBq2NsHFknohD9vJlNap9906iJse0myYl/4KcDVpCPm+Bdn7C4j/BNP29W2qv0RcGwi7daR69T29mEzHtzz8/q1pVKOrsgdvADdDLSXC5EYxdF+Trb5kLGFsK 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)(346002)(136003)(366004)(396003)(39840400004)(376002)(6512007)(4326008)(16526019)(478600001)(52116002)(186003)(5660300002)(316002)(8676002)(6486002)(6666004)(83380400001)(6916009)(36756003)(66946007)(86362001)(44832011)(2906002)(26005)(2616005)(8936002)(66476007)(66556008)(1076003)(956004)(6506007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: +fMh4cHG+AS3Rj07YiWEfIoJP8IKM0bBQUtxFvGDEE7gRRkVWV4/p+COSxpIDbXUKtoHa84tKK/qGssyvR+b4ByPSM8GWOmLmzZJDw4TOyXbVXc4SZHh2Coky5XaKJj9gGtiE6bZlKYBwfw1G5CLmrhXUc1l021cyhLGcYC8TE8mQirR3XYGUCyb2QF08d5drzmXBYo5uY7Eak1MWGWS4sYBykkWSnE5M684Z5+F1Sr/WTkDWxc18i2VPCfKk7GCGo8wTZsQG13xLcQW6w6xHoU1jQiUKtCrtT+aN5ocoDS8D4p3ld7L9sRUCeFjbTSrYNKzcD1s2VOVhxCbB483wvCkTKYQsm0VqjzRAx6vP07SW/B9Bc48C8BjCLo0w8vD3LOQSMbs+k8O+/WelR+f/dQ2a1e7CFBQvSi84wCK1B0zXnE/4oZJe3prD2m533yzL7oU8Br6oiXgR70mhFQ9FU3amnbYh1x4V8z4Db6GYRkdPbyjNnSYUfIg+AWbGajaVzMSk6xuRNRZEVVc94gfLNaiX+Q7wzVbBd+0zREGY7nz0l/bUFo93UHJU4EEkuc/4AD1YS0uHuonBWWDBpM11tuGu+Pql1kX8YEfRn8mvdxSNZMYwop3+2W07RiYCjf9MaUIvA/EvULERj4WpbtNWjC3G0GHV3KZBQ5AHsMgY/caEGbUJiJwGdhV3nI4M35/w86TvS/fnRO+vIa/Fox1scUtfay9iTze7wnQiy1XjruS+2FiNQXNTzw96jZLjbd54uxo4LJ9xop2kWLh7o2CBKAy96b7y+M2X65tMtWySPGHPGyji+zapuc7h2Ttl+bPS1JuJzkKd7DaAopU8HWR7WC38TqQen4jDXc6tNVdRuyhWxzV/K1Fa8zV29PyRCF1jvOt19dYLrnpbHpkQesTEQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1462f2ec-b768-4935-78e2-08d88fb22dbf X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2020 13:17:50.8987 (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: OTANwGE6q9Yv9osvfzffVliIQ6IZcuJ7tqv6AEYrL3x10QBnpuPsEChbAUSMV+tlJ+xwcJzUFshh97nvLoW19fWjBOQyNA62W7YKVVDw13k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4336 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 --- v3 updates: - none v2 updates: - add reviewed-by tag 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 fbf622e0f0..ae3001bed1 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; }