From patchwork Thu Feb 22 10:00:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 129172 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp416453lja; Thu, 22 Feb 2018 02:00:43 -0800 (PST) X-Google-Smtp-Source: AH8x224Fe+3ARD9ac9tcQyvuPzhYgVd5VtDeQyNpQgHK679+a5p5rJdWWVHd4B4BgZoxg50XdmVM X-Received: by 10.80.163.173 with SMTP id s42mr8719451edb.25.1519293642939; Thu, 22 Feb 2018 02:00:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519293642; cv=none; d=google.com; s=arc-20160816; b=eSunv7ZSyOYDSqEB2GH1i7+nM7PMgrdMsGS/1Hr9OgMbGeHP5sVmTgVn92tD74WNwZ m5DaxrU9ZmKPTyfymL4MtWJWzuAaaqVo9veMVSX2n2NWVHM/Pk2cu2nhexZR1np3FTBc VBNFGhEekMtbXRNpUtseZdXZ10mV48H1GVJm/d+SXgg5Ax0CPayclQh56ORgDrWBSa47 PboeknlXmklEnAI2+6shHTxVGLcbIHd22vxuBX+36OxCMSQT+yB05IPlECBSTyltfhNK G6+gsShy8WLcDbufXV7BYp2X85QUKQ7jOSNikrUCXH9CQ0i50ahLRTyg1WKjqze2TtXg FmAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :dkim-filter:arc-authentication-results; bh=XXXHNj7zotqkC8yWQNLW3p/dqtQzOay8DGlai6JhTzM=; b=iyUxvTObxDVg3CykSgmxD8jewOh9IiuBX0tus75nK/tUXU2KD2rjjDCCAZiO+OZQoN M2yxU6XfvIriZIY1RhjxfKAeuLRJpVi5chQ4tPBJdqm48s2GexLfzQBvWUBflBE1SgCN pNXZepzzrZ/YA+1kRBA7rvCP86d01lKKDvdWcfBtPHtK8D17heptj9/2o1w53LRMY8GJ 8D2EmIZv/E6J7HS8bHXNmrIS2x/tr3nW8NvAK0qBpdIJjuLw+teMzRpnvidRa4cbvh7R p7OjINSAoU63GzkG9kWDnUyvnUxTbqR45rTBNt9rVipHo51ozsdJ4Qx3QnrRGjNs533u lVow== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=0OmMSHlI; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id q11si12958edl.91.2018.02.22.02.00.42; Thu, 22 Feb 2018 02:00:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=0OmMSHlI; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 728F6C21F04; Thu, 22 Feb 2018 10:00:40 +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=T_DKIM_INVALID 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 9A682C21C93; Thu, 22 Feb 2018 10:00:38 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 91557C21C93; Thu, 22 Feb 2018 10:00:37 +0000 (UTC) Received: from conuserg-08.nifty.com (conuserg-08.nifty.com [210.131.2.75]) by lists.denx.de (Postfix) with ESMTPS id 3B886C21C50 for ; Thu, 22 Feb 2018 10:00:35 +0000 (UTC) Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id w1MA0CmW002919; Thu, 22 Feb 2018 19:00:12 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w1MA0CmW002919 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1519293613; bh=ttVxQ8H0ckdC95omnIaZ3Y6ouStz2EjH0SbCQz7Borw=; h=From:To:Cc:Subject:Date:From; b=0OmMSHlIomZTVuTdCGip4xTz/2rVWtpu2K95IqL6U0AJVHX5+zhpCiN9D2F6QQ8PU piIrHcf0tC5PB87daTbysf5QbAd3et6rbNQK5vKVTl5eifISDejlV9BMF0OPCI1SnQ I8t2krnkOtnSfRAAH8yU+QyBbjZxGwmrsSqWhIw/Xp/cdG+cph0Hm3baWpMY1PPWAr Opj7D6cZ3Fs1ojEHxPojbSaqCdao83QPshhlg9p5DYlHUZ8klBc4phSdCiRJrJ/Mei zhTd8a7G1H/1P1WP9y/d3YytRqt46oXEcEYFDG6DfTnyy4s62TKjvCk1V3U0RMZR/D bUkIeNdvTR+pw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Thu, 22 Feb 2018 19:00:08 +0900 Message-Id: <1519293608-9114-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Subject: [U-Boot] [PATCH] ARM: uniphier: change load addresses for bigger kernel image 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" The kernel size is getting bigger and bigger. Because the Android common kernel is even bigger than the vanilla kernel, so images overlap with the current memory layout. Change the load address to adjust for a bigger kernel image. Signed-off-by: Masahiro Yamada --- include/configs/uniphier.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 9373233..7688234 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -90,7 +90,7 @@ #define CONFIG_GATEWAYIP 192.168.11.1 #define CONFIG_NETMASK 255.255.255.0 -#define CONFIG_LOADADDR 0x84000000 +#define CONFIG_LOADADDR 0x85000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_BOOTM_LEN (32 << 20) @@ -120,7 +120,7 @@ #define CONFIG_BOOTFILE "fitImage" #define LINUXBOOT_ENV_SETTINGS \ "fit_addr=0x00100000\0" \ - "fit_addr_r=0x84100000\0" \ + "fit_addr_r=0x85100000\0" \ "fit_size=0x00f00000\0" \ "norboot=setexpr fit_addr $nor_base + $fit_addr &&" \ "bootm $fit_addr\0" \ @@ -133,7 +133,7 @@ #ifdef CONFIG_ARM64 #define CONFIG_BOOTFILE "Image.gz" #define LINUXBOOT_CMD "booti" -#define KERNEL_ADDR_LOAD "kernel_addr_load=0x84200000\0" +#define KERNEL_ADDR_LOAD "kernel_addr_load=0x85200000\0" #define KERNEL_ADDR_R "kernel_addr_r=0x82080000\0" #else #define CONFIG_BOOTFILE "zImage" @@ -143,15 +143,15 @@ #endif #define LINUXBOOT_ENV_SETTINGS \ "fdt_addr=0x00100000\0" \ - "fdt_addr_r=0x84100000\0" \ + "fdt_addr_r=0x85100000\0" \ "fdt_size=0x00008000\0" \ "kernel_addr=0x00200000\0" \ KERNEL_ADDR_LOAD \ KERNEL_ADDR_R \ - "kernel_size=0x00800000\0" \ - "ramdisk_addr=0x00a00000\0" \ - "ramdisk_addr_r=0x84a00000\0" \ - "ramdisk_size=0x00600000\0" \ + "kernel_size=0x00e00000\0" \ + "ramdisk_addr=0x01000000\0" \ + "ramdisk_addr_r=0x86000000\0" \ + "ramdisk_size=0x00800000\0" \ "ramdisk_file=rootfs.cpio.uboot\0" \ "boot_common=setexpr bootm_low $kernel_addr_r '&' fe000000 && " \ "if test $kernel_addr_load = $kernel_addr_r; then " \