From patchwork Fri Mar 3 13:26:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrejs Cainikovs X-Patchwork-Id: 1751478 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=cwkvB7G4; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PSpn14QJwz1yWy for ; Sat, 4 Mar 2023 00:32:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 72FE085DA4; Fri, 3 Mar 2023 14:30:30 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="cwkvB7G4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6F66885D5D; Fri, 3 Mar 2023 14:27:19 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1B9FC85D70 for ; Fri, 3 Mar 2023 14:27:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=andrejs.cainikovs@gmail.com Received: by mail-ed1-x52e.google.com with SMTP id cw28so10307995edb.5 for ; Fri, 03 Mar 2023 05:27:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IHbYZcqMDxwzGs2gCx7LXNrfQw6NfrNHMecP7iTihjc=; b=cwkvB7G4ID2C72NeehNfTYljt8wbpdzOMPD8NFAv2JQt3j1aMYijBiMVH81Hd03yrj M4ITcAD5Xc4dmLq2KzxUZz0QxNKYKgbdgKscRwq1s+15//mxgoHBMcQyuAnt/3vwEvpF GVrq89eRN3uBELb6i5wV9oWGrJLC7qLP7OYkVOS/t5Au5Ng/md2qmMGLImcpPOEw6rih 5hMuDoS0D8haIApK15v08pR+b9ku0sdiF3wjZt1bdcdvA3VP0r0iSUA1t81u6rnCWEnM GC+ytXqPSbzX6PcAnLUkzPcwez8/4tlfLYKiwo+go+wuJWdagrhWx5JxRR7gGcyD9lXs a5Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IHbYZcqMDxwzGs2gCx7LXNrfQw6NfrNHMecP7iTihjc=; b=F0AZ1TmD1AeMK1r7/QY+SgYvpt7bZniUjN51D5kkR/NC6px1OBBJfgnCgPoqtUe/lN 18ZHbtYo2/ja3BgGUJkk4a5HZtGBx4Ixxit+xFiaKjoL5uD/IIVzQSwQG3LUGMzKA87O ic4rk7Zc1BKZRxlxFds9gw7NOHmS3+lUXIBEag9spbtiGOfDa3qsUJAh4TAkoiwHSY2b oSnmh9A0KIH3WBhh4v4B/Qyebw2Hiy4weFalMlwdt0SiOG+opZICyKfJi4l3ueGz6XWZ UUQDte4bN0Ua3D2hxOx411T1IOrttl6sWdoErAjgiqEqdI6C4GSHH4bq/yULgap1d4BX Ur4g== X-Gm-Message-State: AO0yUKUOzD/gyJ2LgwptGUOYrlA2Hu6MmSn9EJbcWrSCSQSdg2kjxxMX B2MEs7VubK8jUmMenf8cYOQ= X-Google-Smtp-Source: AK7set9iFKhnzTXAxDkzhveKoLAOw0LhvBCVkgIhWxUNgA+9iwKM+15CMxPwDvQVh/GrqBd7ZaJygw== X-Received: by 2002:a17:906:6d85:b0:8c3:3439:24d9 with SMTP id h5-20020a1709066d8500b008c3343924d9mr1318578ejt.24.1677850031524; Fri, 03 Mar 2023 05:27:11 -0800 (PST) Received: from localhost.localdomain (35.145.195.178.dynamic.wline.res.cust.swisscom.ch. [178.195.145.35]) by smtp.gmail.com with ESMTPSA id pv16-20020a170907209000b009079442dd11sm948645ejb.154.2023.03.03.05.27.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 05:27:11 -0800 (PST) From: Andrejs Cainikovs X-Google-Original-From: Andrejs Cainikovs To: Stefano Babic , Fabio Estevam , Francesco Dolcini , Marcel Ziswiler , "NXP i . MX U-Boot Team" Cc: u-boot@lists.denx.de, Andrejs Cainikovs Subject: [PATCH v1 12/17] colibri-imx8x: update env memory layout Date: Fri, 3 Mar 2023 14:26:37 +0100 Message-Id: <20230303132642.15574-13-andrejs.cainikovs@toradex.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> References: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 03 Mar 2023 14:29:41 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Marcel Ziswiler Update the distro config env memory layout for the Colibri iMX8X: - kernel_comp_addr_r=0xb0000000 temporary area for uncompressing (ie FIT images or Image.gz booted using booti) - kernel_comp_size=0x08000000 - loadaddr=0x95400000 avoiding any reserved areas located before that - fdt_addr_r = loadaddr + 128MB - allows for 128MB kernel - scriptaddr = fdt_addr_r + 512KB - allows for 512KB fdt - ramdisk_addr_r = scriptaddr + 512KB - allows for 512KB script Idea of memory layout taken from commit a9f1e35bedc4 ("apalis-imx8: update env memory layout"). Note that for our regular BSP Layers and Reference Images for Yocto Project an updated distro boot script is required (see meta-toradex-bsp-common/recipes-bsp/u-boot/u-boot-distro-boot). Signed-off-by: Marcel Ziswiler Signed-off-by: Andrejs Cainikovs --- configs/colibri-imx8x_defconfig | 2 +- include/configs/colibri-imx8x.h | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig index a39219db58e..53002c9537d 100644 --- a/configs/colibri-imx8x_defconfig +++ b/configs/colibri-imx8x_defconfig @@ -10,7 +10,7 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-colibri" CONFIG_TARGET_COLIBRI_IMX8X=y CONFIG_SYS_PROMPT="Colibri iMX8X # " -CONFIG_SYS_LOAD_ADDR=0x80280000 +CONFIG_SYS_LOAD_ADDR=0x95c00000 CONFIG_SYS_MEMTEST_START=0x88000000 CONFIG_SYS_MEMTEST_END=0x89000000 CONFIG_DISTRO_DEFAULTS=y diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index b4814bdfbfc..750336b0eb6 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -10,10 +10,12 @@ #include #define MEM_LAYOUT_ENV_SETTINGS \ - "fdt_addr_r=0x83000000\0" \ - "kernel_addr_r=0x81000000\0" \ - "ramdisk_addr_r=0x83800000\0" \ - "scriptaddr=0x80800000\0" + "fdt_addr_r=0x9d400000\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "kernel_comp_addr_r=0xb0000000\0" \ + "kernel_comp_size=0x08000000\0" \ + "ramdisk_addr_r=0x9d500000\0" \ + "scriptaddr=0x9d480000\0" /* Boot M4 */ #define M4_BOOT_ENV \