[v4,01/15] xen/arm: Makefile: Sort the entries alphabetically

Commit Message

Julien Grall June 22, 2016, 11:15 a.m. UTC

Signed-off-by: Julien Grall <[e-mail]>
Acked-by: Stefano Stabellini <[e-mail]>

---
    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(-)

Patch

diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile
index 9e38da3..e35cde7 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