From: Doug Goldstein <cardoe@cardoe.com>
To: xen-devel@lists.xen.org
Cc: Doug Goldstein <cardoe@cardoe.com>,
Stefano Stabellini <stefano.stabellini@citrix.com>,
Ian Campbell <ian.campbell@citrix.com>,
Jan Beulich <jbeulich@suse.com>
Subject: [PATCH] arm: clean up build variables
Date: Wed, 20 Jan 2016 15:47:59 -0600 [thread overview]
Message-ID: <1453326479-19885-1-git-send-email-cardoe@cardoe.com> (raw)
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>
---
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
next reply other threads:[~2016-01-20 21:47 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-20 21:47 Doug Goldstein [this message]
2016-01-21 10:56 ` [PATCH] arm: clean up build variables Jan Beulich
2016-01-25 11:27 ` Ian Campbell
2016-01-27 14:30 ` Doug Goldstein
2016-01-27 14:44 ` Jan Beulich
2016-01-27 15:05 ` Ian Campbell
2016-01-27 15:11 ` Doug Goldstein
2016-01-27 15:24 ` Ian Campbell
2016-01-27 15:26 ` Doug Goldstein
2016-01-29 14:35 ` Ian Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453326479-19885-1-git-send-email-cardoe@cardoe.com \
--to=cardoe@cardoe.com \
--cc=ian.campbell@citrix.com \
--cc=jbeulich@suse.com \
--cc=stefano.stabellini@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.