This keeps common sources in a common location. Only header.S and gic-v3.c (for ARM) are non-common sources for inmates.
Signed-off-by: Ralf Ramsauer <[email protected]> --- inmates/lib/arm-common/Makefile.lib | 18 ++++++++++++++++++ inmates/lib/{arm => arm-common}/gic-v2.c | 0 inmates/lib/{arm => arm-common}/gic.c | 0 inmates/lib/{arm => arm-common}/printk.c | 0 inmates/lib/{arm => arm-common}/timer.c | 0 inmates/lib/{arm => arm-common}/uart-8250.c | 0 inmates/lib/{arm => arm-common}/uart-pl011.c | 0 inmates/lib/arm/Makefile | 7 +++---- inmates/lib/arm64/Makefile | 8 +++----- 9 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 inmates/lib/arm-common/Makefile.lib rename inmates/lib/{arm => arm-common}/gic-v2.c (100%) rename inmates/lib/{arm => arm-common}/gic.c (100%) rename inmates/lib/{arm => arm-common}/printk.c (100%) rename inmates/lib/{arm => arm-common}/timer.c (100%) rename inmates/lib/{arm => arm-common}/uart-8250.c (100%) rename inmates/lib/{arm => arm-common}/uart-pl011.c (100%) diff --git a/inmates/lib/arm-common/Makefile.lib b/inmates/lib/arm-common/Makefile.lib new file mode 100644 index 000000000000..722ddfe39a7f --- /dev/null +++ b/inmates/lib/arm-common/Makefile.lib @@ -0,0 +1,18 @@ +# +# Jailhouse, a Linux-based partitioning hypervisor +# +# Copyright (c) OTH Regensburg, 2016 +# +# Authors: +# Ralf Ramsauer <[email protected]> +# +# This work is licensed under the terms of the GNU GPL, version 2. See +# the COPYING file in the top-level directory. +# + +OBJS-y := ../string.o ../cmdline.o +OBJS-y += printk.o gic.o timer.o +OBJS-y += uart-pl011.o uart-8250.o +OBJS-$(CONFIG_ARM_GIC_V2) += gic-v2.o + +COMMON_OBJECTS = $(addprefix ../arm-common/,$(OBJS-y)) diff --git a/inmates/lib/arm/gic-v2.c b/inmates/lib/arm-common/gic-v2.c similarity index 100% rename from inmates/lib/arm/gic-v2.c rename to inmates/lib/arm-common/gic-v2.c diff --git a/inmates/lib/arm/gic.c b/inmates/lib/arm-common/gic.c similarity index 100% rename from inmates/lib/arm/gic.c rename to inmates/lib/arm-common/gic.c diff --git a/inmates/lib/arm/printk.c b/inmates/lib/arm-common/printk.c similarity index 100% rename from inmates/lib/arm/printk.c rename to inmates/lib/arm-common/printk.c diff --git a/inmates/lib/arm/timer.c b/inmates/lib/arm-common/timer.c similarity index 100% rename from inmates/lib/arm/timer.c rename to inmates/lib/arm-common/timer.c diff --git a/inmates/lib/arm/uart-8250.c b/inmates/lib/arm-common/uart-8250.c similarity index 100% rename from inmates/lib/arm/uart-8250.c rename to inmates/lib/arm-common/uart-8250.c diff --git a/inmates/lib/arm/uart-pl011.c b/inmates/lib/arm-common/uart-pl011.c similarity index 100% rename from inmates/lib/arm/uart-pl011.c rename to inmates/lib/arm-common/uart-pl011.c diff --git a/inmates/lib/arm/Makefile b/inmates/lib/arm/Makefile index e859db2a7f71..f126bce132d5 100644 --- a/inmates/lib/arm/Makefile +++ b/inmates/lib/arm/Makefile @@ -11,13 +11,12 @@ # include $(INMATES_LIB)/Makefile.lib +include $(INMATES_LIB)/../arm-common/Makefile.lib always := lib.a ccflags-y := -ffunction-sections -lib-y := header.o gic.o printk.o timer.o \ - uart-pl011.o uart-8250.o -lib-y += ../string.o ../cmdline.o -lib-$(CONFIG_ARM_GIC_V2) += gic-v2.o +lib-y := $(COMMON_OBJECTS) +lib-y += header.o lib-$(CONFIG_ARM_GIC_V3) += gic-v3.o diff --git a/inmates/lib/arm64/Makefile b/inmates/lib/arm64/Makefile index ca4e30ca2cc1..465c274b9146 100644 --- a/inmates/lib/arm64/Makefile +++ b/inmates/lib/arm64/Makefile @@ -11,11 +11,9 @@ # include $(INMATES_LIB)/Makefile.lib +include $(INMATES_LIB)/../arm-common/Makefile.lib always := lib.a -lib-y := header.o -lib-y += ../arm/gic.o ../arm/printk.o ../arm/timer.o -lib-y += ../string.o ../cmdline.o -lib-y += ../arm/uart-pl011.o ../arm/uart-8250.o -lib-$(CONFIG_ARM_GIC_V2) += ../arm/gic-v2.o +lib-y := $(COMMON_OBJECTS) +lib-y += header.o -- 2.11.0 -- 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.
