From patchwork Sun Jul 21 17:59:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Auer X-Patchwork-Id: 1134548 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 45sCHM2MGxz9sDQ for ; Mon, 22 Jul 2019 04:01:48 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 60080C21E38; Sun, 21 Jul 2019 18:01:44 +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 F2876C21D4A; Sun, 21 Jul 2019 18:00:58 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7A63CC21D4A; Sun, 21 Jul 2019 18:00:57 +0000 (UTC) Received: from mail-edgeKA24.fraunhofer.de (mail-edgeka24.fraunhofer.de [153.96.1.24]) by lists.denx.de (Postfix) with ESMTPS id A1C76C21C27 for ; Sun, 21 Jul 2019 18:00:53 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2EKAAB5pzRd/xmnZsBmGgEBAQEBAgEBAQEHAgEBAQGBUwUBAQEBCwGCFoE/AR88jDlfiRiVb4UegXsJAQEBAQEBAQEBCC8BAYRAAoJTIzQJDgEDAQEFAQEBAQYCAmmFKoVMBicLAUYQUT0aBg4FgyKCC6o/M4hugUgJAYEqAYcHhFeBVz+EYYURhRYEjBiCLYdalEQHAoE5Yl0Ekx8MG4ItiwUsiiwtpQCBUDmBWDMaJIM7gk4XjiM9ATIBj1QBAQ X-IPAS-Result: A2EKAAB5pzRd/xmnZsBmGgEBAQEBAgEBAQEHAgEBAQGBUwUBAQEBCwGCFoE/AR88jDlfiRiVb4UegXsJAQEBAQEBAQEBCC8BAYRAAoJTIzQJDgEDAQEFAQEBAQYCAmmFKoVMBicLAUYQUT0aBg4FgyKCC6o/M4hugUgJAYEqAYcHhFeBVz+EYYURhRYEjBiCLYdalEQHAoE5Yl0Ekx8MG4ItiwUsiiwtpQCBUDmBWDMaJIM7gk4XjiM9ATIBj1QBAQ X-IronPort-AV: E=Sophos;i="5.64,291,1559512800"; d="scan'208";a="16085674" Received: from mail-mtadd25.fraunhofer.de ([192.102.167.25]) by mail-edgeKA24.fraunhofer.de with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Jul 2019 20:00:53 +0200 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0AFAADrpjRdfRBhWMBmGgEBAQEBAgEBAQEHAgEBAQGBUwUBAQEBCwGDVSA8jDlfnwiFHoF7CQEDAQEBAQEILwEBhEACgnU0CQ4BAwEBBAEBAgEGFAEBFjqFMYVLAwMnCwFGEFE9GgYOBYMigguqQDOIboFICQGBKgGHB4YuP4RhhRGFFgSMGIIth1qURAcCgTliXQSTHwwbgi2LBSyKLC2lAIFQN4FZMxokgzuCTheOIz0DMAGPVAEB X-IronPort-AV: E=Sophos;i="5.64,291,1559512800"; d="scan'208";a="52897832" Received: from fgdemucivp01ltm.xch.fraunhofer.de (HELO FGDEMUCIMP11EXC.ads.fraunhofer.de) ([192.88.97.16]) by mail-mtaDD25.fraunhofer.de with ESMTP/TLS/AES256-SHA; 21 Jul 2019 20:00:51 +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; Sun, 21 Jul 2019 20:00:50 +0200 From: Lukas Auer To: Date: Sun, 21 Jul 2019 19:59:53 +0200 Message-ID: <20190721180002.26993-2-lukas.auer@aisec.fraunhofer.de> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190721180002.26993-1-lukas.auer@aisec.fraunhofer.de> References: <20190721180002.26993-1-lukas.auer@aisec.fraunhofer.de> MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-11.0.0.4179-8.200.1013-24780.003 X-TM-AS-Result: No--2.512900-8.000000-31 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No Cc: Alistair Francis Subject: [U-Boot] [RFC PATCH 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 --- 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 3ee786b579..569ffd5987 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1533,16 +1533,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)