From patchwork Thu Sep 30 07:17:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilias Apalodimas X-Patchwork-Id: 514881 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:4087:0:0:0:0 with SMTP id m7csp803168jam; Thu, 30 Sep 2021 00:18:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwmPxEGWDa5onhM0HnUk2qXxBz025/HmQ7qXbvvc8NKpETP/g1oMgFOgXXcHLq8B5tT5Mol X-Received: by 2002:aa7:d491:: with SMTP id b17mr5452104edr.210.1632986310144; Thu, 30 Sep 2021 00:18:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632986310; cv=none; d=google.com; s=arc-20160816; b=YMbQDmsGBDZMgd8edYq7c9v1Iq+S/B5wtr7DCZs1swCmMwtdl2e0jcBQR2BwD2UvE4 wTajVy0BKa4alVmL1+x16ZM9pFqQWnWSpemkNLp8fvPsIAEfKBNvyOIBRGLfeSLUfxxy 041qX3bPbD9wgIbAHg1xt+1KYCBbRzKaDTnZxveViNli51hhZCw2u4VPlcLex9AR6odD 4scqqOwQ8xR/fHoQ5+yUdvj4mfQrSP82UwLt8vA2JldsHRGuzi8Gn60WniqRb82VGEdL Va95gIHieeerdFIeQv+MRxZ9qTCnuYD5qFhFN4paZM1zOwZrS+MmZBIfeir+b1qK9qva EWsQ== 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=Jk2fZnW569wAjMZyjs6qiFYZ0KNYw0fIp4nKLplbjFs=; b=VCmDrm84Th2VAkDj3jkP0580sgebwlhaZ0LxTvwDdODDOisOAnMTntA8scbC3m0yVG migLxtfaUMj+pmWn9OVvcXQrvtWBiR08lp2SSkt27gyijlP/LIjhzjw3NqtZgfDGz46f TFQTS9BhioSoCOAnL0xIXSPYOi3DYXJuBIutjyH6S8IdU7sEDc255VZjo5elzFwVU/CZ nJim/M3ERqL4jjxVRX9F3DvuEeYeHdLftEAQIHhduuaoDzlw5zdeHWd7aiCGbY8aienN ciMewHDJgBY7G4TZGlXEoyqbt0nZgPv6gRWbMZrNyAUIccCEOJAiPh0HXQzAXo8xqI6x 73uA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fWVNvNuh; 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 m15si2546167ejl.105.2021.09.30.00.18.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Sep 2021 00:18:30 -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=fWVNvNuh; 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 6F833812BC; Thu, 30 Sep 2021 09:18:28 +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="fWVNvNuh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7C11B812C0; Thu, 30 Sep 2021 09:18:18 +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-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) (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 5AB2D815A8 for ; Thu, 30 Sep 2021 09:18:10 +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-x529.google.com with SMTP id b26so18561893edt.0 for ; Thu, 30 Sep 2021 00:18:10 -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=Jk2fZnW569wAjMZyjs6qiFYZ0KNYw0fIp4nKLplbjFs=; b=fWVNvNuhfziA/1X/0tk9zaizOEs8FFC8QK2DvmPZlF2FqiTM6eg6XcbBgHfywz9Ns0 Oqveksx4qQRAENGE/jF13i9v6dCAdncA2qsjqlKn66M+3C69MLUimz9X/eL55ahxK4e9 K4604v7JdDBj6JGCQoxmIzP5XBDm69LTxGxO/neDdYEPrFmjhvg/DLABsGGRdX9zAgp7 br388pW4jqRbBVnSkfcV9FtYYl4Pjtwv7kUpie/7JgfDkPnb61I4yr6S8UaoBXUkRPdh CfOAFBq7KW5Fa6p4ohEAv8JNQC2T2yS/AGvfKvZXR2ob9UH3qZLVHqYfX8YAMEfLucAH yPSw== 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=Jk2fZnW569wAjMZyjs6qiFYZ0KNYw0fIp4nKLplbjFs=; b=ErxtyiyPcIvlPXYvjrjroMuekhqTS9PkyruWHEnwrjQ58omxRZuieMCjX+hESm8v9C YCJKGRUr37keo9mjAxDk9s+IoUh4vDVxu8JEHUDJ/hvVJ4KWdDZGVIOcNjSwQne51lSE Wwwcn1d83+k0vyuhfaYVQNN+59GJHFR6TvVlbiuYVs68bZJKdZT+Igsiu4REgTa9VnHE SVG8A2zi4/5Nzna2lCFYpRuTM5Rtd5x7LbzB4s0pI+OdNH1jknHmp+qeVW57P03mVtIw Fj/5eGWcody4dfmpsLIzGPwh8v8TVkMDOc8Iuhvii8bRP+Cnla8U/k4SJCwOv4Tt5y7X +xAw== X-Gm-Message-State: AOAM533Ok7YC5e96gjckKnnWGxObkr/UKgn4VxB9rFRnb/eWbQPY3VaL irfFykUKVKA0fIkOt4K9US0P2W+3qcXfqP5H X-Received: by 2002:a05:6402:493:: with SMTP id k19mr5252193edv.386.1632986289293; Thu, 30 Sep 2021 00:18:09 -0700 (PDT) Received: from apalos.home ([2a02:587:4672:866:2e56:dcff:fe9a:8f06]) by smtp.gmail.com with ESMTPSA id dj8sm1005173edb.53.2021.09.30.00.18.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Sep 2021 00:18:08 -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 , Dimitri John Ledkov , David Abdurachmanov , u-boot@lists.denx.de Subject: [PATCH 2/3 v3] board: arm: Remove OF_PRIOR_STAGE from the remaining Arm boards Date: Thu, 30 Sep 2021 10:17:56 +0300 Message-Id: <20210930071800.443059-2-ilias.apalodimas@linaro.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210930071800.443059-1-ilias.apalodimas@linaro.org> References: <20210930071800.443059-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, v2: - 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