From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.groups.io with SMTP id smtpd.web09.9058.1583315568621915245 for ; Wed, 04 Mar 2020 01:52:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=G2AV6OiJ; spf=pass (domain: linaro.org, ip: 209.85.128.53, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wm1-f53.google.com with SMTP id a25so4335601wmm.0 for ; Wed, 04 Mar 2020 01:52: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=JlBnwqV600FPB8dQRikjaCzJOU2x3Y/QHkba0Y0Gpc8=; b=G2AV6OiJ1Bzu7gkE/IqIzpUrZpYcDeZHeQty201E49OwpWEcdP/6VuJIPPyXs34+6j jW+MqidbxcBXuTuPPCxXnzHZAFC3SVF/V4cp72LqPbx6ddCFjHC1MfNzDZY4PyScpelJ 6GwSmvshbjik5XnT66BG/XNalLyy4NJIXzXR27GCBQbCvVyxxP7HHMMr9COV2uM93tvy dPV4dsfXroJ2e98X8M7fv5pB9oi0s5OsnRnewcDlgKP+X/7UPa16FReUMJvrUozsAYud duIKTC2LeT4V2/sO3ulC/1H0zSfi8eGy+KixgcYDdPJgfZQFi4ukDIRUoZvoYW/DHl0j IF3Q== 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=pWzEkb8L/myVH7Ipntabgv6Y3FcCGP3ymCEbGfQEcmtwCLITfaSbMDWvMzrlrlcbrj MbrVCWAV0D8QRTUoBPQWIzMEnZKYmvOta3FJwKjKgnugVfwMeJEbG+dpZcfU7kkbUN/Q OpO0JHiXDmACEvcDZ0yHm/zHV4eF/X4HW2/uuepq7L8MgkJTvZlH1UyznAWrTusZpLp3 qrKDGvf9aK6frFvlvFTyFUbLKlxIDp8xsVDvB6rux/wIvlo6T69Oh1johZLoUtd5WrSG rQ9AS+OfiT7wS0p+a1NAq9pCj8+MLljMN5ey+dxkL36HmTwfaiGCHRs2grLrf4x6KATQ /z9w== X-Gm-Message-State: ANhLgQ10L0bjACzR9Swf+E1ZHIRGAxNtNKy+3Zgf8zVrr2dE3u45GiYL efa+FMktQN0KL+idEM1upOEx4cbTPpBf0w== X-Google-Smtp-Source: ADFU+vs1NODefiv/mJmk3P6UfKxUZ9JB2kGJ4ocZk+9oSCiT7AMlQN3tDbm9JInS8KY74UwkInA8HQ== X-Received: by 2002:a1c:f713:: with SMTP id v19mr2700056wmh.113.1583315566901; Wed, 04 Mar 2020 01:52: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 v16sm20781095wrp.84.2020.03.04.01.52.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 01:52:45 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: lersek@redhat.com, Ard Biesheuvel Subject: [PATCH v2 05/14] ArmVirtPkg: incorporate the new QEMU kernel loader driver and library Date: Wed, 4 Mar 2020 10:52:24 +0100 Message-Id: <20200304095233.21046-6-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200304095233.21046-1-ard.biesheuvel@linaro.org> References: <20200304095233.21046-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