From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web10.164.1631794846547003080 for ; Thu, 16 Sep 2021 05:20:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=GRxQ6r1U; spf=pass (domain: redhat.com, ip: 170.10.133.124, mailfrom: kraxel@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631794845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/2QbmE84Fu7rGuIiwlzd2z8uEkex4eK9Q+qC7BUoyW4=; b=GRxQ6r1U3EBowxiSvFMCC2pW6vYPIGOfQ/t+owAag2rTtWwXCHldC6P743K4NRZ5K1sj2i wBoa2qUYAJTnOB3HNRiTjtTIHYQkKS/rsADwDr2ebDf03VVdTMbSmLvAnqAiPYDqdNwX4n 5YOpod4DvNjOBZddcljMkMiw0TjmiAQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-162-jbcSY95NO0GPOXmwIsvSug-1; Thu, 16 Sep 2021 08:20:43 -0400 X-MC-Unique: jbcSY95NO0GPOXmwIsvSug-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8AFBC88128E; Thu, 16 Sep 2021 12:20:41 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 48ED76A902; Thu, 16 Sep 2021 12:20:41 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 6E78318007A8; Thu, 16 Sep 2021 14:20:27 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Jordan Justen , Gerd Hoffmann , Jiewen Yao , Julien Grall , Stefan Berger , Leif Lindholm , Ard Biesheuvel , Andrew Fish , Michael D Kinney , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony Perard , Jiewen Yao Subject: [PATCH v4 02/20] OvmfPkg/Microvm: rename output files, fix includes Date: Thu, 16 Sep 2021 14:20:09 +0200 Message-Id: <20210916122027.2352393-3-kraxel@redhat.com> In-Reply-To: <20210916122027.2352393-1-kraxel@redhat.com> References: <20210916122027.2352393-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Rename the firmware volume files (s/OVMF/MICROVM/). Fix includes so they work with microvm config being in a subdirectory. With this patch applied the build works. Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3599 Signed-off-by: Gerd Hoffmann Acked-by: Jiewen Yao --- OvmfPkg/Microvm/MicrovmX64.dsc | 8 ++++---- OvmfPkg/Microvm/MicrovmX64.fdf | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc index e56b83d95e09..97a8d90d749e 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc @@ -15,15 +15,15 @@ # ################################################################################ [Defines] - PLATFORM_NAME = Ovmf - PLATFORM_GUID = 5a9e7754-d81b-49ea-85ad-69eaa7b1539b + PLATFORM_NAME = Microvm + PLATFORM_GUID = 55a5d2cc-6ca6-47d1-8f4f-5588d7705194 PLATFORM_VERSION = 0.1 DSC_SPECIFICATION = 0x00010005 - OUTPUT_DIRECTORY = Build/OvmfX64 + OUTPUT_DIRECTORY = Build/MicrovmX64 SUPPORTED_ARCHITECTURES = X64 BUILD_TARGETS = NOOPT|DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT - FLASH_DEFINITION = OvmfPkg/OvmfPkgX64.fdf + FLASH_DEFINITION = OvmfPkg/Microvm/MicrovmX64.fdf # # Defines for default states. These can be changed on the command line. diff --git a/OvmfPkg/Microvm/MicrovmX64.fdf b/OvmfPkg/Microvm/MicrovmX64.fdf index 23936242e74a..5c1b85792e3e 100644 --- a/OvmfPkg/Microvm/MicrovmX64.fdf +++ b/OvmfPkg/Microvm/MicrovmX64.fdf @@ -11,20 +11,20 @@ ################################################################################ [Defines] -!include OvmfPkgDefines.fdf.inc +!include OvmfPkg/OvmfPkgDefines.fdf.inc # # Build the variable store and the firmware code as one unified flash device # image. # -[FD.OVMF] +[FD.MICROVM] BaseAddress = $(FW_BASE_ADDRESS) Size = $(FW_SIZE) ErasePolarity = 1 BlockSize = $(BLOCK_SIZE) NumBlocks = $(FW_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/VarStore.fdf.inc $(VARS_SIZE)|$(FVMAIN_SIZE) FV = FVMAIN_COMPACT @@ -36,16 +36,16 @@ [FD.OVMF] # Build the variable store and the firmware code as separate flash device # images. # -[FD.OVMF_VARS] +[FD.MICROVM_VARS] BaseAddress = $(FW_BASE_ADDRESS) Size = $(VARS_SIZE) ErasePolarity = 1 BlockSize = $(BLOCK_SIZE) NumBlocks = $(VARS_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/VarStore.fdf.inc -[FD.OVMF_CODE] +[FD.MICROVM_CODE] BaseAddress = $(CODE_BASE_ADDRESS) Size = $(CODE_SIZE) ErasePolarity = 1 @@ -427,7 +427,7 @@ [FV.FVMAIN_COMPACT] } } -!include FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/FvmainCompactScratchEnd.fdf.inc ################################################################################ -- 2.31.1