From patchwork Mon Oct 11 21:00:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilias Apalodimas X-Patchwork-Id: 515626 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp4821492ime; Mon, 11 Oct 2021 14:00:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwMZ38116lnrj4PARQa3oJb4/ROSPbiDEv0B1MBFG1hg9rwylwgXCZjtJl85QN916m+3BBD X-Received: by 2002:a17:906:bfe3:: with SMTP id vr3mr28123954ejb.339.1633986046963; Mon, 11 Oct 2021 14:00:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633986046; cv=none; d=google.com; s=arc-20160816; b=rJvyWUkbilcNLgm3om2vk/+6ja7Y6o5UpJlPNUNlVmE5RGPnLhf+3PxPtuDI3WtrCP fUgvIuXFxqwqS+qA2Vhu8cZNR3Ks0b11+J1gyyabt022xd2W5yN6MqcDOoOlVAiYNuEg Lz1WNkzTxNzLbiFKNHhwhO4iC0FFG619y2EgPrC9b1m7W6v/8B0VlW8dZnmD5Epw8McB XESnN2gCAPTF4nyY5aJEfQNDUkf1Jzummx7o0PyeKvZAcF2S0aQSGkwq3ROIOfbpLxBJ l9BvWyamcAAulrguPL9xb2rjpeWy/iJweR4OQI6/c0EHHyenilex4HY1jkI7RjOt9lI8 TKbA== 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=Y6+3ae0kKNZY/k5O4cThUgVClCYseqAQIDCidzcU8GY=; b=u1H0dfmL7fiaGZ68pIwpEYHzJKeaRomIqYLsGms0hBxHXljMrAf1IkkqwkIAw06LQp tZSNvm/LPhSLSpvw70F9m7sQbBMs5yF5wMgOdlNzKIm1kVIlvPxGvd1W/4Ah+sEtfQwq KBHQPIezRy/bOxJAgWwY6R/GxxGz0W5kvh1MbQ/HjwsNiBZ83Hy6GJDFs1apL9EdG3d0 i7+FS49S3K5yPnM4esWWLEPfhvW4EM1XDkUJt2i6/6/zjIY1KgVhP165WtoZTKiywySa BrMx59m1Q4j2LVORMpAkTmJLMi8Lr2rH/smPcQAK4lPt/eBzUeXFOsTYSuvrDWH5HhNu KWtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=meErCXLp; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 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. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id kx3si15686742ejc.108.2021.10.11.14.00.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Oct 2021 14:00:46 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=meErCXLp; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 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 0D93C83709; Mon, 11 Oct 2021 23:00:40 +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="meErCXLp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 13E4283465; Mon, 11 Oct 2021 23:00:33 +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-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) (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 4372883143 for ; Mon, 11 Oct 2021 23:00:27 +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-x533.google.com with SMTP id d9so48634212edh.5 for ; Mon, 11 Oct 2021 14:00:27 -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=Y6+3ae0kKNZY/k5O4cThUgVClCYseqAQIDCidzcU8GY=; b=meErCXLp1nBgVeQzwwuzfNdxLTd1ou+SBIuVHRJZ1HhPNZj2tA5dHPBT5awkiXIFaD ay7gEeekvf5e/xe5bJdiJnkVgqQCC7rNXeszj73PnsO4WkuUpvJINtPc3NZOh/hf1yvE 0B+poipgyALehqLLr/W7CTJe0hx7OIQG3/7BGHQvVcQqc/r41mLWUW0jOIOa0L8hw3zo LtyG+iExmP/dLPfMRn5EXQuras9mv260fpuyDfam/61QxuHCJoExzcPYGjxXr5BhLYuh 6ROHI14dNx5jwuzGQ3s3WV/rcTiVtSH+cD6f6Izp48MQIVcCJ3xMyhI32K8jmENq9BIK mJRQ== 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=Y6+3ae0kKNZY/k5O4cThUgVClCYseqAQIDCidzcU8GY=; b=BkXqiPU1FYWehiL/HUzcheyuSLATh1ZRb3hDeMm6tzpCr88pN/I7EhMhLthmuD+vgj dPW6Tl8ju6KL1vOPldrCe6+mdfpd0DVVwlTHbjAC9Kn5Cpm3vB66iIcVQFOcfsC9d7/n RruKCvhMWcgUK9V9m06K4bPm3GS5YJTgvSn8uBnMYW8GTdqlgxFrhZP3SuOSnYjnqz+C XhET8byBEZjcWrCD/MKMOjj3kLRalzc/vXSdOSbsP4wPda0yHPE9bmCJOrVkpjeMHZoi QWgZ3tqzzzuZTpkTlB2alcRY3zshNcyCYkaFVNH8Sw7clNMrvCHQ0YSwWo06HlHs9V9Y ohDw== X-Gm-Message-State: AOAM530YhPRHUmigg8xJarmFMDxVK3SXV7DSiAVewueP+Jdhf//skXwX jxmy8OEmo2a58NhMdZF+krSmMQ== X-Received: by 2002:a05:6402:1e88:: with SMTP id f8mr36739890edf.247.1633986026900; Mon, 11 Oct 2021 14:00:26 -0700 (PDT) Received: from apalos.home ([2a02:587:468e:477f:2e56:dcff:fe9a:8f06]) by smtp.gmail.com with ESMTPSA id h18sm3987233ejt.29.2021.10.11.14.00.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Oct 2021 14:00:26 -0700 (PDT) From: Ilias Apalodimas To: sjg@chromium.org Cc: Ilias Apalodimas , Bharat Gooty , Rayagonda Kokatanur , Rick Chen , Leo , Thomas Fitzsimmons , Bin Meng , =?utf-8?q?Marek_Beh=C3=BAn?= , Green Wan , Brad Kim , Heinrich Schuchardt , David Abdurachmanov , Dimitri John Ledkov , u-boot@lists.denx.de Subject: [PATCH 2/3] board: arm: Remove OF_PRIOR_STAGE from the remaining Arm boards Date: Tue, 12 Oct 2021 00:00:14 +0300 Message-Id: <20211011210016.135929-2-ilias.apalodimas@linaro.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211011210016.135929-1-ilias.apalodimas@linaro.org> References: <20211011210016.135929-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 --- 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