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.129.124]) by mx.groups.io with SMTP id smtpd.web08.4683.1654162536764947026 for ; Thu, 02 Jun 2022 02:35:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=EZTUjtXM; spf=pass (domain: redhat.com, ip: 170.10.129.124, mailfrom: kraxel@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654162536; 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; bh=GZIjmQD81goSyzsFqmCvi371ps0IZ5kfkc0qES4p/jI=; b=EZTUjtXMgH6Xm9JdC4HBa7IMuW40DwqBKNySDyRlJamt62TEdg+No9iFvfk9/o3qAaIZ0e wYMFTq7jZDEk6lG0djVG99JUGYYgurRCHy5tKRLjHZkjEgp3LL1Pq277kA1Laz5JgSEWRh WUDbb/Quu3gIk9+L6Fp2nTps6Fcq2C4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-433-2An53L7ZNrKaTEbgoIhhcw-1; Thu, 02 Jun 2022 05:35:31 -0400 X-MC-Unique: 2An53L7ZNrKaTEbgoIhhcw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A051E185A794; Thu, 2 Jun 2022 09:35:30 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.194.92]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2FA0D414A7E7; Thu, 2 Jun 2022 09:35:29 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 3502018000B2; Thu, 2 Jun 2022 11:35:23 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Jiewen Yao , Oliver Steffen , Gerd Hoffmann , Ard Biesheuvel , Jordan Justen , Pawel Polawski Subject: [PATCH 1/1] OvmfPkg/Microvm: drop CODE and VARS files Date: Thu, 2 Jun 2022 11:35:23 +0200 Message-Id: <20220602093523.472920-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 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"; x-default=true microvm doesn't support pflash and loads the firmware via -bios, so we can't use the separate CODE and VARS files. Remove them. Signed-off-by: Gerd Hoffmann --- OvmfPkg/Microvm/MicrovmX64.fdf | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/OvmfPkg/Microvm/MicrovmX64.fdf b/OvmfPkg/Microvm/MicrovmX64.fdf index 3adb492a4ad7..ff0aab2bcb9e 100644 --- a/OvmfPkg/Microvm/MicrovmX64.fdf +++ b/OvmfPkg/Microvm/MicrovmX64.fdf @@ -32,32 +32,6 @@ [FD.MICROVM] $(SECFV_OFFSET)|$(SECFV_SIZE) FV = SECFV -# -# Build the variable store and the firmware code as separate flash device -# images. -# -[FD.MICROVM_VARS] -BaseAddress = $(FW_BASE_ADDRESS) -Size = $(VARS_SIZE) -ErasePolarity = 1 -BlockSize = $(BLOCK_SIZE) -NumBlocks = $(VARS_BLOCKS) - -!include OvmfPkg/VarStore.fdf.inc - -[FD.MICROVM_CODE] -BaseAddress = $(CODE_BASE_ADDRESS) -Size = $(CODE_SIZE) -ErasePolarity = 1 -BlockSize = $(BLOCK_SIZE) -NumBlocks = $(CODE_BLOCKS) - -0x00000000|$(FVMAIN_SIZE) -FV = FVMAIN_COMPACT - -$(FVMAIN_SIZE)|$(SECFV_SIZE) -FV = SECFV - ################################################################################ [FD.MEMFD] -- 2.36.1