Message ID | 20201105090955.29641-19-ovidiu.panait@windriver.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 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=<UNKNOWN>) 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=ZFzvYqbi; 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 4CRdCh48nYz9sRK for <incoming@patchwork.ozlabs.org>; Thu, 5 Nov 2020 20:15:28 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0E2DE825BF; Thu, 5 Nov 2020 10:11:57 +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="ZFzvYqbi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E52C182558; Thu, 5 Nov 2020 10:11:14 +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 NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on20600.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe59::600]) (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 38F7382364 for <u-boot@lists.denx.de>; Thu, 5 Nov 2020 10:11:03 +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=X8cSwbEwDBRUba4/9R7eVtoLzVN8k3usRyd44zr9AIPj2vscfCWZyzB4TtpX6M6IIoYojoFq0e/F64WAwQoHKUhfZ+irKPuDAZks3BMSf2wi5j5HTA6Ec2KFDevoGcQv5SPSjZki+3DblQ5OKv4/8N7eM0+dczduP+XPKSdMz/PbLkratJxU74r42DMSMmhq01ulx7N8XO6nEG4xY8G3vZfA6KSGcBG0FZWMOVZvpZj3Okp+izIGFJP6oC+IdFfay32nS4KIPEV6ZYC6mot8saCFvsKvdIO33DzFA45WcS7U9guGlQdMXdGBu2yAISqMfb89mbmb7hogBW6q09L1Sw== 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=LktkKOJ4gxLQYbeMwljE0O5eSZJEbGy+P8C0OHBITIk=; b=WiX0fzp1mpjquGJQ1zjTTfraaszC1Wnlg4L9gn6U/4QWp+h94J6W/bAKzct9M9fhusVuZ/tcrOyACVPNpQZeJ/8P+oWWwSih/OBjCPIlr7uwIHxoH//GY5xI/junLKBGIsoNpxMKfALmjmYaYxf8WbutjVjCS86075SUGYee28hksmY0APDLWWGemCPyMnzlWwssrVTGIvj+RyL4dbZwn/RQjhLNrGG+dWU1vuwjwq0mZMOyp/noBv49noXnLEuHOo2LzQU9YjSDrZC7feiiq+4wQ3tYRWR7ih4P6vRbafZDzJ3AM7+gQzLqq5eSzNlE92XCBB99SRFs/7Wuy91+iw== 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=LktkKOJ4gxLQYbeMwljE0O5eSZJEbGy+P8C0OHBITIk=; b=ZFzvYqbi6oNWh/7fs+abImIz8qFWO/epvSIMM/9s8bAxHsNm2Vic2hTF3sBm7ZVJkkp1xs5dyt+01WAgzTDcXLbljDpyRbPJJgQALzJlvCFsk8SihYNyGOxfEy7m59omtqSGhvTzr4yHZm24BSQLz+koB8bn/ExilVmHpOTfzpQ= 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:11:00 +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:11:00 +0000 From: Ovidiu Panait <ovidiu.panait@windriver.com> To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH 18/18] global_data: Enable spl_handoff only if CONFIG_HANDOFF is set Date: Thu, 5 Nov 2020 11:09:55 +0200 Message-Id: <20201105090955.29641-19-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> Content-Type: text/plain 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:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 36a8b28c-6567-45ca-c137-08d8816ab686 X-MS-TrafficTypeDiagnostic: MN2PR11MB4333: X-Microsoft-Antispam-PRVS: <MN2PR11MB4333D8D768CD3AAFA56FBAD4FEEE0@MN2PR11MB4333.namprd11.prod.outlook.com> X-MS-Oob-TLC-OOBClassifiers: OLM:765; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bbUV3Kj+V+3bGvAG8hPycRcj+dxMXUgfDcqzJrfl7gjHuMSYXXXdBAWMAqbpBUXOQB9UBd7pY8uO6WEXQ+5hVw28ACY2LyZcTVmUqHh/DAxQvh/MRgyc1pv0ilz+mUhTDUN2EhRAZ33YqnsQ0RQexL/1sras5VDG3kWZXd6hAsK9KH1JJ74AAypefLOpFhT6DKsJv6x9cFH1Iqcpd4aSFt43OLYZvluuVGGoRMRaO7YSXYGBgmCQKmZVoLnoDBOJXHiPJqTieXzjD7weCmhkmqHrB+j/WhVUhP7maSVrVZTJE9nsyn/73kDbUh+y8QJgE2l6aJZM0swRdujkUwzVBg== 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)(4744005)(6486002)(6512007)(1076003)(186003)(52116002)(956004)(2616005)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: QAQFADkCC1QcOOXWpmWbWT1A69BX+KRW8cmPyRJGZwmTtw2kEhfgzf6zeo95YHdPhjWWbOPKhIbIWO3oQmMBadFbHBrOZKV5jDM9YEdmT/bZ2abKOszuwYwGQmw+sKgT/XzYQBRVnKtMr9RrVKf4fDc8CG4rEhCCDOa/PwR0AyM8awtxOanruHElNFDuxbpohtV5+G3no0kAryDMALKHGy6/OCYNnr8mYFP6u66gVVhh8E6PtYL0uNu+4K2IWoGOT/MxANFJbpNA1Zqd+cwSgP+9YKbwm5DpHX9sE7+sxB1uBB3DtIhpWzPBoTlx/GggTU2qaHr2IMOzQzDhULXO762TlqwuvsVBEqWskOsYGmdCIeMAN4BN17Z7wRZNOnFWOptAfOWSi15Pd47sCbtPrxejaoooM75MYUcXpp6eImjvkW5T1wAIJSwEax7gCpzCeFqvZB37dTStHlofqC1DdYtFXWO466Y9LeiHSt1/PhAa+xXHcig0/cFuaLoi35QpF6YaiAqdMCoJfaUdEyx04OMMHPRmoYhK7Prjkx3FqqkEWwZ0QIzGdM51jU/Nuz/hwKM0MIps6KVadhDGic0+MGFGQjNg17WbPi3d+/lwC8vX+cqo5UoHDbJR5QtZFynP60jUh1fcEtz+6hKUTJh0qA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 36a8b28c-6567-45ca-c137-08d8816ab686 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:11:00.4574 (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: wv3KokLstz/SwV4jd+8CXwh773hReJO1FtCY6ZjSiTjE81ODLc+otPTyqqSpz9UO3pDlqYPJzFQw+SwCKyxoe9zcH/x7xab9w8QVL7hFRKU= 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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://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: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean |
Series |
Minor board_f/board_r cleanups
|
expand
|
On Thu, 5 Nov 2020 at 03:11, Ovidiu Panait <ovidiu.panait@windriver.com> wrote: > > 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 <ovidiu.panait@windriver.com> > --- > include/asm-generic/global_data.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index f392043796..fc6105ca8d 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -399,12 +399,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) /**
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 <ovidiu.panait@windriver.com> --- include/asm-generic/global_data.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)