From patchwork Wed Aug 21 19:14:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Auer X-Patchwork-Id: 1151126 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=aisec.fraunhofer.de Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46DHRp4Dd5z9s7T for ; Thu, 22 Aug 2019 05:15:17 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 8385FC2200D; Wed, 21 Aug 2019 19:15:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 97529C21FBA; Wed, 21 Aug 2019 19:15:08 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7BFB0C21FBA; Wed, 21 Aug 2019 19:15:06 +0000 (UTC) Received: from mail-edgeS23.fraunhofer.de (mail-edges23.fraunhofer.de [153.97.7.23]) by lists.denx.de (Postfix) with ESMTPS id 134B3C21E0B for ; Wed, 21 Aug 2019 19:15:06 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2EiAAB4l11d/xoHYZlkGwEBAQEDAQEBBwMBAQGBVAUBAQELAYIXgT8gPI0bhgKLbYoShSOBewkBAQEBAQEBAQEILwEBhD8Cgl0jNQgOAgUBAQUBAQEBAQYEAgJphScMhUwGJwsBRhBRIRwaBg4FgyKBawMcAawdM4ggDWGBSQkBgSoBhxSEWYFYP4RhghqCd4UWBIwzgi+Hb5REQAcCgTplXwSPXYNtDBuCMYscLIpNLZcLjlmBUgE2gVgzGiSDO4JOF4NIilw9ATIBjUUBAQ X-IPAS-Result: A2EiAAB4l11d/xoHYZlkGwEBAQEDAQEBBwMBAQGBVAUBAQELAYIXgT8gPI0bhgKLbYoShSOBewkBAQEBAQEBAQEILwEBhD8Cgl0jNQgOAgUBAQUBAQEBAQYEAgJphScMhUwGJwsBRhBRIRwaBg4FgyKBawMcAawdM4ggDWGBSQkBgSoBhxSEWYFYP4RhghqCd4UWBIwzgi+Hb5REQAcCgTplXwSPXYNtDBuCMYscLIpNLZcLjlmBUgE2gVgzGiSDO4JOF4NIilw9ATIBjUUBAQ X-IronPort-AV: E=Sophos;i="5.64,412,1559512800"; d="scan'208";a="12659888" Received: from mail-mtas26.fraunhofer.de ([153.97.7.26]) by mail-edgeS23.fraunhofer.de with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Aug 2019 21:15:05 +0200 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0AeAAB4l11dfRBhWMBkGwEBAQEDAQEBBwMBAQGBVAUBAQELAYNWIDyNG5FvihKFI4F7CQEDAQEBAQEILwEBhD8Cgn81CA4CBQEBBAEBAQIBBgQUAQEWOoUuDIVLAwMnCwFGEFEhHBoGDgWDIoFrAx2sHTOIIA1hgUkJAYEqAYcUhjE/hGGCGoJ3hRYEjDOCL4dvlERABwKBOmVfBI9dg20MG4Ixixwsik0tlwuOWYFSATSBWTMaJIM7gk4Xg0iKXD0DMAGNRQEB X-IronPort-AV: E=Sophos;i="5.64,412,1559512800"; d="scan'208";a="86123319" Received: from fgdemucivp01ltm.xch.fraunhofer.de (HELO FGDEMUCIMP11EXC.ads.fraunhofer.de) ([192.88.97.16]) by mail-mtaS26.fraunhofer.de with ESMTP/TLS/AES256-SHA; 21 Aug 2019 21:15:05 +0200 Received: from localhost.de (10.80.233.50) by FGDEMUCIMP11EXC.ads.fraunhofer.de (10.80.232.42) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 21 Aug 2019 21:15:04 +0200 From: Lukas Auer To: Date: Wed, 21 Aug 2019 21:14:40 +0200 Message-ID: <20190821191450.14507-2-lukas.auer@aisec.fraunhofer.de> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190821191450.14507-1-lukas.auer@aisec.fraunhofer.de> References: <20190821191450.14507-1-lukas.auer@aisec.fraunhofer.de> MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-11.0.0.4179-8.200.1013-24858.003 X-TM-AS-Result: No--1.046500-8.000000-31 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No Cc: Alistair Francis Subject: [U-Boot] [RESEND PATCH v4 01/11] fdtdec: make CONFIG_OF_PRIOR_STAGE available in SPL X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" The current preprocessor logic prevents CONFIG_OF_PRIOR_STAGE from being used in U-Boot SPL. Change the logic to also make it available in U-Boot SPL. Signed-off-by: Lukas Auer Reviewed-by: Bin Meng Tested-by: Bin Meng Reviewed-by: Anup Patel --- Changes in v4: None Changes in v3: None Changes in v2: None include/fdtdec.h | 2 +- lib/fdtdec.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/fdtdec.h b/include/fdtdec.h index e6c22dd5cd..635f53083b 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -54,7 +54,7 @@ struct bd_info; #define SPL_BUILD 0 #endif -#if CONFIG_IS_ENABLED(OF_PRIOR_STAGE) +#ifdef CONFIG_OF_PRIOR_STAGE extern phys_addr_t prior_stage_fdt_address; #endif diff --git a/lib/fdtdec.c b/lib/fdtdec.c index ef5e54875c..74525c84e7 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1535,16 +1535,14 @@ int fdtdec_setup(void) puts("Failed to read control FDT\n"); return -1; } +# elif defined(CONFIG_OF_PRIOR_STAGE) + gd->fdt_blob = (void *)prior_stage_fdt_address; # endif # ifndef CONFIG_SPL_BUILD /* Allow the early environment to override the fdt address */ -# if CONFIG_IS_ENABLED(OF_PRIOR_STAGE) - gd->fdt_blob = (void *)prior_stage_fdt_address; -# else gd->fdt_blob = map_sysmem (env_get_ulong("fdtcontroladdr", 16, (unsigned long)map_to_sysmem(gd->fdt_blob)), 0); -# endif # endif # if CONFIG_IS_ENABLED(MULTI_DTB_FIT)