From nobody Mon Apr 29 05:32:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1615286986; cv=none; d=zohomail.com; s=zohoarc; b=XUuwhQg+MbdeZBx3mj0NIDFlak4ljQ+l+GqY9LyoMmWnFOzZFWNC7bB23VC4djQq2dedrtsp0TuyppZ0q5nzF+sbfkt/vkb8vkA3RNfoRCspUOG3mW5Vkt+R6Cel255DyXMV42CpU8YwL2zl6DODzjL5ZJrWJ7BjpAQTylZWUEA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615286986; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=zqH5EJaQAwKM0FNDnRKeeH+bCCvckXBwwuWbxOGgJtQ=; b=XEaqkYKo8hcLt6SoaitKGLajF/UOzNa9z/XOFNUGqx8baqOXL6i6L2ZxmV8tN6e+IXTGpcFFz/SJp39GPNaEQ6bcSMmbxiPizo1qzEN3WyN4gsXGBJAm70UT4llHh7AuDtpo9HsFzifmOqKocPqom3C2H83FxnFkAeFF/zMczpo= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1615286986351389.1779219613893; Tue, 9 Mar 2021 02:49:46 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.95323.179918 (Exim 4.92) (envelope-from ) id 1lJZvW-0003NH-09; Tue, 09 Mar 2021 10:49:22 +0000 Received: by outflank-mailman (output) from mailman id 95323.179918; Tue, 09 Mar 2021 10:49:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lJZvV-0003NA-TV; Tue, 09 Mar 2021 10:49:21 +0000 Received: by outflank-mailman (input) for mailman id 95323; Tue, 09 Mar 2021 10:49:21 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lJZvV-0003N5-6Y for xen-devel@lists.xenproject.org; Tue, 09 Mar 2021 10:49:21 +0000 Received: from foss.arm.com (unknown [217.140.110.172]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id 0bcd7d5d-1a21-4f01-b65b-5a52b4c264ba; Tue, 09 Mar 2021 10:49:20 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4585931B; Tue, 9 Mar 2021 02:49:20 -0800 (PST) Received: from e123311-lin.arm.com (unknown [10.57.15.131]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 693413F70D; Tue, 9 Mar 2021 02:49:18 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 0bcd7d5d-1a21-4f01-b65b-5a52b4c264ba From: Michal Orzel To: xen-devel@lists.xenproject.org Cc: Stefano Stabellini , Julien Grall , Volodymyr Babchuk , Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Wei Liu , bertrand.marquis@arm.com Subject: [PATCH v3] arm: Add Kconfig entry to select CONFIG_DTB_FILE Date: Tue, 9 Mar 2021 11:49:13 +0100 Message-Id: <20210309104913.2776-1-michal.orzel@arm.com> X-Mailer: git-send-email 2.29.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently in order to link existing DTB into Xen image we need to either specify option CONFIG_DTB_FILE on the command line or manually add it into .config. Add Kconfig entry: CONFIG_DTB_FILE to be able to provide the path to DTB we want to embed into Xen image. If no path provided - the dtb will not be embedded. Remove the line: dtb.o: $(CONFIG_DTB_FILE) as it has no impact on creating dtb.o and causes the build failure as the dtb path is now within quotes. Remove the line: AFLAGS-y +=3D -DCONFIG_DTB_FILE=3D\"$(CONFIG_DTB_FILE)\" as it is not needed since Kconfig will define it in a header with all the other config options. Signed-off-by: Michal Orzel --- xen/arch/arm/Makefile | 5 +---- xen/common/Kconfig | 8 ++++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 16e6523e2c..d7702258f5 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -68,9 +68,8 @@ extra-y +=3D $(TARGET_SUBARCH)/head.o =20 #obj-bin-y +=3D ....o =20 -ifdef CONFIG_DTB_FILE +ifneq ($(CONFIG_DTB_FILE),"") obj-y +=3D dtb.o -AFLAGS-y +=3D -DCONFIG_DTB_FILE=3D\"$(CONFIG_DTB_FILE)\" endif =20 ALL_OBJS :=3D $(TARGET_SUBARCH)/head.o $(ALL_OBJS) @@ -137,8 +136,6 @@ asm-offsets.s: $(TARGET_SUBARCH)/asm-offsets.c xen.lds: xen.lds.S $(CPP) -P $(a_flags) -MQ $@ -o $@ $< =20 -dtb.o: $(CONFIG_DTB_FILE) - .PHONY: clean clean:: rm -f asm-offsets.s xen.lds diff --git a/xen/common/Kconfig b/xen/common/Kconfig index eb953d171e..a27836bf47 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -400,6 +400,14 @@ config DOM0_MEM =20 Leave empty if you are not sure what to specify. =20 +config DTB_FILE + string "Absolute path to device tree blob" + depends on HAS_DEVICE_TREE + ---help--- + When using a bootloader that has no device tree support or when there + is no bootloader at all, use this option to specify the absolute path + to a device tree that will be linked directly inside Xen binary. + config TRACEBUFFER bool "Enable tracing infrastructure" if EXPERT default y --=20 2.29.0