From patchwork Wed Jan 18 23:27:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 9524981 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0887E6020B for ; Wed, 18 Jan 2017 23:28:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F065028596 for ; Wed, 18 Jan 2017 23:28:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E54A428633; Wed, 18 Jan 2017 23:28:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 241092862E for ; Wed, 18 Jan 2017 23:28:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751617AbdARX1g (ORCPT ); Wed, 18 Jan 2017 18:27:36 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:45366 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751596AbdARX1b (ORCPT ); Wed, 18 Jan 2017 18:27:31 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 5378B60909; Wed, 18 Jan 2017 23:27:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1484782048; bh=qpq04PMw4i3BJNFREAYeb8+9MdUHcmk8RUJ3ilFPWgg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ba3oG+k9vNBUJ1Vi/hlB1sRTUagDxXk1Uf6fSHH2tdsoaoYV2NIDzOiVeXDvNjC/3 JCqRq0UPNkbhwySRTzy9YvlbNAdJk030ty+QjFG8P6+OKQ+N7J1qu7CSKROa0tlNUY zrKq+anRXLXJ/7Wq8jHl1MH4nldG0LP6RJRC9KLk= Received: from sboyd-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sboyd@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id B196F6088D; Wed, 18 Jan 2017 23:27:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1484782047; bh=qpq04PMw4i3BJNFREAYeb8+9MdUHcmk8RUJ3ilFPWgg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S1v7kuRBl5PqudCh8TvULC6yhz9cQBH7MtsydfscJXu2b/VmE+bGWGEUzyvKxUvcN 3DzpLLJJwdDr/1LhhLQRyLkEmpapUXu8a64h0DlKulA90eCy2hJfMS9GmmGNO9pOOf 0EENC8Z+KnT56nMn4RkV5Bfvd4S8YUtC7ddO+kss= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org B196F6088D Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=sboyd@codeaurora.org From: Stephen Boyd To: Andy Gross Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/5] ARM: Makefile: Generalize qcom platform text offset Date: Wed, 18 Jan 2017 15:27:23 -0800 Message-Id: <20170118232726.22876-3-sboyd@codeaurora.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170118232726.22876-1-sboyd@codeaurora.org> References: <20170118232726.22876-1-sboyd@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Some qcom platforms need a specific text offset because the first 2MB of memory is reserved for shared memory. Let's just always shift the text segment up by 2MB when ARCH_QCOM is selected so that we don't have to specify the specific platforms that exhibit this problem in Kconfig. Signed-off-by: Stephen Boyd --- arch/arm/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index ab30cc634d02..8a6d344e6043 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -145,8 +145,7 @@ textofs-$(CONFIG_PM_H1940) := 0x00108000 ifeq ($(CONFIG_ARCH_SA1100),y) textofs-$(CONFIG_SA1111) := 0x00208000 endif -textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000 -textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000 +textofs-$(CONFIG_ARCH_QCOM) := 0x00208000 textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000 # Machine directory name. This list is sorted alphanumerically