From patchwork Thu Apr 7 12:11:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 65313 Delivered-To: patch@linaro.org Received: by 10.112.43.237 with SMTP id z13csp37742lbl; Thu, 7 Apr 2016 05:11:56 -0700 (PDT) X-Received: by 10.98.80.70 with SMTP id e67mr4421857pfb.136.1460031116459; Thu, 07 Apr 2016 05:11:56 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id gj3si557173pac.243.2016.04.07.05.11.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Apr 2016 05:11:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id E1A4C1A1F4A; Thu, 7 Apr 2016 05:11:55 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x234.google.com (mail-wm0-x234.google.com [IPv6:2a00:1450:400c:c09::234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 54D451A1E69 for ; Thu, 7 Apr 2016 05:11:54 -0700 (PDT) Received: by mail-wm0-x234.google.com with SMTP id 191so89421797wmq.0 for ; Thu, 07 Apr 2016 05:11:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=6JPdBZKkNLDqUJJJ8wcG+BBaxoU8rh+qW8+H2IqfEE4=; b=fD2Fc9H5+881f3hnIoqHjKORz5Nt+dNbHW9+KF7lNAuGKqIjyqGuezpeEJjBiJ1Bt6 rsgmYWTOUA0s6INgPBq+50cmd7fKA2mniTW/3eOKcNal64Ug0NH10GaJwOaXhGN+1eJW qDNJiTM6HSlr6RxXKTUFtjsKpP/QymTdJ0zFE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=6JPdBZKkNLDqUJJJ8wcG+BBaxoU8rh+qW8+H2IqfEE4=; b=aTeK9BaWXdlaZnd4hdbCV5QDiPs1a2QyxAUCr1MpzvFFPEQKpKWMMNJgN85QBTIcrk UXkeR5N3O/QPLYtntTLpS1uh8CImBRBg8lO1+zMMIkd83wjElXB4zhKuKyABibY+czYg HFW7Vx+MKwgDbkCSbRLdwbVZfI3i/04vuUOo/MJIgK9dWbhiaEnQUoFRCG6TuWeN9qB6 vwQcTNKWLtgdxrYzXMenVB2HriYmcxuIlxJVQfI2TjVuTcuf7kLSUxYdtY8SAz1D37j7 z+BGXQBVmxKz2BgmBQhgvkYJK/Qfdoi2nH0ybuQBDK8jt30/af7PHVA0RpmNWra+JbFT JY0A== X-Gm-Message-State: AD7BkJL9dLAO215eYzp7PnPGoSu1BQrqVfg0jJucLGOiYVmNESOAPl/JNTfNmLgUUBWKcWWh X-Received: by 10.194.23.7 with SMTP id i7mr3167788wjf.9.1460031112664; Thu, 07 Apr 2016 05:11:52 -0700 (PDT) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id u3sm29754516wmg.15.2016.04.07.05.11.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Apr 2016 05:11:51 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, lersek@redhat.com Date: Thu, 7 Apr 2016 14:11:36 +0200 Message-Id: <1460031097-5853-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 Subject: [edk2] [PATCH 1/2] ArmVirtPkg: remove linux loader from ARM builds X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" The built in Linux loader was a temporary solution to boot ARM Linux without EFI support in the OS. Now that EFI support is merged in the upstream v4.5 release, we no longer need it. So drop it. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirtQemu.dsc | 12 ------------ ArmVirtPkg/ArmVirtQemu.fdf | 5 ----- ArmVirtPkg/ArmVirtQemuKernel.dsc | 12 ------------ ArmVirtPkg/ArmVirtQemuKernel.fdf | 5 ----- 4 files changed, 34 deletions(-) -- 2.5.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Laszlo Ersek diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index ab29b8450185..80606d76ae72 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -388,15 +388,3 @@ [Components.AARCH64] # MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf - -[Components.ARM] - # - # The ARM/Linux kernel has no built in EFI boot stub (yet), so we still need - # an intermediate OS loader. Add the LinuxLoader UEFI application so we can - # invoke it from the shell. - # - MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf - ArmPkg/Application/LinuxLoader/LinuxLoader.inf { - - BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf - } diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf index f432e40c43eb..3745512c835a 100644 --- a/ArmVirtPkg/ArmVirtQemu.fdf +++ b/ArmVirtPkg/ArmVirtQemu.fdf @@ -236,11 +236,6 @@ [FV.FvMain] SECTION RAW = MdeModulePkg/Logo/Logo.bmp } -!if $(ARCH) == ARM - INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf - INF ArmPkg/Application/LinuxLoader/LinuxLoader.inf -!endif - [FV.FVMAIN_COMPACT] FvAlignment = 16 ERASE_POLARITY = 1 diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index a590b42fe235..7af7a4ad6359 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -363,15 +363,3 @@ [Components.common] MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf - -[Components.ARM] - # - # The ARM/Linux kernel has no built in EFI boot stub (yet), so we still need - # an intermediate OS loader. Add the LinuxLoader UEFI application so we can - # invoke it from the shell. - # - MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf - ArmPkg/Application/LinuxLoader/LinuxLoader.inf { - - BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf - } diff --git a/ArmVirtPkg/ArmVirtQemuKernel.fdf b/ArmVirtPkg/ArmVirtQemuKernel.fdf index 1a9338629974..e4e8095b8bec 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.fdf +++ b/ArmVirtPkg/ArmVirtQemuKernel.fdf @@ -254,11 +254,6 @@ [FV.FvMain] SECTION RAW = MdeModulePkg/Logo/Logo.bmp } -!if $(ARCH) == ARM - INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf - INF ArmPkg/Application/LinuxLoader/LinuxLoader.inf -!endif - [FV.FVMAIN_COMPACT] FvAlignment = 16 ERASE_POLARITY = 1