From patchwork Wed Jan 20 21:47:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 8074321 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 24094BEEE5 for ; Wed, 20 Jan 2016 21:51:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4495720567 for ; Wed, 20 Jan 2016 21:51:36 +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 4D1C12055C for ; Wed, 20 Jan 2016 21:51:35 +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 1aM0c5-0001Yr-JD; Wed, 20 Jan 2016 21:48:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aM0bu-0001Yl-ER for xen-devel@lists.xen.org; Wed, 20 Jan 2016 21:48:21 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 69/35-10115-D9000A65; Wed, 20 Jan 2016 21:48:13 +0000 X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1453326491!18286880!1 X-Originating-IP: [209.85.160.172] 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 64771 invoked from network); 20 Jan 2016 21:48:12 -0000 Received: from mail-yk0-f172.google.com (HELO mail-yk0-f172.google.com) (209.85.160.172) by server-10.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 20 Jan 2016 21:48:12 -0000 Received: by mail-yk0-f172.google.com with SMTP id a85so26467873ykb.1 for ; Wed, 20 Jan 2016 13:48:12 -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=PWUpTkaxxNc6Feu/ye9R0Pds6dKCbVlFnOWzIcJ6AEw=; b=17XHZd9Xl7//T4RMG5PbQkQmxXGDabbVjFC86YqrvUTM5JB08tX+mA5MAHy6HMaCTm ZxSHDWIdzn1q+0spUGr+m1b2gZwNpQEY/4H12XJFZaiEBGrbJpVYkRA2rxGGMf0adlYF YnTSQ+IHr1dAWddFvL2Z7X9y6O7/uDRhGp0mqY4QMPxciRnSwpGolQzcD+OK30Oe/csQ S8wA8iFDhEw4m7qUmk8HaeeC7zVr9pcCNpJx8M4IKsaljfyNqxl6pAwikxOTRjs7jdQg 7x8MIcjWGZdySCOZYm+MfvMKQukA4rloe/yPTP68Zj+qgxBes52XUvedJ7jF0RPKt//H yRkA== 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=PWUpTkaxxNc6Feu/ye9R0Pds6dKCbVlFnOWzIcJ6AEw=; b=dTXszEV9aFxYu6qCmNlXqeNGk3B4bluTBuNUwea2RHr4o+wVmRei+lXpCIq6RnNw2P 4kTztrgkvBU3x3QxbeYsa6gh6gp6X8Chyih3WgqxdmMI9bn1Bfj0Tvcat5GjT5KQVn1X soslKC/WdHPhdztKC6J5VsSJPgbgBaqY8VXFFG1wGJf4bI8lejxfVMWXK6s2pYm0ZawI /K+vpkavySzD+tJXkLQzPF68J/QOKJop8NbjXm/ymcKYaAm/VskvFGr4UxoJ0TsH0KZC 0Jqad7xJo2zqYPSzArgvNRrXs2on+kmXbYVWbVx6gNPpq/FvZnMLSX1KX5JaWXOb+glF D0Aw== X-Gm-Message-State: ALoCoQkSSQOT2azhJgOj0KAjtf6fmHY2BJI15r/SraUWIkugRlFDQxStpp3L7bdmmFrrB17pNT4yRYmit8hUpARTJT5hDlagcQ== X-Received: by 10.37.231.215 with SMTP id e206mr11421620ybh.140.1453326491618; Wed, 20 Jan 2016 13:48:11 -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 i81sm26605496ywe.28.2016.01.20.13.48.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Jan 2016 13:48:10 -0800 (PST) From: Doug Goldstein To: xen-devel@lists.xen.org Date: Wed, 20 Jan 2016 15:47:59 -0600 Message-Id: <1453326479-19885-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] 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 --- 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