From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 486FAC4332F for ; Fri, 3 Nov 2023 18:41:01 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8144587263; Fri, 3 Nov 2023 19:40:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="L0cYjKw8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 56E678719E; Fri, 3 Nov 2023 19:38:58 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by phobos.denx.de (Postfix) with ESMTP id 4D1C6871F3 for ; Fri, 3 Nov 2023 19:38:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanedmond@linux.microsoft.com Received: from ovlvm106.redmond.corp.microsoft.com (unknown [131.107.147.185]) by linux.microsoft.com (Postfix) with ESMTPSA id 8963320B74C4; Fri, 3 Nov 2023 11:38:50 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 8963320B74C4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1699036730; bh=My/rJoipM+2LVvaKt8vGBtjYPlc0MgoHQ6cHoHKgQ6Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L0cYjKw8j8ejH2OOow2JVnhbCbT6hcCYBTMq98IIDygKCirjmso4WrA9M2ghRskav tGZBHq86x6z9AYmbEY/SHnFoBuSG3SCRsXkQPGMHMko1kPxztwEBtp7IPKaYUJ0ikq Gc2BWJI3x+Za2XzZZ8R12Hh06feiwAP1mrFbF9FA= From: seanedmond@linux.microsoft.com To: u-boot@lists.denx.de Cc: sjg@chromium.org, dphadke@linux.microsoft.com, ilias.apalodimas@linaro.org, trini@konsulko.com Subject: [PATCH v4 4/5] dm: core: Modify default for OFNODE_MULTI_TREE Date: Fri, 3 Nov 2023 11:38:43 -0700 Message-ID: <20231103183844.2308934-5-seanedmond@linux.microsoft.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231103183844.2308934-1-seanedmond@linux.microsoft.com> References: <20231103183844.2308934-1-seanedmond@linux.microsoft.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean From: Sean Edmond There is a preference to use the "ofnode" API for FDT fixups moving forward. The FDT fixup will usually be for the kernel FDT. To fixup the kernel FDT with the ofnode API, it's required to set the OFNODE_MULTI_TREE option. To ensure existing users of kaslr fdt fixup are not impacted, Let's modify the default value for OFNODE_MULTI_TREE to ensure it's always set if !OF_LIVE. This will cause a 1007 byte increase in the code size. Signed-off-by: Sean Edmond --- drivers/core/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig index fe5c41d57ec..f8f4d429eba 100644 --- a/drivers/core/Kconfig +++ b/drivers/core/Kconfig @@ -424,7 +424,8 @@ config DM_DEV_READ_INLINE config OFNODE_MULTI_TREE bool "Allow the ofnode interface to access any tree" - default y if EVENT && !DM_DEV_READ_INLINE && !DM_INLINE_OFNODE + depends on OF_CONTROL + default y if !OF_LIVE help Normally U-Boot makes use of its control FDT, the one used to bind devices and provide options. In some cases, U-Boot must also process -- 2.42.0