mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
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@cardoe.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
[ ijc -- switch from ifdef X to ifeq (X,y) in one place as discussed ]
This commit is contained in:
Doug Goldstein authored and Ian Campbell committed
1 parent
9937763265
commit
a9da09b864
3 files changed
+9
-19
No files matched your search
@@ -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))
|
||||
ifeq ($(CONFIG_ARM_64),y)
|
||||
ln -sf $(notdir $@) ../../$(notdir $@).efi
|
||||
endif
|
||||
|
||||
|
||||
+4
-14
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||