From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.groups.io with SMTP id smtpd.web09.12510.1583415977767016011 for ; Thu, 05 Mar 2020 05:46:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=L4vfCW+O; spf=pass (domain: linaro.org, ip: 209.85.128.46, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wm1-f46.google.com with SMTP id a25so7131166wmm.0 for ; Thu, 05 Mar 2020 05:46:17 -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=JlBnwqV600FPB8dQRikjaCzJOU2x3Y/QHkba0Y0Gpc8=; b=L4vfCW+OrIeAGgSeH3KQhRM3Y9hKucBqC1ZP32uZmBKs7h8JTr57BimcTgu77vbq6t E3oWcFamQtLxOGHiO8A8T76TIpCKx5bJIowUEYVWmngUvNCtus1xvJsGvivt/s8SAKIb 6iwpygHS8vZLhz9NiC868yRxc1fMkBB4miqCw4eEgx3kBVYN7gpTqsJOaPGbE0XyRE8F TvoVUmppcsQHUKNbt9oio/+roVqwqFYpZbVIG4Wi/By/mmlvLBTXcY8ZOpDJeXBq4MfL zGXTSRB5v7vRu8o9cpHW1zPDovuP8GMVSucZvputdNwsarRp4iSfo4tCQw5ldFwMMCy2 t34w== 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=JlBnwqV600FPB8dQRikjaCzJOU2x3Y/QHkba0Y0Gpc8=; b=Neku0RJ06jYxpHfXBNOPbxadAwdEudaL2ggXMD6BR481wE8Ag9oAoW3DUlIBjnhV3E 3p1Uv/lqE2+HYia883f8+WNfOJIAt7ISMFCZeAl46UvbThWhzwCcjpy0VbCroTVuKF9w i575p6Cc6JePRaP7A8/04tqGK9ofYkNNTkgFZKwSOiXQGML0inl1lAZ137ZT12J5/mlT mSHisFK6kzUMAfVl9JXcRz0Hl/k9U10znua+bRiu/7ckE6ArbR2CL5pSUOgSISIJN6Zl mOFerVvSc3UPiTuozNSDVTDcv5hSJg5qOjHeDA6PpbI+YFmVYD1AKb4zLhCt2vPjIWoG ksZQ== X-Gm-Message-State: ANhLgQ1Ok7P01aG6jWKl2fJdKxppDt9QCfmM9HJeFw+h89qat/y9ERgr rt72auen7Vcqq50BMKE3tIU2LfjtA3mVWA== X-Google-Smtp-Source: ADFU+vuCs48K3xAXxRFV6x/0fgE6grktG3N6dV+4AsDaiuO+8Q87Eo9Bl0RXMg1XCnlw8D1DlCzpFg== X-Received: by 2002:a1c:4c13:: with SMTP id z19mr9531278wmf.75.1583415976116; Thu, 05 Mar 2020 05:46:16 -0800 (PST) Return-Path: Received: from e123331-lin.home ([2a01:cb1d:112:6f00:816e:ff0d:fb69:f613]) by smtp.gmail.com with ESMTPSA id m19sm9278701wmc.34.2020.03.05.05.46.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Mar 2020 05:46:15 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: lersek@redhat.com, Ard Biesheuvel Subject: [PATCH v3 05/14] ArmVirtPkg: incorporate the new QEMU kernel loader driver and library Date: Thu, 5 Mar 2020 14:45:58 +0100 Message-Id: <20200305134607.20125-6-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200305134607.20125-1-ard.biesheuvel@linaro.org> References: <20200305134607.20125-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 Reviewed-by: Laszlo Ersek --- 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 5e5f71e7fe8a..8c77fc46427b 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -58,6 +58,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 @@ -427,6 +428,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 2a17583593ef..aaba0b1c8840 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 37e19dfbd0db..4d82a77213ec 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 @@ -362,6 +363,7 @@ [Components.common] NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf } + OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf # # Networking stack -- 2.17.1