From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mx.groups.io with SMTP id smtpd.web09.11009.1583134188546041663 for ; Sun, 01 Mar 2020 23:29:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=OA4MHoLd; spf=pass (domain: linaro.org, ip: 209.85.221.67, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wr1-f67.google.com with SMTP id x7so11167470wrr.0 for ; Sun, 01 Mar 2020 23:29:48 -0800 (PST) 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; bh=w8IXBwlFnRwGzw3ZZqO5328qOUbEga9JTWWCtjYaIP0=; b=OA4MHoLdhRH7BUp6YQhxF53Jvp9vw9AuVVRvFtyPMPbw6SU/pCworYWfI0hiKdoXJp hU0FYP7HojX+PpQ7Q4s5qENH+Ls+4+P/vGI+wLI5ElKsgETVRnThVifGzjaQ8/yZf7OB JqChof7wP2TsYBex1aaX1I+hSmnqKlMG75R2ygfNvC62mqPW84bwsi30BvjUWcjc0Oi/ oA7oyQ/29kE/pybT154z72Q247PaYffep2Q4PuWAlcQS3q0F4GHLc+tXOJn1k9siM2ye 9/x1C3mosARHDzrUJo+b131Amp8y4oBJAKm3/tqu5/FVgA4YARljuo1mux+kC2WDjGLs Aknw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=w8IXBwlFnRwGzw3ZZqO5328qOUbEga9JTWWCtjYaIP0=; b=SxJhB9/wZuwAY4Mjkc26FgwublOrmYwSwXuZJ6Y86zqfyN3Xmhiy6uqWzkdEgxwGO8 4qwvwOdPNDHApO1Xn+dtafHcDoFhNDwiy3h/Uf6nvJdsQzahvBMLkAXdZNoF1wRzutGC 4+Irb13K5d4B7Wd6qYolMiGZ7PBpl3hJBK8L7EjQlEzaUHxrswU8aagTQp9xPs4w2N43 CqWucACf5RoMYU27SCL/R+ZGfC12PRuslizzhMcXfNgo7dFVh9Ty80NjG0DsmWVd1zYi Uj2z3VICQeRW9p9jYNVTjet58seFBruIWOGTUCgfwVeLPY6/xD3k6xAn8UhMkTcyjfZ3 Gr8Q== X-Gm-Message-State: ANhLgQ3hnReEh6XjSXd3jHv/J6WGG2SLdl1mtPbpId2x2q0ZgmXEQBJv N93AFX6wmC4p5HppgNkhXpsHg5Ku8nTrhw== X-Google-Smtp-Source: ADFU+vvJfthJUf5vsQyXB/E4eeGLyFyfnjx3GmqpUOrJ+v62TxqaatvFxSvV0iK/1I/rucdBR1cnZg== X-Received: by 2002:adf:fc07:: with SMTP id i7mr5219345wrr.158.1583134186881; Sun, 01 Mar 2020 23:29:46 -0800 (PST) Return-Path: Received: from e123331-lin.home ([2a01:cb1d:112:6f00:816e:ff0d:fb69:f613]) by smtp.gmail.com with ESMTPSA id z131sm6347153wmg.25.2020.03.01.23.29.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Mar 2020 23:29:46 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: lersek@redhat.com, Ard Biesheuvel Subject: [PATCH 05/13] ArmVirtPkg: incorporate the new QEMU kernel loader driver and library Date: Mon, 2 Mar 2020 08:29:28 +0100 Message-Id: <20200302072936.29221-6-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200302072936.29221-1-ard.biesheuvel@linaro.org> References: <20200302072936.29221-1-ard.biesheuvel@linaro.org> Add the QEMU loader DXE driver and client library to the build for our QEMU targeted implementations in ArmVirtPkg. Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2566 Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirtQemu.dsc | 2 ++ ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 1 + ArmVirtPkg/ArmVirtQemuKernel.dsc | 2 ++ 3 files changed, 5 insertions(+) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 7ae6702ac1f0..d037d68f90c7 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -56,6 +56,7 @@ [LibraryClasses.common] VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf QemuFwCfgLib|ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/BaseQemuFwCfgS3LibNull.inf + QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf ArmPlatformLib|ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf @@ -371,6 +372,7 @@ [Components.common] NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf } + OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf # # Networking stack diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc index bfa380815f1a..9cb8621ffece 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -114,6 +114,7 @@ [FV.FvMain] INF MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf INF MdeModulePkg/Application/UiApp/UiApp.inf + INF OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf # # Networking stack diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index 3b0f04967a4b..dfd06587c735 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -56,6 +56,7 @@ [LibraryClasses.common] VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf QemuFwCfgLib|ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/BaseQemuFwCfgS3LibNull.inf + QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.inf @@ -355,6 +356,7 @@ [Components.common] NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf } + OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf # # Networking stack -- 2.17.1