From patchwork Thu Sep 30 06:41:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilias Apalodimas X-Patchwork-Id: 514878 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:4087:0:0:0:0 with SMTP id m7csp779441jam; Wed, 29 Sep 2021 23:42:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyP04iL6/MAOhhrcmMdYWaFHkyKnLgll2y3u38NZjBcHV+R0sRJ8oLs5Nr7Uyh/WnqV5G+w X-Received: by 2002:a17:907:784b:: with SMTP id lb11mr4826861ejc.307.1632984134951; Wed, 29 Sep 2021 23:42:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632984134; cv=none; d=google.com; s=arc-20160816; b=LZirnWp59XHsV17ySCW5U5o22XOjJPVvdZDLi33xmjoUOkv/tNVoy+BrppZ4Gt/loi cDwoexkdt6YmNvjexTXQCrOP6sFfknIVInnVhDWa2LjiC91OoDZgk1CWmkROyNAQhz7/ hqkYWSGGRkBNGzxYgJC3fImoK2Rb4j5TZCjvj875C7dziP7rd7V7DfrnBhIM4lK2wNFZ f8BL0rMd5jY2HZIEn2ttMCKo0Opn38Uf4nfgd3Sq3SVdVfia+xGJygiJ5OuY062ezNOA LFjIsZaiWH4ee6N0R3BLQb6Uw6lol2czGqlgdnO2QDmDRsTQ5VzQG2ptRh5+WlIJ4MkI 2nZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=k3mY4SkVTtfiSltzgLiECidvIF2b5b11h2HmzF5AsyY=; b=hoaRZ0uAlShsOXUJLDakg+itXb+JOUD4tfiWNqjT29j5Wr+hpLJHVdd+a0KUdy4ISr 0e4IKEtxZFGbqd7EU8RZZJ5JH+69VfuVhxKh88S+1gjxyE/zY97m0QkIAIMVXz9bufeN nEjTqaxl06Qc9mEVeO9HxYrvCQ4NHX7EdU8lbBDXX9BVA6BSxXWf96XMRTlLjtgF74ak 8/Kjl/moFKGrYb9dq0RweHG3dBPDl0MdAr6mSbk1/wRwjJAg/1TvXJAC+xEkwrunbeFy 8zq+pHDG2Bt+dBDMx+d0m3JfAhf1vjvSdibOELVWsU37xZbcEgdQlYLo1Nshn4GzJulV 1/GA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GTZANX4f; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id b27si2953213ejl.186.2021.09.29.23.42.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Sep 2021 23:42:14 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GTZANX4f; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A776781545; Thu, 30 Sep 2021 08:42:11 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="GTZANX4f"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 92CA381195; Thu, 30 Sep 2021 08:42:03 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 646A580F1A for ; Thu, 30 Sep 2021 08:41:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ilias.apalodimas@linaro.org Received: by mail-ed1-x530.google.com with SMTP id v10so18133950edj.10 for ; Wed, 29 Sep 2021 23:41:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=k3mY4SkVTtfiSltzgLiECidvIF2b5b11h2HmzF5AsyY=; b=GTZANX4fIl+n0iM723cc/LtzWK3rrcAKSHNGDaoCRp7m1i/w27+AbBK3fFJsLzwsJf YemkEvi4QptuEnc1HXCW7tuPCLo/TNgGETH30Vv01GTQlBjvHIul3Q7fOZnxM8NH3oq4 U14Rg3oOZegBMWaUbyM6G6PINAXZjOT0uAVFOnnbvlfMT88dXCygZHWqKL2Od/uOON/1 3VY6xY5QwEzOaL610bYjG5o3iMyiUSXMhGiFkjPF6hxRQrbl9m7u7h/+EpIJocgBYF7Y zJ5+kfe7spPq8CXtNvllV0nUPKeGRy0di4WM5jgqTnHqtfO7Wr4C0hnE7nFxVilJ9SUU HXxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=k3mY4SkVTtfiSltzgLiECidvIF2b5b11h2HmzF5AsyY=; b=hF8+0xuDorFy7sZom/VH5X8Qke6FISRYJbDMpG6DnkA9IBisd9KR5z+f6HwRXE4mP/ +KtPEHHggfoDSCvr7+pxZAWyUkIRSqXq5trzsurKj2qwwD/s+E5klLnibSkfEO6Z8rFa KlLGa2tLsmFg6d3uhj1BTJ0lhyKwacBnJqQHKaEbGLY0RSLhKfmDma1NU7VXCDoWzHLp xkFh0Mrj/09qgmX7/Zwbs/7l1/VD0KD4QOu7yyjnEhGCZ+Nd7ou+wiaCkupLU/DLjeEa xkIzxylFogxdX+r/wckLGPbyqLSdrngWhh5ko/mymx2WwDspVGArlAlk13N0P+cziKyy K9JA== X-Gm-Message-State: AOAM533jcx8XMYTFxujhVJeZS2p2prB1Uoy2pRchND00J7ZVafQwV5FD xdkVeftboXlOyASNJ4m/u9LPCg== X-Received: by 2002:a50:bf49:: with SMTP id g9mr5294380edk.262.1632984118984; Wed, 29 Sep 2021 23:41:58 -0700 (PDT) Received: from apalos.home ([2a02:587:4672:866:2e56:dcff:fe9a:8f06]) by smtp.gmail.com with ESMTPSA id d7sm438991ejt.13.2021.09.29.23.41.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Sep 2021 23:41:58 -0700 (PDT) From: Ilias Apalodimas To: trini@konsulko.com Cc: mark.kettenis@xs4all.nl, Ilias Apalodimas , Simon Glass , Bharat Gooty , Rayagonda Kokatanur , Rick Chen , Leo , Thomas Fitzsimmons , Bin Meng , =?utf-8?q?Marek?= =?utf-8?q?_Beh=C3=BAn?= , Green Wan , Lukas Auer , Brad Kim , Heinrich Schuchardt , David Abdurachmanov , Dimitri John Ledkov , u-boot@lists.denx.de Subject: [PATCH 2/3 v2] board: arm: Remove OF_PRIOR_STAGE from the remaining Arm boards Date: Thu, 30 Sep 2021 09:41:40 +0300 Message-Id: <20210930064143.432963-2-ilias.apalodimas@linaro.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210930064143.432963-1-ilias.apalodimas@linaro.org> References: <20210930064143.432963-1-ilias.apalodimas@linaro.org> MIME-Version: 1.0 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.103.2 at phobos.denx.de X-Virus-Status: Clean At some point back in 2018 prior_stage_fdt_address and OF_PRIOR_STAGE got introduced, in order to support a DTB handed over by an earlier stage boo loader. However we have another option in the Kconfig (OF_BOARD) which has identical semantics. So let's remove the option in an effort to simplify U-Boot's config and DTB management, and use OF_BOARD instead. Signed-off-by: Ilias Apalodimas Reviewed-by: Simon Glass --- Changes since v1: - none arch/arm/Kconfig | 1 - board/broadcom/bcmstb/bcmstb.c | 6 ++++++ configs/bcm7260_defconfig | 2 +- configs/bcm7445_defconfig | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) -- 2.33.0 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b5bd3284cd1c..8bc4391fcb27 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -620,7 +620,6 @@ config ARCH_BCMSTB select DM select GPIO_EXTRA_HEADER select OF_CONTROL - select OF_PRIOR_STAGE imply CMD_DM help This enables support for Broadcom ARM-based set-top box diff --git a/board/broadcom/bcmstb/bcmstb.c b/board/broadcom/bcmstb/bcmstb.c index 076ac9414418..40d9def24b7b 100644 --- a/board/broadcom/bcmstb/bcmstb.c +++ b/board/broadcom/bcmstb/bcmstb.c @@ -135,3 +135,9 @@ int board_late_init(void) return 0; } + +void *board_fdt_blob_setup(void) +{ + /* Stored the DTB address there during our init */ + return (void *)prior_stage_fdt_address; +} diff --git a/configs/bcm7260_defconfig b/configs/bcm7260_defconfig index a42a6acb06d5..be0c945dc811 100644 --- a/configs/bcm7260_defconfig +++ b/configs/bcm7260_defconfig @@ -22,7 +22,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FS_GENERIC=y -CONFIG_OF_PRIOR_STAGE=y +CONFIG_OF_BOARD=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y diff --git a/configs/bcm7445_defconfig b/configs/bcm7445_defconfig index 96e8da0748ae..9ab72dcf37c7 100644 --- a/configs/bcm7445_defconfig +++ b/configs/bcm7445_defconfig @@ -23,7 +23,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FS_GENERIC=y -CONFIG_OF_PRIOR_STAGE=y +CONFIG_OF_BOARD=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y