From patchwork Fri Jan 27 21:53:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 92727 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp445216qgi; Fri, 27 Jan 2017 13:55:37 -0800 (PST) X-Received: by 10.28.227.133 with SMTP id a127mr4590638wmh.104.1485554137653; Fri, 27 Jan 2017 13:55:37 -0800 (PST) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id g18si4224752wme.152.2017.01.27.13.55.37; Fri, 27 Jan 2017 13:55:37 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AD6CEA75E6; Fri, 27 Jan 2017 22:55:11 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id y0JdVcN4X5_B; Fri, 27 Jan 2017 22:55:11 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 453D6B3878; Fri, 27 Jan 2017 22:54:48 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4DAF6B3874 for ; Fri, 27 Jan 2017 22:54:36 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4JpNCUVECJD0 for ; Fri, 27 Jan 2017 22:54:36 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from conuserg-11.nifty.com (conuserg-11.nifty.com [210.131.2.78]) by theia.denx.de (Postfix) with ESMTPS id A75D3A75FB for ; Fri, 27 Jan 2017 22:54:26 +0100 (CET) Received: from grover.sesame (FL1-111-169-71-157.osk.mesh.ad.jp [111.169.71.157]) (authenticated) by conuserg-11.nifty.com with ESMTP id v0RLs2XA015159; Sat, 28 Jan 2017 06:54:11 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com v0RLs2XA015159 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1485554051; bh=8mlMMO0ozUcMPq7jGeKDuWShk3shCGds3HNuGCnam6E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rGoSnWV6lCCVFUhCVHYD5Y4DV/QcZPqO9q170a0/xKc8t3NCHIYRnSHPxdSrNyyzo FuiXDbzVmFiPusDYgKL+z9LcnVyztiJfr+wEkqaGq3rP9vDuWotS5d2u2CnhrhhPGK ibXZLox+kP6bThA7o/FFCWQr3OpXrwS1JUKm5JXZdg8aM6N3L0c847CZj/S3I2ociO Ol/1QWHQC8MUcQP/BnRxd+zrBCgbo5xXHLk0g8gK0pDd3s1fpehoqr4nTZ2K8KAfsy YlCIaTA6hVPst2g6fFh6arPaQmFosRJ6ISwsQP+9o0iu3OlS7bmO60Bn7XpH2GQBbc K2HjlBT2pnOVg== X-Nifty-SrcIP: [111.169.71.157] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Sat, 28 Jan 2017 06:53:52 +0900 Message-Id: <1485554036-29320-13-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485554036-29320-1-git-send-email-yamada.masahiro@socionext.com> References: <1485554036-29320-1-git-send-email-yamada.masahiro@socionext.com> Cc: Albert Aribaud Subject: [U-Boot] [PATCH 12/16] ARM: uniphier: change the offset to environment storage area X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" When ARM Trusted Firmware is used, bl1.bin + fip.bin exceeds 512KB, so the boot image and the current environment area will overlap. Move the environment storage to 1MB offset. Signed-off-by: Masahiro Yamada --- include/configs/uniphier.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 0ffd507..a53d2e3 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -80,7 +80,7 @@ /* #define CONFIG_ENV_IS_NOWHERE */ /* #define CONFIG_ENV_IS_IN_NAND */ #define CONFIG_ENV_IS_IN_MMC -#define CONFIG_ENV_OFFSET 0x80000 +#define CONFIG_ENV_OFFSET 0x100000 #define CONFIG_ENV_SIZE 0x2000 /* #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) */