From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 08757CCA482 for ; Thu, 7 Jul 2022 08:47:32 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 228968454D; Thu, 7 Jul 2022 10:47:30 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=amd.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=amd.com header.i=@amd.com header.b="VygyBWC5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F19C18447E; Thu, 7 Jul 2022 10:47:27 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2066.outbound.protection.outlook.com [40.107.94.66]) (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 99A338455B for ; Thu, 7 Jul 2022 10:47:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=michal.simek@amd.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LUHNOUJyLgHe3VqRaFX3w01qZTT18LuNpmeOxn3CCoVqJme339D5rgWHtRSPgOw8J2hjoOMSv6Qv1/J51OOH4p1uMjs9DakuS5+cdq+ESCmHDEL3gSqppZe8ef+hqXi42V+oAj2rTUrH7f3twTIX+kRlFdAR4t7EG4c73jiWpfczF2SYYaQURXZI7Uhn4P6zeIY7do0oJMBNwLetZdTtZmlPXeOcUEArNEFRzvwPM6Ri7S/XMUgcTk09vnvY4FkUGBJ5ZX3qpp+aCUDGk5i+boRE0ZNxp1kxLLVkhAbByLxjU77VsS3qZ9zMovhCCVywQakcHe8VVW0aD8glCrV/mA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8C8cpBzUcFt5evsTHQ6Quj/84YhqNSslkmID09K5b+M=; b=CFUJV+PWc6G6g3Dr3lpvUFrVyaoBdtXRCVK46VArA48pX2SmdvgEF+jukAbzUcCCxzR+U03tQhjcjPAfvulhgMjSZROcwLBhc+6+Fc9IUhMnu+/QdxadKuDzlzJbL8yfCG+P375CzOniweKdTauiODloJ+Qoppi4l7N0KjIwKCvSM8uYGl3oFDlHlIRd/SOYgGcIEvogZwhu8JJBSzmGtSPSsIApPpEo9Rfyxtp+KzSpv2wY535kjL9K3M7zi80d9SYhMsx5ApYDf0S6kcLm5tCvfrJmssr+adsnW5tyaFQEt+x2bscuhU8uvLJ1NKAjBknopveGptR56lSRjoV3cg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=chromium.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8C8cpBzUcFt5evsTHQ6Quj/84YhqNSslkmID09K5b+M=; b=VygyBWC5OkQCCYZjD4YaseC/4yuVKsdau0w8FjL7629Yrp3ki1GKuhAYGE4IXIKSUKSHL9uDPMdZK3rJBVeHh6zq0NiGzJ6Wc9LZXhXnGczY+flyqsdJl6SOTpxycKDhULWkBmNeWB7yDxMCxxB1jQ0lfIdpDFT0ZHS2pmUC384= Received: from MW4P221CA0016.NAMP221.PROD.OUTLOOK.COM (2603:10b6:303:8b::21) by BL0PR12MB4995.namprd12.prod.outlook.com (2603:10b6:208:1c7::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.14; Thu, 7 Jul 2022 08:47:22 +0000 Received: from CO1NAM11FT059.eop-nam11.prod.protection.outlook.com (2603:10b6:303:8b:cafe::1f) by MW4P221CA0016.outlook.office365.com (2603:10b6:303:8b::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.15 via Frontend Transport; Thu, 7 Jul 2022 08:47:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT059.mail.protection.outlook.com (10.13.174.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5417.15 via Frontend Transport; Thu, 7 Jul 2022 08:47:21 +0000 Received: from localhost (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Thu, 7 Jul 2022 03:47:19 -0500 From: Michal Simek To: Simon Glass , , CC: Alexandru Gagniuc , Jan Kiszka , Leo , Marek Vasut , Peter Hoyes , Rick Chen , Tom Rini Subject: [PATCH] arm: riscv: Remove additional ifdef from code guarded by CONFIG_IS_ENABLED Date: Thu, 7 Jul 2022 10:47:16 +0200 Message-ID: X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 72a9d9c8-1952-43db-c7f0-08da5ff54e71 X-MS-TrafficTypeDiagnostic: BL0PR12MB4995:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vS4UpKo4acETI+nJF3KGU8kdme7wFWwwcWCswoSbTaDtSjza8OFZ/IdkAPc7hx+U0JzhkE/NlnH2MCksNyCTDmh2DQDwik0xD8r/EhapFeBx1YI7ViX12yvFgfF3zsry5x7sseTPL6v1p31/mQ+OKdDkkJTu4gvwtjO4nwt8V87lFNW+Gr7xCP9Y3a3TWq971lwTG0R1WGb92stWjFOd6B855WpRmpsT4CyCuh7hEEzQ1krpJ5vH9p3zP1tfpb3aYizAaPiorLgToPdBs3pcJ/Fmn07uF+sIQi2JqKQSFkdpliBelQGNv9tMAthtooajT/xZv4nFlJwt2sA5acwuw5BOofoEQrCx8V/QY1lNFzNZIFzgbbWKhwayxw9LjS7NljjT4laspand2DpQEbRe+uSmKh2HOeZUtAL6/nTE1t8clybIlB088La1kfo9sDEMsgAvFc65H4mX2stXp4/bRPmAMtXqK67CLBI9ax5rpKOIUPohzo9fNYBG5IGafo2ZwVrjBlqEGa5QlRVDK3/au0Y1VAowTSzRI4JXu2wWrFBHwVBm/tO1sKrPSH+qIcmcd3hIlIlYcKnadBQIY1hv+kdtdSJvxRtS8cByzRJh2tm6gC5+9kQtlosIjaqOq4JslxHNB/Rorpsj9+eJK4HCLa1yiG96BVfr48zy5A7vf4W5BtpLnsukme26PLjPbc/2aPIAz+CtB5K8NumxDTQXnGS7yT/iWUtNg7GbspgUEG/vt1CdA5QdGGVv6DiOYP42EmLYw7FEgLm6fF5+PC9x101n/nJypOc42le1YE0kY7X0jxGxWoMgvaqnROPBKaLi7wfwSTWr4M463KEXRQDBiZkX+af36fhZMOXNVI8BOaZwDXpA5xtwHm/OLWe+siQi X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230016)(4636009)(136003)(396003)(376002)(346002)(39860400002)(40470700004)(36840700001)(46966006)(47076005)(8676002)(186003)(16526019)(4326008)(82310400005)(2616005)(426003)(336012)(2906002)(82740400003)(81166007)(70206006)(36756003)(70586007)(316002)(41300700001)(356005)(44832011)(40460700003)(40480700001)(83380400001)(110136005)(6666004)(478600001)(54906003)(5660300002)(34020700004)(86362001)(36860700001)(8936002)(26005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jul 2022 08:47:21.2177 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 72a9d9c8-1952-43db-c7f0-08da5ff54e71 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT059.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB4995 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.6 at phobos.denx.de X-Virus-Status: Clean CONFIG_OF_LIBFDT is used twice for guarding the same code. It is enough to do it once that's why remove additional ifdefs from arm and risc-v code. Fixes: 0c303f9a6628 ("image: Drop IMAGE_ENABLE_OF_LIBFDT") Signed-off-by: Michal Simek --- arch/arm/lib/bootm.c | 2 -- arch/riscv/lib/bootm.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index a59a5e6c0ea0..fc22befeac1f 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -200,12 +200,10 @@ static void boot_prep_linux(bootm_headers_t *images) char *commandline = env_get("bootargs"); if (CONFIG_IS_ENABLED(OF_LIBFDT) && images->ft_len) { -#ifdef CONFIG_OF_LIBFDT debug("using: FDT\n"); if (image_setup_linux(images)) { panic("FDT creation failed!"); } -#endif } else if (BOOTM_ENABLE_TAGS) { debug("using: ATAGS\n"); setup_start_tag(gd->bd); diff --git a/arch/riscv/lib/bootm.c b/arch/riscv/lib/bootm.c index 2e1e286c8ef6..c1ac339283a6 100644 --- a/arch/riscv/lib/bootm.c +++ b/arch/riscv/lib/bootm.c @@ -65,13 +65,11 @@ static void announce_and_cleanup(int fake) static void boot_prep_linux(bootm_headers_t *images) { if (CONFIG_IS_ENABLED(OF_LIBFDT) && images->ft_len) { -#ifdef CONFIG_OF_LIBFDT debug("using: FDT\n"); if (image_setup_linux(images)) { printf("FDT creation failed! hanging..."); hang(); } -#endif } else { printf("Device tree not found or missing FDT support\n"); hang(); -- 2.36.1