[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH] arm: clean up build variables
This consolidates some of the different variables used for the ARM builds. This change was prompted by the Kconfig changes but looking back in time the CONFIG_ARM_{32,64} variables existed before Kconfig so this should just be a generic cleanup. Signed-off-by: Doug Goldstein <cardoe@xxxxxxxxxx> --- xen/arch/arm/Makefile | 8 ++++---- xen/arch/arm/Rules.mk | 18 ++++-------------- xen/drivers/passthrough/Makefile | 2 +- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 2f050f5..0d11c0f 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -1,7 +1,7 @@ -subdir-$(arm32) += arm32 -subdir-$(arm64) += arm64 +subdir-$(CONFIG_ARM_32) += arm32 +subdir-$(CONFIG_ARM_64) += arm64 subdir-y += platforms -subdir-$(arm64) += efi +subdir-$(CONFIG_ARM_64) += efi obj-$(EARLY_PRINTK) += early_printk.o obj-y += cpu.o @@ -52,7 +52,7 @@ ALL_OBJS := $(TARGET_SUBARCH)/head.o $(ALL_OBJS) $(TARGET): $(TARGET)-syms $(TARGET).axf $(OBJCOPY) -O binary -S $< $@ -ifeq (arm64,$(XEN_TARGET_ARCH)) +ifdef CONFIG_ARM_64 ln -sf $(notdir $@) ../../$(notdir $@).efi endif diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 4947e64..0aea282 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -11,22 +11,12 @@ CFLAGS += -I$(BASEDIR)/include $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS)) $(call cc-option-add,CFLAGS,CC,-Wnested-externs) -arm := y - -ifeq ($(TARGET_SUBARCH),arm32) # Prevent floating-point variables from creeping into Xen. -CFLAGS += -msoft-float -CFLAGS += -mcpu=cortex-a15 -arm32 := y -arm64 := n -endif +CFLAGS-$(CONFIG_ARM_32) += -msoft-float +CFLAGS-$(CONFIG_ARM_32) += -mcpu=cortex-a15 -ifeq ($(TARGET_SUBARCH),arm64) -CFLAGS += -mcpu=generic -CFLAGS += -mgeneral-regs-only # No fp registers etc -arm32 := n -arm64 := y -endif +CFLAGS-$(CONFIG_ARM_64) += -mcpu=generic +CFLAGS-$(CONFIG_ARM_64) += -mgeneral-regs-only # No fp registers etc ifneq ($(call cc-option,$(CC),-fvisibility=hidden,n),n) CFLAGS += -DGCC_HAS_VISIBILITY_ATTRIBUTE diff --git a/xen/drivers/passthrough/Makefile b/xen/drivers/passthrough/Makefile index ca84e36..6087333 100644 --- a/xen/drivers/passthrough/Makefile +++ b/xen/drivers/passthrough/Makefile @@ -1,7 +1,7 @@ subdir-$(CONFIG_X86) += vtd subdir-$(CONFIG_X86) += amd subdir-$(CONFIG_X86) += x86 -subdir-$(arm) += arm +subdir-$(CONFIG_ARM) += arm obj-y += iommu.o obj-$(CONFIG_X86) += io.o -- 2.4.10 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |