From patchwork Thu Jan 28 16:36:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 8152421 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5C9309F440 for ; Thu, 28 Jan 2016 16:39:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7250520340 for ; Thu, 28 Jan 2016 16:39:30 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8A7402013D for ; Thu, 28 Jan 2016 16:39:29 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aOpZ3-0005Qn-CG; Thu, 28 Jan 2016 16:36:57 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aOpZ1-0005Qi-Rc for xen-devel@lists.xen.org; Thu, 28 Jan 2016 16:36:55 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 6E/96-09708-7A34AA65; Thu, 28 Jan 2016 16:36:55 +0000 X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1453999013!12682663!1 X-Originating-IP: [209.85.160.194] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31106 invoked from network); 28 Jan 2016 16:36:54 -0000 Received: from mail-yk0-f194.google.com (HELO mail-yk0-f194.google.com) (209.85.160.194) by server-11.tower-21.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 28 Jan 2016 16:36:54 -0000 Received: by mail-yk0-f194.google.com with SMTP id y10so3705693ykf.0 for ; Thu, 28 Jan 2016 08:36:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cardoe-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=v9gZtX7P7ZDCFo1EwW5FmipYjIEqtI/j6EiRsxsLThs=; b=IK9DAjboI+8i9Anm6ayrftJtOHG7A4KJ5smaVD4zSj0LeyXqeN9/mScqHU2W9CvfvH pVZsFPGFvh850nzXSTj8U2A2JGf+Dsf5ay1/OWvg1bFUpppe9t0L3VRjD8zk7Lwi0UrQ vS7pwNi5fUVaoFlQ0rQhD1y3YSga/LOUzBHs573zzWzBqtVhYRbwXFLiMn4sdlNvQHGk Rmn9vFsmkb+mZNkXYIhNIERgArb23yuLOdx/J4a5/BGiW/2Ldp5OTH00dhycF/Kcl0fK 26FSa9eLfKgF5u11Z6TO0SkQkEuxYns9WZQT+PnYtXTSYWig3duQYTCQESHJjk0wqClJ IFbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=v9gZtX7P7ZDCFo1EwW5FmipYjIEqtI/j6EiRsxsLThs=; b=VJbPfZY48pciqRQXdllXsABWYP4JLpyGQYX3B2aqIy4xt70rwnP0ud40DL8tRiW6Hr 55zHNd9UF6J/gPnLByh09JrHZkMyb2UQQxvRHdYQnRyowWNJXFlTRisOKbVbE6NTwyIl I6MuVT9PWCgPJL9PKdIA/FMV9DUyY5x7tmCcGVb4C13MpFNpxq/287fKqHZRyD2hEjxt GU+0qTCf8MvtWtK+7lXGIwVGbSAqdNHV2gcr5kjeU6et0r45Zz1ia6Qx6BnScqd9T8/n oHSN/lWEm7PecNFOme2IpdLq6GfLQ/uBa5NrQq5gyv8MUuHkB9L8erw9RUiuOqu2I0p5 FpVA== X-Gm-Message-State: AG10YORv66UhhSVtxuY55lNsO8xLqvoqhMuX/53KLp9tTsSQsl5LQB0klAQwYgPelI2sFA== X-Received: by 10.13.210.7 with SMTP id u7mr2051379ywd.100.1453999013280; Thu, 28 Jan 2016 08:36:53 -0800 (PST) Received: from swanson.lan (c-68-46-196-185.hsd1.al.comcast.net. [68.46.196.185]) by smtp.gmail.com with ESMTPSA id t11sm8963754ywg.16.2016.01.28.08.36.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Jan 2016 08:36:51 -0800 (PST) From: Doug Goldstein To: xen-devel@lists.xen.org Date: Thu, 28 Jan 2016 10:36:45 -0600 Message-Id: <1453999005-11382-1-git-send-email-cardoe@cardoe.com> X-Mailer: git-send-email 2.4.10 Cc: Doug Goldstein , Stefano Stabellini , Ian Campbell , Jan Beulich Subject: [Xen-devel] [PATCH v2] arm: clean up build variables X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Jan Beulich --- change from v1: - switch to ifeq ($(CONFIG_ARM_64),y) from ifdef CONFIG_ARM_64 --- 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..9982a93 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)) +ifeq ($(CONFIG_ARM_64),y) 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