From patchwork Tue Jun 7 16:06:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 9161825 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7829360571 for ; Tue, 7 Jun 2016 16:08:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A2482723E for ; Tue, 7 Jun 2016 16:08:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F0F7281F9; Tue, 7 Jun 2016 16:08:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F33042723E for ; Tue, 7 Jun 2016 16:08:54 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bAJWW-0002DN-V7; Tue, 07 Jun 2016 16:06:36 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bAJWU-0002Cr-UG for xen-devel@lists.xen.org; Tue, 07 Jun 2016 16:06:35 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 22/90-31829-A01F6575; Tue, 07 Jun 2016 16:06:34 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrGLMWRWlGSWpSXmKPExsVysyfVTZfzY1i 4wbfL2hZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8aD2XtYCk5KV6xc/5u1gfGweBcjF4eQwEZG iVONK5m6GDmBnNOMEjc/OYPYbAKaEnc+fwKLiwhIS1z7fJkRxGYWaGaUWHjAD8QWFvCRWH14H QuIzSKgKnFo5yNWEJtXwFni9rSZbCC2hICcxMljk8HinAIuEm0PHrFB7HKWWPqrgXECI/cCRo ZVjBrFqUVlqUW6hhZ6SUWZ6RkluYmZObqGhiZ6uanFxYnpqTmJScV6yfm5mxiB/q1nYGDcwXh ku+chRkkOJiVR3s/PwsKF+JLyUyozEosz4otKc1KLDzHKcHAoSfAWvgPKCRalpqdWpGXmAAMN Ji3BwaMkwpsFkuYtLkjMLc5Mh0idYlSUEufVAUkIgCQySvPg2mDBfYlRVkqYl5GBgUGIpyC1K DezBFX+FaM4B6OSMK8ZyBSezLwSuOmvgBYzAS1edi0YZHFJIkJKqoFR6VX2jHntDF2JT7VUT5 1bvHwXT8qB1vcvZqrfXdhrWpko6aczuVdDSza/kdPxJxPnk2ef7vjMM6s/J2P8K0R5s9Re7at bNRTeP3jtsCuKw0G4+P+VzXkdevuNnfqzb3Ec/2GyoPr5iekaAlUvney/G56cuFtMuGz9vrW6 nPtvOzgcTPZzf7BfiaU4I9FQi7moOBEAG44H1mkCAAA= X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1465315593!34151889!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 52248 invoked from network); 7 Jun 2016 16:06:33 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-14.tower-27.messagelabs.com with SMTP; 7 Jun 2016 16:06:33 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4171D2F; Tue, 7 Jun 2016 09:07:07 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.215.28]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id B1E643F21A; Tue, 7 Jun 2016 09:06:31 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Tue, 7 Jun 2016 17:06:08 +0100 Message-Id: <1465315583-1278-2-git-send-email-julien.grall@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465315583-1278-1-git-send-email-julien.grall@arm.com> References: <1465315583-1278-1-git-send-email-julien.grall@arm.com> Cc: andre.przywara@arm.com, Julien Grall , sstabellini@kernel.org, wei.chen@arm.com, steve.capper@arm.com Subject: [Xen-devel] [PATCH v3 01/16] xen/arm: Makefile: Sort the entries alphabetically X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Julien Grall Acked-by: Stefano Stabellini --- Changes in v3: - Rebase on staging (conflict with s/xsplice/livepatch). Changes in v2: - Add Stefano's acked-by --- xen/arch/arm/Makefile | 40 +++++++++++++++++++++------------------- xen/arch/arm/arm32/Makefile | 9 ++++----- xen/arch/arm/arm64/Makefile | 12 +++++------- xen/arch/arm/platforms/Makefile | 2 +- 4 files changed, 31 insertions(+), 32 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index af4d0e1..bd93013 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -4,43 +4,45 @@ subdir-y += platforms subdir-$(CONFIG_ARM_64) += efi subdir-$(CONFIG_ACPI) += acpi -obj-$(EARLY_PRINTK) += early_printk.o +obj-y += bootfdt.o obj-y += cpu.o +obj-y += decode.o +obj-y += device.o obj-y += domain.o -obj-y += psci.o -obj-y += vpsci.o -obj-y += domctl.o -obj-y += sysctl.o obj-y += domain_build.o -obj-y += gic.o gic-v2.o +obj-y += domctl.o +obj-$(EARLY_PRINTK) += early_printk.o +obj-y += gic.o +obj-y += gic-v2.o obj-$(CONFIG_HAS_GICV3) += gic-v3.o +obj-y += guestcopy.o +obj-y += hvm.o obj-y += io.o obj-y += irq.o obj-y += kernel.o +obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-y += mm.o obj-y += p2m.o obj-y += percpu.o -obj-y += guestcopy.o -obj-y += physdev.o obj-y += platform.o obj-y += platform_hypercall.o +obj-y += physdev.o +obj-y += processor.o +obj-y += psci.o obj-y += setup.o -obj-y += bootfdt.o -obj-y += time.o -obj-y += smpboot.o -obj-y += smp.o obj-y += shutdown.o +obj-y += smc.o +obj-y += smp.o +obj-y += smpboot.o +obj-y += sysctl.o +obj-y += time.o obj-y += traps.o -obj-y += vgic.o vgic-v2.o +obj-y += vgic.o +obj-y += vgic-v2.o obj-$(CONFIG_ARM_64) += vgic-v3.o obj-y += vtimer.o +obj-y += vpsci.o obj-y += vuart.o -obj-y += hvm.o -obj-y += device.o -obj-y += decode.o -obj-y += processor.o -obj-y += smc.o -obj-$(CONFIG_LIVEPATCH) += livepatch.o #obj-bin-y += ....o diff --git a/xen/arch/arm/arm32/Makefile b/xen/arch/arm/arm32/Makefile index df0e7de..b20db64 100644 --- a/xen/arch/arm/arm32/Makefile +++ b/xen/arch/arm/arm32/Makefile @@ -1,12 +1,11 @@ subdir-y += lib +obj-$(EARLY_PRINTK) += debug.o +obj-y += domctl.o +obj-y += domain.o obj-y += entry.o obj-y += proc-v7.o proc-caxx.o - +obj-y += smpboot.o obj-y += traps.o -obj-y += domain.o obj-y += vfp.o -obj-y += smpboot.o -obj-y += domctl.o -obj-$(EARLY_PRINTK) += debug.o diff --git a/xen/arch/arm/arm64/Makefile b/xen/arch/arm/arm64/Makefile index c7243f5..39c6ac6 100644 --- a/xen/arch/arm/arm64/Makefile +++ b/xen/arch/arm/arm64/Makefile @@ -1,12 +1,10 @@ subdir-y += lib +obj-y += cache.o +obj-$(EARLY_PRINTK) += debug.o +obj-y += domctl.o +obj-y += domain.o obj-y += entry.o - +obj-y += smpboot.o obj-y += traps.o -obj-y += domain.o obj-y += vfp.o -obj-y += smpboot.o -obj-y += domctl.o -obj-y += cache.o - -obj-$(EARLY_PRINTK) += debug.o diff --git a/xen/arch/arm/platforms/Makefile b/xen/arch/arm/platforms/Makefile index 3689eec..49fa683 100644 --- a/xen/arch/arm/platforms/Makefile +++ b/xen/arch/arm/platforms/Makefile @@ -3,8 +3,8 @@ obj-$(CONFIG_ARM_32) += brcm.o obj-$(CONFIG_ARM_32) += exynos5.o obj-$(CONFIG_ARM_32) += midway.o obj-$(CONFIG_ARM_32) += omap5.o -obj-$(CONFIG_ARM_32) += sunxi.o obj-$(CONFIG_ARM_32) += rcar2.o obj-$(CONFIG_ARM_64) += seattle.o +obj-$(CONFIG_ARM_32) += sunxi.o obj-$(CONFIG_ARM_64) += xgene-storm.o obj-$(CONFIG_ARM_64) += xilinx-zynqmp.o