From patchwork Sun Nov 22 08:35:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404456 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; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: ozlabs.org; dkim=pass (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=dd77/FQS; 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 4Cf3jl0DZwz9sSf for ; Sun, 22 Nov 2020 19:44:10 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 57AD9825A4; Sun, 22 Nov 2020 09:39:48 +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=pass (1024-bit key; unprotected) header.d=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.b="dd77/FQS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 31ADA825E8; Sun, 22 Nov 2020 09:37:53 +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-co1nam11on20612.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eab::612]) (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 41B04825C4 for ; Sun, 22 Nov 2020 09:37:34 +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=BHeSDsNr0Tu8Wad7MxASBmfKtPk3TkbQbxkfLeFFO7AYONYvDTPRfZftSsOlWsf7kbDbM1a4t0sa3lUyV4LWkq4tppVQchTXIeS/M0da5Lu4JiR2+X3t4RQAW7K0B9wJrUfc+1V+cc/hgV4rtcNrXaCKopq/5auWdVY9Q9EWgVpQ0vQC+PK0I0R2ZoLr3sxI8mMIxox9TjxjbWpV6EGf//GJCldnfJgpkD6pb5e/pLeXspGKEKyEtgoFHJGcJLfv/VP3Qdkqjuqe8hiCtVyZn6tAvRh/+1wTtVub9gEclG9aCJnS//jy2Jk/hmuTkTr2o8c8BJm7i5e/c2cf6TlWWg== 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=pCC5ImfAut4CAUKxOTfOF3E9HcdXJHEG/Q+BB12YtTM=; b=LpCy1oqdkLvXSYZZ0TELar1kOW3h4PaNMTV50IOa2gvKWPYfuD3y9N0np3a+7ZS4FwtsYnvvRtOZ94KT7Mjx5R1R/Px9t95uiOMzDx3Aeh4HFH2w2peUah/s1TipQVLpAmEXbTcASHYlNxBMScSLqGcXbwgOH4pCEK/Zphi5lEGh4aogeyxBbJtLpg1Xpi9cb3z1uxuiTBN69NjWhxJV8XZFtv1LsZUS6IHA8n4zVz81g1lMuDQSVp3LwJVc0/A8lzjimANoW/prOSKPSISb1j/kz+EQ4NPd5XaaQr8uCtaoU3wGPMTp3WGttXA2eKJi8CtTSUr7fvdqz6kmneNp1w== 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=pCC5ImfAut4CAUKxOTfOF3E9HcdXJHEG/Q+BB12YtTM=; b=dd77/FQSH9RLn6jv4NZAunjCNZc+zsS9fFbY0UmpjPGnD2TGOEcG7wnLuQqLPwxdSN1jH18gQ6Zb0ghzU6pwMBBrLCZ9gmLFKczxMOZayokVEf6Z02lTH3JOTU8vLg91d3Wlq5p1nUlEBlL14aY8jz66+HN9YAiqDt6PN7FEGbE= 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 MN2PR11MB4223.namprd11.prod.outlook.com (2603:10b6:208:18a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.22; Sun, 22 Nov 2020 08:37:17 +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; Sun, 22 Nov 2020 08:37:17 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v2 18/18] global_data: Enable spl_handoff only if CONFIG_HANDOFF is set Date: Sun, 22 Nov 2020 10:35:56 +0200 Message-Id: <20201122083556.6756-19-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201122083556.6756-1-ovidiu.panait@windriver.com> References: <20201122083556.6756-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR07CA0165.eurprd07.prod.outlook.com (2603:10a6:802:3e::13) 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 VI1PR07CA0165.eurprd07.prod.outlook.com (2603:10a6:802:3e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.11 via Frontend Transport; Sun, 22 Nov 2020 08:37:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2140a4de-8826-4b9d-6bac-08d88ec1d195 X-MS-TrafficTypeDiagnostic: MN2PR11MB4223: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:765; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 022xmAipdJrB4cQdPsVFL4Pya9qghlw8tAjBu50TPTELg7h4+uc0Isp+YqdFSPXHrvU57fuayVTfhghBtk+l1g9hgzf84mYRD0d1rHOBa0BQNman6T/Ma/aBuEFqoSsixQTnhGpjJO3JOzM5iikyr4Wjf9Bsk3xFNXpovSlSsjUESc72X5rFAHVmg+7hsyNb7cO9XJubgb5eZkGZvO1FdZK8KlXykNKShVztim+1UpdGsQ8wkFKGe3xWQSJn094WYmOZv0fSPitpILi8huZmh8uB0c/m/YjNoF8dubifxisG6qfaUauzsojSKMdwMwO5asaOBcVC8L4KcHHzNCkqlw== 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)(396003)(39840400004)(136003)(366004)(376002)(346002)(36756003)(186003)(16526019)(316002)(26005)(4326008)(2616005)(6916009)(83380400001)(6512007)(478600001)(8676002)(4744005)(2906002)(6486002)(8936002)(52116002)(44832011)(956004)(66946007)(6506007)(86362001)(6666004)(66556008)(1076003)(66476007)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 1VPWxYAe2SI8QrIeILzxgE6qmvOt5JV0feJAbq7LEOYcbksBA8gEBk2J3+1MFdsDWk6D0XwvC7X/fwWZCPGcZ6Oysa+XHX4bUYW0T07hPawBMZaL53ZGxZXU7485od4Qc6xpdCRg1RhfC+LI+qy8fQwmlxwmP2BZD0xaKwlBUQO6B8GpnPIedZRp0I5DUyNCeDXADdT+0toEoup/EX/bdO0ro2OskgoBNxdh7zqNp001n2HsPxzav5pmsa7nskyNejvXJhCLdBwvn5ql44ckI/kZGlHxwiz0Zh3rV850Zs15xSRQ6OQ8DNGpL2q0die65RJNYoS3FqIVQMGFYM5WlPiTmGXQmZImR2hKb6Pa8+W2dSD99CUSc/pXKWAdfT/AI8D5rS4vK3UWgrFhBVz93BkhRfOf3TnR3S1H1I6zNDvH9M630GbSCX8ulZyVeW0JvP0czSpHSBpqm3154fXPM5+niwEe/k+FvWd6pTebDZN4+5d9rzv2iQfSJeOM2eVExCf5/1u44hFYlAjx2oARvGjf3wVVFEIGv+NZyCAWmFsIDalDd3mCRBGxuWgPZQ+V5txJE2KuOvYF4fV/2Tv7R6L00ku6fzRQ655Ks6JVs6kzy/EXqgpii57dJKVqsyc6SKSbzfyTVISqkd1wyn8cy+6ZVJWp4ri86+bJmFSPq2s6dBQT+kCjQNqB0eoGL3cyIMrF0ZVFYuFcCSAsRbRRIkdUnK8tlhE3bgeMMCRVp5lic5xL3MwEFOPs2XkB3aTo19Di7KWp2CRQ1tuftyWPc4I8mzt/IoAufvUHLg3Kl258CmzqkoFLqrQHsCP45nETKlYKUwTEMJ/p5T/r8SIUDrYFXDx/GNu61+RWrBSGdVM2hNIp2mMgnans+NfA91GRLGUuZ1TF1hGriNuJiCl0Yg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2140a4de-8826-4b9d-6bac-08d88ec1d195 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Nov 2020 08:37:17.1626 (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: D7YZ4LBQ1Wt2w+TAegmLXLEGkeb28j8p19CYyfc3PnbsC/bcj+pv3Y2YA2snfA8b+28MykX+ABZe4amXl8fxCQpQEoNx+bBPxZ+57M4g/Wo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4223 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 spl_handoff should only be enabled when CONFIG_HANDOFF is set. Drop the nested ifdefs and check for CONFIG_HANDOFF instead. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- v2 updates: - add reviewed-by tag include/asm-generic/global_data.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 87d827d0f4..5b1a7f1131 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -400,12 +400,12 @@ struct global_data { * @new_bloblist: relocated blob list information */ struct bloblist_hdr *new_bloblist; -# ifdef CONFIG_SPL +#endif +#if CONFIG_IS_ENABLED(HANDOFF) /** * @spl_handoff: SPL hand-off information */ struct spl_handoff *spl_handoff; -# endif #endif #if defined(CONFIG_TRANSLATION_OFFSET) /**