From patchwork Mon Sep 27 06:47:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilias Apalodimas X-Patchwork-Id: 514660 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp3839963jao; Sun, 26 Sep 2021 23:48:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw8q2S00R5gifc8BBZc+diJ7Sw1mBfRLnIVvm53OdJPhD3D4qmfoDPtDvSkEk4uTAfgzU9P X-Received: by 2002:a17:906:8a41:: with SMTP id gx1mr26421692ejc.507.1632725311636; Sun, 26 Sep 2021 23:48:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632725311; cv=none; d=google.com; s=arc-20160816; b=Z6UGmkgoHA8EGEeV84uw94gNA19IiQL4ND3WZYHZ/26u71pg31KTrUKlJ8c3wuMPRf GZ9sY0OSDvUWn+gCwGrR2UkjRRbCcOfYCXx0STqFaIiXSJehsziWUlxFmbvM8bKmKVDQ wQJWJMCR3utDZBzw6q6kcLc8jaLnYfjpusKw01w3/IQyITnkGukJ/WE7EHDpYxG+80/m mXfJg1KuCwz2kJdU2v05ZOWC936kA7zGzSlX0P/U3utWfWrC/5g6r4+HddO3oh7I10vt 0PzuKQAtIGG4V+m5NSgzUTP08cvLWfro0WG1w5u4dW1O2OBbjLFwm5nV6uF7cRpNdf3Z EWBA== 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=83usUrQjmZxne/CWTarHpix9cEZnc17PgtJJGxyVz64=; b=Ke2BIWRca/gs3cu1BAUFHxrTyli9gDGSGjpUEZ2uAluhDf2l9+4T4Q2A51Sp9O4f4Q PWnnr6Bjp1sJXHevYmGJZfD1BUg6iuznmV0oE4Ip58Q2UMg20Sd4xl5xfzDDPGfaXlRG pvg1w+WbVzSXW07uzQfEo9fyCRDBKdo/2E7KFy4DEfv1f9x9xrRz4BfMejZzHndoNqFB Ce1UgqFMo/IGZ2Wxh/ANBWTlkv3ZFO5zqnhiWTTHP1AWkYve5D7ZxV/p/Lciv4zkn4ZG yezCbyzXJCzucQZACLsavc+ETPnQx4Zi6nh8Ww1BzGfwoCeQk0UdCgvknz4IMaH89gvY RNTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RVuk3bOi; 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 h9si13689181edb.422.2021.09.26.23.48.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 23:48:31 -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=RVuk3bOi; 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 75AC483605; Mon, 27 Sep 2021 08:48:24 +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="RVuk3bOi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 58D9E8348D; Mon, 27 Sep 2021 08:48:17 +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-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) (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 BA4598348D for ; Mon, 27 Sep 2021 08:48:12 +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-x52d.google.com with SMTP id ee50so64964091edb.13 for ; Sun, 26 Sep 2021 23:48:12 -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=83usUrQjmZxne/CWTarHpix9cEZnc17PgtJJGxyVz64=; b=RVuk3bOijD4GeLxLSVD1K0GMxnbOLUTU6xldtnIvjQ95q18GmS65yAc8nw3ytwYFgO BuqYWqHnjCPAYY51RpParcjvHYYT7nZKrA563483TK00g5CgsRyImLHmNFmdjs4eEFlO s/Sjz7XRfJMYDB0zZW3HtQuQQmzp7eG399kEPPUb6yU2fhRUB1yf//5qsbl1Y+w5T/tm jgxnBnLdPhWFddcOOKd47RD0T5DIJ2MGMQ4tgCew+BRKwfP+QZIVLwHR/+aTNbKrWLDy ranOfpEwe3u0D3oSq26xOd0/hktfhvTZ3SZGbeOsYjcKhRPzcHVfUryoa9BUVeL08ypo fb5g== 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=83usUrQjmZxne/CWTarHpix9cEZnc17PgtJJGxyVz64=; b=VJ0HUgif+nk2kXCT7Z9UzmhQ7TOpRtO9qIMGlUX7B63y2gLwd1yMmrjr5Za4LnU3Yf kInDJb8Nc19jcvslMqnm3BjkN6PFiSlm/ZVLGaPLJ2pns+d8aVK4riNBg/qzoe3adZb0 /wAHrSHOPuLWjws3Nimp/Xxp01KZc9Lo9IIN1s3GcILlPNl7w0/MMxVgN8+dtgX+E/MH K72NNQRgL8qs5N8LQmOsNfWCcRkdJr9+onJrp4Wyy/Qz+NQsvD8K3dkcee72BHsc1gvE JkQOlwbih5ZRdnai72fX+5CKjm83zzwq8PDz6HwtCMQQCbgFQnikGq2UmoDCHmz1WyeI hDpQ== X-Gm-Message-State: AOAM530eWU9vM+HD+g+pXpgAUVh8Sedem7mbUPPGDu8+3RP8lPcBISIe ik02Nq0gsNptLhnz9rKar/d0XQ== X-Received: by 2002:a17:906:2505:: with SMTP id i5mr25313020ejb.450.1632725292398; Sun, 26 Sep 2021 23:48:12 -0700 (PDT) Received: from apalos.home ([2a02:587:4672:866:2e56:dcff:fe9a:8f06]) by smtp.gmail.com with ESMTPSA id dm8sm9948398edb.90.2021.09.26.23.48.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 23:48:12 -0700 (PDT) From: Ilias Apalodimas To: trini@konsulko.com Cc: mark.kettenis@xs4all.nl, Ilias Apalodimas , Bharat Gooty , Rayagonda Kokatanur , Rick Chen , Leo , Thomas Fitzsimmons , Simon Glass , Bin Meng , Sean Anderson , Green Wan , =?utf-8?q?Marek_Beh=C3=BAn?= , Brad Kim , Zong Li , Heinrich Schuchardt , David Abdurachmanov , Dimitri John Ledkov , u-boot@lists.denx.de Subject: [PATCH 2/3] board: arm: Remove OF_PRIOR_STAGE Date: Mon, 27 Sep 2021 09:47:47 +0300 Message-Id: <20210927064751.78591-2-ilias.apalodimas@linaro.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210927064751.78591-1-ilias.apalodimas@linaro.org> References: <20210927064751.78591-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 --- 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 Reviewed-by: Simon Glass 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