From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F3296C433F5 for ; Thu, 24 Feb 2022 20:07:30 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6BEB383CC5; Thu, 24 Feb 2022 21:07:28 +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="lXXoVwXD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5B8D283CB7; Thu, 24 Feb 2022 21:07:26 +0100 (CET) Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) (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 C6C3183CD6 for ; Thu, 24 Feb 2022 21:07:22 +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=heiko.thiery@gmail.com Received: by mail-ed1-x52a.google.com with SMTP id s1so4410213edd.13 for ; Thu, 24 Feb 2022 12:07:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=X2vitgnhGF9HC98LGp+SpK21nOpwoCW8vUnY6/ydem0=; b=lXXoVwXDyBLi3+0NLTU5369oBSWckPpmyHXyXKdolSRGaGaDOlWkcNVphiTzi4KkFs y2Ivk/Sjv/L5W5NdMCCcq/PnvW/kABn6hIM8mlGLGEvagOG1yVkTDang9FXIe2POm6pc 8Ju2xpahkSBMcxsXPXYLqHyD03OpUfiiRyi9HnrA+WrqN2u8c5fvR+TOQyWp1V3pUtjJ 93ifQLY4Ydv3DjgbTaODW5G6F/unbm8UQlmMFYH2gSBi+e+1V6hmxVoK2AKlHKTuPUfP cM01a5iZQCSsQY4zB/yYMvWCFVJvJFyGX/Jh9UPx/B7KPpB7n/6U/ozKTH/NQbn8+BfS ozgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=X2vitgnhGF9HC98LGp+SpK21nOpwoCW8vUnY6/ydem0=; b=MOEoPd3ogBHqcAwNYC90h+QHRxGGpQ6neUpZUzC9SqcSrMEt1OAOdw2+tnuYdDbpoE uk5a5Mw4HDd1h/mV51PB9Uz+X5Q2CqRlWhTu8ahwki7ppJfH+njvbVCfdosu87MZgPR8 H7KtaYQV+9SleKssIFPnuuIxpoPvYutBxetw75dqUT5KWDs4PF2/JuW9Dcvb0aY8w8a2 ANGkp/eStR4t64eLrrzEb+4hmIL4l1XT77mFRbm1SYvrzlKT0RG2dz2OKgaS6gy4wCjm ixMG2E8/4Al9+bxsGpdPwwBPwD9UA8vpnAnz3Bee+i2iZMqGeWPv1JR9YczjATgpuUNX AKVA== X-Gm-Message-State: AOAM531KOxw3Qied0mv1yvdDdL/hfMI2pwZvsld5NHJJl+T24bh2ETQj 5kHlEPQrWfYEKr7FWppm1ItlgLnLaSnA41sv X-Google-Smtp-Source: ABdhPJwdEPoUU6420QJTwWr4z+hZn9uqUMvDO0hh26+tTHBJXgbb0RKd90gdxt9ozWUpVyJBMqzmLw== X-Received: by 2002:a05:6402:518b:b0:412:80a3:fb6e with SMTP id q11-20020a056402518b00b0041280a3fb6emr4079169edd.84.1645733241534; Thu, 24 Feb 2022 12:07:21 -0800 (PST) Received: from hthiery.fritz.box ([2a02:810b:5a40:2a43:8e16:45ff:fe22:ad85]) by smtp.gmail.com with ESMTPSA id h24-20020a17090634d800b006d587991605sm107200ejb.153.2022.02.24.12.07.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Feb 2022 12:07:21 -0800 (PST) From: Heiko Thiery To: u-boot@lists.denx.de Cc: Stefano Babic , Michael Walle , Fabio Estevam , "NXP i . MX U-Boot Team" , Peng Fan , Marek Vasut , Heiko Thiery Subject: [PATCH v2] ARM: imx: imx8mn-evk: change environment address variables Date: Thu, 24 Feb 2022 21:07:14 +0100 Message-Id: <20220224200713.170822-1-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.5 at phobos.denx.de X-Virus-Status: Clean Currently the space between kernel_addr_r and the fdt_addr_r is only 32MB. To have enough space to load kernel images bigger than 32MB change the variables to a feasible value. The new environment variables layout is based on the scheme from "include/configs/ti_armv7_common.h". The CONFIG_SYS_LOAD_ADDR value is set to 0x42000000. With that we have the same value as for the kernel_addr_r. Signed-off-by: Heiko Thiery Reviewed-by: Peng Fan --- v2: - fixed typo and removed added empty lines (thanks to Peng Fan) configs/imx8mn_ddr4_evk_defconfig | 2 +- configs/imx8mn_evk_defconfig | 2 +- include/configs/imx8mn_evk.h | 16 ++++++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/configs/imx8mn_ddr4_evk_defconfig b/configs/imx8mn_ddr4_evk_defconfig index 27bf5ec05a..c13885ab5e 100644 --- a/configs/imx8mn_ddr4_evk_defconfig +++ b/configs/imx8mn_ddr4_evk_defconfig @@ -18,7 +18,7 @@ CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 CONFIG_DISTRO_DEFAULTS=y -CONFIG_SYS_LOAD_ADDR=0x40480000 +CONFIG_SYS_LOAD_ADDR=0x42000000 CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y diff --git a/configs/imx8mn_evk_defconfig b/configs/imx8mn_evk_defconfig index 807d126b21..95ac6f85fa 100644 --- a/configs/imx8mn_evk_defconfig +++ b/configs/imx8mn_evk_defconfig @@ -20,7 +20,7 @@ CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 CONFIG_DISTRO_DEFAULTS=y -CONFIG_SYS_LOAD_ADDR=0x40480000 +CONFIG_SYS_LOAD_ADDR=0x42000000 CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index 142fc3e4ff..3796fe2851 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -39,19 +39,27 @@ #endif /* Initial environment variables */ +/* see include/configs/ti_armv7_common.h */ +#define ENV_MEM_LAYOUT_SETTINGS \ + "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "kernel_addr_r=0x42000000\0" \ + "fdt_addr_r=0x48000000\0" \ + "fdtoverlay_addr_r=0x49000000\0" \ + "ramdisk_addr_r=0x48080000\0" \ + "initrd_addr=0x48080000\0" \ + "scriptaddr=0x40000000\0" \ + "pxefile_addr_r=0x40100000\0" + #define CONFIG_EXTRA_ENV_SETTINGS \ "image=Image\0" \ BOOTENV \ - "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ - "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "console=ttymxc1,115200\0" \ - "fdt_addr_r=0x43000000\0" \ "boot_fit=no\0" \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "initrd_addr=0x43800000\0" \ "bootm_size=0x10000000\0" \ "mmcpart=1\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + ENV_MEM_LAYOUT_SETTINGS /* Link Definitions */ -- 2.30.2