From patchwork Tue May 6 14:12:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 4122121 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3A79F9F23C for ; Tue, 6 May 2014 14:15:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 75693201C8 for ; Tue, 6 May 2014 14:15:17 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B1696200E1 for ; Tue, 6 May 2014 14:15:16 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Whg7M-00038r-TN; Tue, 06 May 2014 14:13:12 +0000 Received: from mail-wg0-f46.google.com ([74.125.82.46]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Whg7J-00033m-9j for linux-arm-kernel@lists.infradead.org; Tue, 06 May 2014 14:13:09 +0000 Received: by mail-wg0-f46.google.com with SMTP id n12so7169075wgh.5 for ; Tue, 06 May 2014 07:12:46 -0700 (PDT) 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=auXxWsgXH+7g6LLhzybisCf3Nt3Md+TvBP4ihmXbyaU=; b=ZC7fOPtXqvyyfoQYEuv13iYlHutRdKigkQpzTyZRYA9CH4NCw/QIV4xy3GEVl0vTs+ 3i8968EuYTx5owfwCM6D0EM1xcwWRViHakV5kxCZ9NDaFWwraPlf5C4/z+7pgycIRJVs JIRzAB92l8IhRgoUtChMQqvW21CX3kOKZzLVlh1hPGKyRL/vU3ZSGQQQxBUcznrGwKCo Ln40f/8BP+0+LTFXsZGuk9ZSuXj3zgF9szE7aKm98FfgH7K7B3C+LqifbN1SNkq9yYPQ OKA9L38Wj/jixzJo3O+dIOP2krTEbRdV6FwFJBRTAmAWch64+zpARSE1F2o2gXZG1vk9 4BsQ== X-Gm-Message-State: ALoCoQl4awH7NClt65kSX9dkeTTHTTUrY1GdFKLuDy54jxcO4QE5rZKtjgJiRrx+pwMR1U1Pv87h X-Received: by 10.194.82.9 with SMTP id e9mr8147446wjy.45.1399385566734; Tue, 06 May 2014 07:12:46 -0700 (PDT) Received: from sundance.lan (cpc4-aztw19-0-0-cust157.18-1.cable.virginm.net. [82.33.25.158]) by mx.google.com with ESMTPSA id xm20sm24946556wib.19.2014.05.06.07.12.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 May 2014 07:12:45 -0700 (PDT) From: Daniel Thompson To: Russell King Subject: [PATCH] arm: Describe required sort order for textofs-y (TEXT_OFFSET) Date: Tue, 6 May 2014 15:12:28 +0100 Message-Id: <1399385548-17892-1-git-send-email-daniel.thompson@linaro.org> X-Mailer: git-send-email 1.9.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140506_071309_488621_91655DEF X-CRM114-Status: GOOD ( 10.93 ) X-Spam-Score: 1.8 (+) Cc: Daniel Thompson , linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, patches@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, SUSPICIOUS_RECIPS,UNPARSEABLE_RELAY autolearn=no 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 The section of the makefile that determines the TEXT_OFFSET is sorted by address so that, in multi-arch kernel builds, the architecture with the most stringent requirements for the kernel base address gets to define TEXT_OFFSET. The comment should reflect that. Signed-off-by: Daniel Thompson --- arch/arm/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 41c1931..6857fec 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -127,6 +127,9 @@ CHECKFLAGS += -D__arm__ #Default value head-y := arch/arm/kernel/head$(MMUEXT).o + +# Text offset. This list is sorted numerically by address in order to +# provide a means to avoid/resolve conflicts in multi-arch kernels. textofs-y := 0x00008000 textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000 # We don't want the htc bootloader to corrupt kernel during resume