From patchwork Sat Jan 16 16:08:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1427525 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=MW4h16QC; 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 4DJ36345wCz9sVF for ; Sun, 17 Jan 2021 03:14:35 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BC94382892; Sat, 16 Jan 2021 17:12:19 +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="MW4h16QC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8506F82856; Sat, 16 Jan 2021 17:11:36 +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 autolearn=no autolearn_force=no version=3.4.2 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2060e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe5b::60e]) (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 3EC3E82824 for ; Sat, 16 Jan 2021 17:11:28 +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=E57MwJd7p5dtAEk8OxsMTGkrgF6rvqj19H5ZtnUysHpquu+oRNv+jWfy05qf0shiEW596IfLP0ps/ZSdXmFXe5ojDBa94DTjy0MqTH4vfuZq6pHZsam1qcwiKjG6wuvvEZS7xVntPE2XzsJBADCH/gw7T6W7PoGERRdUVPy6L6UCO5xDvGvDTRjc68t6FNYBV/Aw45lSIPTzaBF2GO9/e8ybmaqaBAfuMJjFsrSan9X+8zRSR0F1BsZyaXbqXlX3R5aysMCNT/HdtzPpYax0kGBansr3GvN3SAbFFP6SIRHJ5Ewg+wIF/BV/WVJPwU2zAsPU38X8h7uy+5hhvkM/Lg== 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=tDBD+kWy8OQA047mIeVyrm7BOdqXJrqA0qTqbKpfVNk=; b=iIHHqXf78lHbjAFY8c4LR2oMZ7mssr9uT6FFCCab+uIfuncTAqDQhyvS610KsW0VYRess0xDeN90rM1sPKUN+YMaK6K0ZkLd/DRzCIO3nubq8NJJaQuOc8vkvS1kSjaxD2DmrVJAzp32ybLaRAMCfgPAcRxB2OVnxbhvy6d7Ro7+ZiaI8x3GuDIlFoE9LW2QTFj2Gt5MvgtufJTFHdOOo76CrSA55yC6bCf7A0TzE6ZupiVTN5KmG7KyVwd7ygOB42UxLN9Sm7bM8jT9VGjF8YLdrcucwB1g6+qdY6S/gbMVJb01Q0scOjw4tLW43qeMsgDHuqP84uETAKyvrCbZLg== 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=tDBD+kWy8OQA047mIeVyrm7BOdqXJrqA0qTqbKpfVNk=; b=MW4h16QCk0h93pj5sDMW/CwTSXnNZDICy/UVuu2ED027FSfJEUSWwQvsDOTHh23F/wY2Z1LzIsHBiiPAF6YMHrHwh3HQfQBMzzCxdxvxCDT+Tcroo2Vq8PgZzlQNWypjrNLB/sfX6r61LWXNH8qSt28T0nUviflDf6PVty9Gtqo= Authentication-Results: chromium.org; dkim=none (message not signed) header.d=none; chromium.org; dmarc=none action=none header.from=windriver.com; Received: from BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) by MN2PR11MB4445.namprd11.prod.outlook.com (2603:10b6:208:18a::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.13; Sat, 16 Jan 2021 16:11:26 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::85d9:7219:6427:fb43]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::85d9:7219:6427:fb43%5]) with mapi id 15.20.3763.011; Sat, 16 Jan 2021 16:11:26 +0000 From: Ovidiu Panait To: sjg@chromium.org, trini@konsulko.com Cc: u-boot@lists.denx.de, Ovidiu Panait Subject: [RESEND PATCH 18/18] global_data: Enable spl_handoff only if CONFIG_HANDOFF is set Date: Sat, 16 Jan 2021 18:08:54 +0200 Message-Id: <20210116160854.9525-19-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210116160854.9525-1-ovidiu.panait@windriver.com> References: <20210116160854.9525-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR09CA0165.eurprd09.prod.outlook.com (2603:10a6:800:120::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 VI1PR09CA0165.eurprd09.prod.outlook.com (2603:10a6:800:120::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.10 via Frontend Transport; Sat, 16 Jan 2021 16:11:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b5b28d72-d36e-49e2-d28c-08d8ba39603b X-MS-TrafficTypeDiagnostic: MN2PR11MB4445: X-MS-Exchange-Transport-Forked: True 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: hic0Ef+V2M1uC/QHGrou2/jZ1lFs4NgYyqEpaLaND3BS0P/VNHwyyUyy11ivBqK224S+IOQSyo2ZzAaEfou1NaFuNyCEcicylNUw8uwcS9z1m23+rk6ocSUcB72wMaQlDydZAJ+Okj3zr+++80PbS9lfp8KTRUz1OsoxWFbwt8Q0KCQD4jFaWO9Iw6W0Y1j0WBJHeWhJeFDhSu6S8ek7h7xs7VG4Ou5cyhfpUD7qkUrFYK4lKHS5MY7Ob3fHEI/ncCb1g6xg73QRBx0tsJYspxB4Psv83LxPmtIusx7gx9LA72n8lGVtk8e6b793bG3EofeQXay6ybPueUDC4pxWxhGGSJHlnUX/ryh/+zTY+gjp5wcb/F6xdkgb1+0GrJCczJ4i1/6M059jwHK+uuXHTw== 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)(396003)(136003)(376002)(39850400004)(366004)(86362001)(83380400001)(66946007)(107886003)(8936002)(4326008)(6506007)(16526019)(186003)(8676002)(6666004)(5660300002)(2906002)(6486002)(66556008)(66476007)(4744005)(26005)(1076003)(44832011)(956004)(36756003)(52116002)(478600001)(6512007)(316002)(2616005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: dvcNlM9GWOREV3cr+tyjGzcgn0QGfjJmcQdnvc02pszHpRebt3w+lMIGn8QpH3uNsW6mYXWPuUe7qTj9q/ijo6029m378i3t9EbdCkIfx0+U+VGwCswJWojOUcPyxyWcWJwza9PkpIlPX4dwpN/L7hysbaSe+yvb7ZhHwVGYJ4fzEpAVQW9iNs07LjcQ4VL4Zk2jQCRxFXtACutIEusbQxI+r06DuO4H5gNEq2/ybIBAqd/a/0j9Ui23LSOxQrqQa4LLvYZ+Db8qm8KAWjDzDwbPlKSas9DO3LJhLFvQ5jSl1FBsOVdd6FHDKg3LIglGhTobv7fz/lHTFtZkHs74WxKOC7Wv0Oo8W3HCiXs3pmvzvIJBrBoM4vUetoYHkaN6FYbSkgl8Jc29He4Uf0cXOuz0JIOt8gBjiSK3fwGq9jdlxQ6MEvluE+z2YXGQfOHuqJDfhgn2x5Sk2WVSIQnLwwM2satPlJvHR20pO8KyZC7j24J/wZDtUKVEGgsKXHSWR6P+S14l93B3oQtzY55DzdgY0mGNZadZlKBWDDfZyxyFizeBqw3IdQgc3F/KwtwHILM4VYMIXgYxbgmIiq+Tf5LYP8xtp1CnrBCbCWNZLtDbCK2/Xnb8FnLtdvBruPFyvadixEk+vfJYKdFcJ37m4hPz0fBR0AEpzXGpg4WUJZNBLizFjKgDlGLJaYioP3wbLiTzhQ61iGZC6i7yO6bH+Z4cYJK++uw9YmdCSzxbc+PT+97GatMKuNntXhBUJkcp07l0Mmfg/30v8YLD1vNeagE5N989zJAuZ9tS5qUTVnBYmlvW+71aONnYvBkq7wktEN3XCQ8sfURH5CgRx4op9KEQSC84eVdtpxxRCNP9/PqAWKinkeHFXJr7954dUyHjXUzh+QcZuheRNCVYfN0NhhcbP9aVjMICK8KStmdioG014GbOhK1utIagr1Q+zD7psbgGZhgr0xo6TnDR/9xV86mQ9vnUzt7K2fjqrg9FYmPooHQlSuuTqwCRwWoRPDYF X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: b5b28d72-d36e-49e2-d28c-08d8ba39603b X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2021 16:11:26.5509 (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: sL9qWe9XmGEFXtIjn+3iAz1AYVvLhUPZgbJ4G5VzFItMS+Eja3/q8bXxVbItORUQAGPs9LUjLWoY491E3Xstrrg/dRo30g6+Wo+C6O7FGCI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4445 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 --- 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 efa09a1943..19f70393b4 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -412,12 +412,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) /**