From patchwork Fri Feb 3 19:20:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 93314 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp738531qgi; Fri, 3 Feb 2017 11:22:06 -0800 (PST) X-Received: by 10.36.111.143 with SMTP id x137mr2107523itb.42.1486149726597; Fri, 03 Feb 2017 11:22:06 -0800 (PST) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id w137si1967935itb.65.2017.02.03.11.22.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Feb 2017 11:22:06 -0800 (PST) Received-SPF: neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cZjPj-0006Lg-JQ; Fri, 03 Feb 2017 19:20:55 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cZjPi-0006KX-BQ for xen-devel@lists.xen.org; Fri, 03 Feb 2017 19:20:54 +0000 Received: from [193.109.254.147] by server-6.bemta-6.messagelabs.com id F2/61-15112-518D4985; Fri, 03 Feb 2017 19:20:53 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrFLMWRWlGSWpSXmKPExsVysyfVTVf0xpQ Igy/zBC2WfFzM4sDocXT3b6YAxijWzLyk/IoE1ox1nduZCw7xV8xb69vA+JCni5GLQ0hgE6PE gbc/GSGc04wSGy79BnI4OdgENCXufP7EBGKLCEhLXPt8GSzOLJAm8WRKF5gtLOAocejoOmYQm 0VAVaL7ySw2EJtXwEWidcNKsBoJATmJk8cms05g5FzAyLCKUaM4tagstUjX0EQvqSgzPaMkNz EzR9fQwEwvN7W4ODE9NScxqVgvOT93EyPQXwxAsIPx+saAQ4ySHExKorz616dECPEl5adUZiQ WZ8QXleakFh9ilOHgUJLglQHJCRalpqdWpGXmAAMHJi3BwaMkwqsIkuYtLkjMLc5Mh0idYtTl OHXj9EsmIZa8/LxUKXFeB5AiAZCijNI8uBGwIL7EKCslzMsIdJQQT0FqUW5mCar8K0ZxDkYlY V4rkCk8mXklcJteAR3BBHTEz8eTQI4oSURISTUwKl9rsF2/xDU1O/P2tpKH9ybuvZWud2R6jn brnA9HJrxcLq60nr/dWzRD/cGh7ibrGT7Pmh9++31/g4pGg3xQl6ZqmOX9XIGGLLXZ696JJXx gkZHv2tm6b7bQqT1Rm71mNa3/rVVmHzzj/f2T/xkXqHz/sSpuV935Eke9P+7brudMDJ24efWR diWW4oxEQy3mouJEAL0NeXhdAgAA X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1486149652!85008245!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 57027 invoked from network); 3 Feb 2017 19:20:53 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-3.tower-27.messagelabs.com with SMTP; 3 Feb 2017 19:20:53 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8EFA2AD7; Fri, 3 Feb 2017 11:20:52 -0800 (PST) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.218.32]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D0E3B3F242; Fri, 3 Feb 2017 11:20:51 -0800 (PST) From: Julien Grall To: xen-devel@lists.xen.org Date: Fri, 3 Feb 2017 19:20:46 +0000 Message-Id: <1486149646-20602-1-git-send-email-julien.grall@arm.com> X-Mailer: git-send-email 1.9.1 Cc: Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH] xen/arm: Remove build option CONFIG_LOAD_ADDRESS X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" The build option CONFIG_LOAD_ADDRESS is defined but never plumbed through. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- config/arm32.mk | 2 -- config/arm64.mk | 2 -- xen/arch/arm/Makefile | 2 +- xen/arch/arm/xen.lds.S | 4 ++-- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/config/arm32.mk b/config/arm32.mk index 001e214..f95228e 100644 --- a/config/arm32.mk +++ b/config/arm32.mk @@ -12,6 +12,4 @@ CFLAGS += -marm # Use only if calling $(LD) directly. LDFLAGS_DIRECT += -EL -CONFIG_LOAD_ADDRESS ?= 0x80000000 - IOEMU_CPU_ARCH ?= arm diff --git a/config/arm64.mk b/config/arm64.mk index 5a8e534..aa45772 100644 --- a/config/arm64.mk +++ b/config/arm64.mk @@ -9,8 +9,6 @@ CFLAGS += #-marm -march= -mcpu= etc # Use only if calling $(LD) directly. LDFLAGS_DIRECT += -EL -CONFIG_LOAD_ADDRESS ?= 0x80000000 - IOEMU_CPU_ARCH ?= aarch64 EFI_DIR ?= /usr/lib64/efi diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 91cb3f3..0ce94a8 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -114,7 +114,7 @@ asm-offsets.s: $(TARGET_SUBARCH)/asm-offsets.c $(CC) $(filter-out -flto,$(CFLAGS)) -S -o $@ $< xen.lds: xen.lds.S - $(CC) -P -E -Ui386 $(AFLAGS) -DXEN_PHYS_START=$(CONFIG_LOAD_ADDRESS) -o $@ $< + $(CC) -P -E -Ui386 $(AFLAGS) -o $@ $< sed -e 's/xen\.lds\.o:/xen\.lds:/g' <.xen.lds.d >.xen.lds.d.new mv -f .xen.lds.d.new .xen.lds.d diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S index ddef595..94b7049 100644 --- a/xen/arch/arm/xen.lds.S +++ b/xen/arch/arm/xen.lds.S @@ -21,7 +21,7 @@ OUTPUT_ARCH(FORMAT) PHDRS { - text PT_LOAD /* XXX should be AT ( XEN_PHYS_START ) */ ; + text PT_LOAD ; #if defined(BUILD_ID) note PT_NOTE ; #endif @@ -30,7 +30,7 @@ SECTIONS { . = XEN_VIRT_START; _start = .; - .text : /* XXX should be AT ( XEN_PHYS_START ) */ { + .text : { _stext = .; /* Text section */ *(.text) *(.text.cold)