From patchwork Sun Aug 27 16:02:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 806263 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xgKQw4FhMz9s8V for ; Mon, 28 Aug 2017 02:01:59 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 4B983C22245; Sun, 27 Aug 2017 16:01:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E7E9FC220CF; Sun, 27 Aug 2017 16:01:50 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B4FF7C220CF; Sun, 27 Aug 2017 16:01:49 +0000 (UTC) Received: from mail-yw0-f196.google.com (mail-yw0-f196.google.com [209.85.161.196]) by lists.denx.de (Postfix) with ESMTPS id 20B7CC22219 for ; Sun, 27 Aug 2017 16:01:49 +0000 (UTC) Received: by mail-yw0-f196.google.com with SMTP id s187so788463ywf.2 for ; Sun, 27 Aug 2017 09:01:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=QURJ08wQVvl1ovmubjV5lnyvQIxlAqEWHznmDIld9ss=; b=RzaF+248Wy6oVYU1WjWBFEPwEFJshP/KUwV8TOpv6azzGcirLb9SR9x45uhkUIhbaH KiDPaYzepjQSxHZjj67OYhW80hcXYXE7xk39Zkl7Jf93yE9/BIxvs8RpgtFBanpvCIuX +5759ZH1RIj7oKODd5Y+YZX/hCNz0Y2dxPwaw2roDb7YVVjA/M7pFDCMhe0w+UUPK8JD HudW7jwzWjLYKphCimcZr6X7Y264vrET5uFxR7C0ovkx2MwNzy0eVVNhKLgAXzoEkuGe PtGrwYkK3TTaDsLraMTTkmIokqIznbSnnGsYetWpg4V/aIGE5RpelS6AqdjO1R1SBnbL Y1bQ== X-Gm-Message-State: AHYfb5imSiXCcuOD9spLNVTRtRQjwQAjsfZsDPR3XAnXJBHNs8QY78mA JNr6/P+BquZgQy9S X-Received: by 10.37.97.215 with SMTP id v206mr4201090ybb.198.1503849707366; Sun, 27 Aug 2017 09:01:47 -0700 (PDT) Received: from localhost.localdomain (cpe-174-106-0-58.ec.res.rr.com. [174.106.0.58]) by smtp.gmail.com with ESMTPSA id q127sm4163821ywb.10.2017.08.27.09.01.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 27 Aug 2017 09:01:45 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Sun, 27 Aug 2017 12:02:00 -0400 Message-Id: <1503849720-21739-1-git-send-email-trini@konsulko.com> X-Mailer: git-send-email 1.9.1 Subject: [U-Boot] [PATCH] sh: Fix linking of ms7722se X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" While it is true that we no longer have 'ppcenv' and similar sections, including env/embedded.o at all results in the text/etc sections being available for the rest of the link. This in turn is required for the setup used on ms7722se. This also, likely, needs further fine-tuning. Fixes: f40ad66fa066 ("arch/sh: don't bring common/env_embedded.o into the link") Signed-off-by: Tom Rini --- arch/sh/cpu/u-boot.lds | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/sh/cpu/u-boot.lds b/arch/sh/cpu/u-boot.lds index 2f2bdb5b83ea..db5b14c5540e 100644 --- a/arch/sh/cpu/u-boot.lds +++ b/arch/sh/cpu/u-boot.lds @@ -38,6 +38,10 @@ SECTIONS KEEP(CONFIG_BOARDDIR/lowlevel_init.o (.text .spiboot1.text)) KEEP(*(.spiboot2.text)) . = ALIGN(8192); +#ifdef CONFIG_ENV_IS_IN_FLASH + env/embedded.o (.doesnotexist) + . = ALIGN(8192); +#endif *(.text) . = ALIGN(4); } >ram =0xFF