From: Jan Kiszka <[email protected]> Rename COMMON_OBJECTS to common-objs-y so that optional objects can more easily be appended. Also decapitalize OBJS-y to be visually more friendly.
No functional changes. Signed-off-by: Jan Kiszka <[email protected]> --- hypervisor/arch/arm-common/Kbuild | 10 +++++----- hypervisor/arch/arm/Kbuild | 4 ++-- hypervisor/arch/arm64/Kbuild | 4 ++-- hypervisor/arch/x86/Kbuild | 10 +++++----- inmates/lib/arm-common/Makefile.lib | 12 ++++++------ inmates/lib/arm/Makefile | 2 +- inmates/lib/arm64/Makefile | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/hypervisor/arch/arm-common/Kbuild b/hypervisor/arch/arm-common/Kbuild index 127bc5987..95c5123e5 100644 --- a/hypervisor/arch/arm-common/Kbuild +++ b/hypervisor/arch/arm-common/Kbuild @@ -14,9 +14,9 @@ ccflags-$(CONFIG_JAILHOUSE_GCOV) += -fprofile-arcs -ftest-coverage -OBJS-y += dbg-write.o lib.o psci.o control.o paging.o mmu_cell.o setup.o -OBJS-y += irqchip.o pci.o ivshmem.o uart-pl011.o uart-xuartps.o uart-mvebu.o -OBJS-y += uart-hscif.o uart-scifa.o uart-imx.o -OBJS-y += gic-v2.o gic-v3.o +objs-y += dbg-write.o lib.o psci.o control.o paging.o mmu_cell.o setup.o +objs-y += irqchip.o pci.o ivshmem.o uart-pl011.o uart-xuartps.o uart-mvebu.o +objs-y += uart-hscif.o uart-scifa.o uart-imx.o +objs-y += gic-v2.o gic-v3.o -COMMON_OBJECTS = $(addprefix ../arm-common/,$(OBJS-y)) +common-objs-y = $(addprefix ../arm-common/,$(objs-y)) diff --git a/hypervisor/arch/arm/Kbuild b/hypervisor/arch/arm/Kbuild index ed29417ad..bdbb88ea2 100644 --- a/hypervisor/arch/arm/Kbuild +++ b/hypervisor/arch/arm/Kbuild @@ -17,9 +17,9 @@ KBUILD_AFLAGS := $(subst -include asm/unified.h,,$(KBUILD_AFLAGS)) always := built-in.o # units initialization order as defined by linking order: -# irqchip (COMMON_OBJECTS), [vexpress], <generic units> +# irqchip (common-objs-y), [vexpress], <generic units> -obj-y := $(COMMON_OBJECTS) +obj-y := $(common-objs-y) obj-y += entry.o setup.o control.o traps.o mmio.o lib.o obj-y += mmu_hyp.o caches.o diff --git a/hypervisor/arch/arm64/Kbuild b/hypervisor/arch/arm64/Kbuild index 54cf6f015..d659392ba 100644 --- a/hypervisor/arch/arm64/Kbuild +++ b/hypervisor/arch/arm64/Kbuild @@ -17,7 +17,7 @@ include $(src)/../arm-common/Kbuild always := built-in.o # units initialization order as defined by linking order: -# irqchip (COMMON_OBJECTS), <generic units> +# irqchip (common-objs-y), <generic units> -obj-y := $(COMMON_OBJECTS) +obj-y := $(common-objs-y) obj-y += entry.o setup.o control.o mmio.o caches.o traps.o diff --git a/hypervisor/arch/x86/Kbuild b/hypervisor/arch/x86/Kbuild index 829e8f870..476f9c1cc 100644 --- a/hypervisor/arch/x86/Kbuild +++ b/hypervisor/arch/x86/Kbuild @@ -22,13 +22,13 @@ always := $(BUILT_IN_OBJECTS) obj-y := $(BUILT_IN_OBJECTS) -COMMON_OBJECTS := apic.o dbg-write.o entry.o setup.o control.o mmio.o iommu.o \ - paging.o pci.o i8042.o vcpu.o vga.o ivshmem.o +common-objs-y := apic.o dbg-write.o entry.o setup.o control.o mmio.o iommu.o \ + paging.o pci.o i8042.o vcpu.o vga.o ivshmem.o # units initialization order as defined by linking order: # iommu, ioapic, [cat], <generic units> -COMMON_OBJECTS += ioapic.o +common-objs-y += ioapic.o -built-in-amd-y := svm.o amd_iommu.o svm-vmexit.o $(COMMON_OBJECTS) -built-in-intel-y := vmx.o vtd.o vmx-vmexit.o $(COMMON_OBJECTS) cat.o +built-in-amd-y := svm.o amd_iommu.o svm-vmexit.o $(common-objs-y) +built-in-intel-y := vmx.o vtd.o vmx-vmexit.o $(common-objs-y) cat.o diff --git a/inmates/lib/arm-common/Makefile.lib b/inmates/lib/arm-common/Makefile.lib index 4c35cdc60..fb3b6585f 100644 --- a/inmates/lib/arm-common/Makefile.lib +++ b/inmates/lib/arm-common/Makefile.lib @@ -36,10 +36,10 @@ # THE POSSIBILITY OF SUCH DAMAGE. # -OBJS-y := ../string.o ../cmdline.o -OBJS-y += printk.o gic.o timer.o -OBJS-y += uart-jailhouse.o uart-pl011.o uart-8250.o uart-8250-8.o -OBJS-y += uart-xuartps.o uart-mvebu.o uart-hscif.o uart-scifa.o uart-imx.o -OBJS-y += gic-v2.o gic-v3.o +objs-y := ../string.o ../cmdline.o +objs-y += printk.o gic.o timer.o +objs-y += uart-jailhouse.o uart-pl011.o uart-8250.o uart-8250-8.o +objs-y += uart-xuartps.o uart-mvebu.o uart-hscif.o uart-scifa.o uart-imx.o +objs-y += gic-v2.o gic-v3.o -COMMON_OBJECTS = $(addprefix ../arm-common/,$(OBJS-y)) +common-objs-y = $(addprefix ../arm-common/,$(objs-y)) diff --git a/inmates/lib/arm/Makefile b/inmates/lib/arm/Makefile index daabd635d..ed07d230d 100644 --- a/inmates/lib/arm/Makefile +++ b/inmates/lib/arm/Makefile @@ -43,5 +43,5 @@ always := lib.a inmate.lds ccflags-y := -ffunction-sections -lib-y := $(COMMON_OBJECTS) +lib-y := $(common-objs-y) lib-y += header.o diff --git a/inmates/lib/arm64/Makefile b/inmates/lib/arm64/Makefile index 842e954d8..2cc0c658c 100644 --- a/inmates/lib/arm64/Makefile +++ b/inmates/lib/arm64/Makefile @@ -41,5 +41,5 @@ include $(INMATES_LIB)/../arm-common/Makefile.lib always := lib.a inmate.lds -lib-y := $(COMMON_OBJECTS) -lib-y += header.o +lib-y := $(common-objs-y) +lib-y += header.o -- 2.13.6 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
