From patchwork Wed Apr 17 23:57:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1087310 X-Patchwork-Delegate: sbabic@denx.de 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44kzkf3t6gz9s00 for ; Thu, 18 Apr 2019 10:00:10 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 1A786C21C27; Wed, 17 Apr 2019 23:58:58 +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=SPF_HELO_PASS 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 69C70C21CB1; Wed, 17 Apr 2019 23:58:09 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 44161C21E1B; Wed, 17 Apr 2019 23:57:55 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id 5E211C21DC1 for ; Wed, 17 Apr 2019 23:57:51 +0000 (UTC) Received: from marcel-nb-toradex-int.lan ([81.221.130.80]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MEm8C-1h5Ilk3E8g-00FyUJ; Thu, 18 Apr 2019 01:57:47 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Thu, 18 Apr 2019 01:57:22 +0200 Message-Id: <20190417235732.13643-5-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190417235732.13643-1-marcel@ziswiler.com> References: <20190417235732.13643-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:zR+fBEOexde/uPF7UP8G8rKMn7BFBfsOia5ZcihDKN/f3NScT+7 WT7bAtEAhzesr3eET9Ahxc5Sywr9OE7VHZBgr3vU/bz0JIyzCwNHQsDLkEqRG7pjXNpiuow IHSH4w4lJH4qXsmGCrzV2FHEuCmLLF9/jegGKqfbw2gUYdSIPxOX9jyh8iBFfSThTLfRu41 wWPWuX/k72avTCN2NrTrQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:aMU98UToUvw=:PvQ0TQz4hxlSNNghgerMyw p5GheBQArIAFBAP07ezqiHL3xgIU/GN4Zs6Z/hmW0cTRCRFJQSbD18g5KWvTqg1o7GFT1e7aA V0+t7BzKw3ZSNOgM5Uxm61O3E4FLrvV8cBTH5qogda/xCjKnWFe6W4QZiqFJpwWVa1rhWhGV5 c4z9f9JzdiU05OeYpP+H1B0kzIWclcm7tluNcko+/2TjMDNdEMQ0qytVKNohqxpFby9qYyDp6 KhbUOULuTX9HYdfAyDnooGFRXdX1+RMVSmjNmxW3MWz87zZb06KcmZmaDWARr2HV+1zWWUfPm UZBZMTrwMGYEgIsUFNt+XygBzr6MvbnyRwKxeSkWEvP5yCNshMl5KJQ4yYrfbzhk16dxRuahn 7j6A8WiIyeCU5yglhfn8LbdNt1Z62i0wYJV2BZfa1Vfs6BgZ8pgxUYU3IKh8V9sfsn1wbe3Dv lzVe5mK4gQuTmHWg0Szda564Mg7IuqYEsgZXDwYt36hTBJ1+sK3UQ5zKvun7hUb5cQMDVDvdY sU65mguH7OldFDV0iqVQ0I208UvzeFz3RaDa+6OlpvbUNktUjoYWdUkzMhbZqNL4Rw9K/gXwf eKU9AZRWouJ91OkZMPXG7pi8PTds2YW89si8/kwGao9FgGuEU4wXw3GjND1sBVCsQepdCsOiD LJZ6w8Q4rQfma4R6/IaWHbYANkqovUiOje/UAT4f1IxrWg/gIFSNnEjsaTSMck31XOrQtndTp laWWQNQQ9LM76lXGJg60EhyDNMkjQByfiEXpjA== Cc: Marcel Ziswiler , Toradex ARM Support , Igor Opaniuk , Max Krummenacher , Stefan Agner Subject: [U-Boot] [PATCH v3 04/14] apalis/colibri_imx6/imx6ull: make sure loadaddr does not collide 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Stefan Agner Currently $loadaddr and $fdt_addr_r point to the same address. This might be not ideal for some distro boot scripts which make use of $loadaddr after loading the device tree. Make sure the two variables point to two different addresses. Moving $loadaddr is not entirly trivial since it is defined in mx6_common.h. Move $fdt_addr_r and $ramdisk_addr_r by 1MiB, which should be enough for scripts. Signed-off-by: Stefan Agner Acked-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- Changes in v3: None Changes in v2: - Added Igor's reviewed-by. include/configs/apalis_imx6.h | 4 ++-- include/configs/colibri-imx6ull.h | 4 ++-- include/configs/colibri_imx6.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 96169f55f0..91054d8c05 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -138,12 +138,12 @@ #define MEM_LAYOUT_ENV_SETTINGS \ "bootm_size=0x20000000\0" \ - "fdt_addr_r=0x12000000\0" \ + "fdt_addr_r=0x12100000\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "kernel_addr_r=0x11000000\0" \ "pxefile_addr_r=0x17100000\0" \ - "ramdisk_addr_r=0x12100000\0" \ + "ramdisk_addr_r=0x12200000\0" \ "scriptaddr=0x17000000\0" #define NFS_BOOTCMD \ diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 7cf550cf9e..31248b14a1 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -48,12 +48,12 @@ #define MEM_LAYOUT_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ - "fdt_addr_r=0x82000000\0" \ + "fdt_addr_r=0x82100000\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "kernel_addr_r=0x81000000\0" \ "pxefile_addr_r=0x87100000\0" \ - "ramdisk_addr_r=0x82100000\0" \ + "ramdisk_addr_r=0x82200000\0" \ "scriptaddr=0x87000000\0" #define NFS_BOOTCMD \ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 803c9be064..fecea95d32 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -128,12 +128,12 @@ #define MEM_LAYOUT_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ - "fdt_addr_r=0x12000000\0" \ + "fdt_addr_r=0x12100000\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "kernel_addr_r=0x11000000\0" \ "pxefile_addr_r=0x17100000\0" \ - "ramdisk_addr_r=0x12100000\0" \ + "ramdisk_addr_r=0x12200000\0" \ "scriptaddr=0x17000000\0" #define NFS_BOOTCMD \