| Message ID | 1589278848-24170-1-git-send-email-kuldeep.singh@nxp.com |
|---|---|
| State | Accepted |
| Commit | fa4d6a2a23fd86a543027a864bedbcd752fc7345 |
| Headers | show |
| Series | [v2] configs: ls1046a: Define ENV_ADDR value | expand |
>-----Original Message----- >From: U-Boot <u-boot-bounces at lists.denx.de> On Behalf Of Kuldeep Singh >Sent: Tuesday, May 12, 2020 3:51 PM >To: u-boot at lists.denx.de; Priyanka Jain <priyanka.jain at nxp.com> >Cc: Kuldeep Singh <kuldeep.singh at nxp.com> >Subject: [Patch v2] configs: ls1046a: Define ENV_ADDR value > >CONFIG_ENV_ADDR helps in picking environment from flash before DDR init. >The macro value is already defined in ls1046ardb_tfa_defconfig, also define >the value as 0x40300000 in qspi_defconfig. > >ls1046aqds has one spansion flash "S25FL128S_64K" of size 16M with sector >size 64K. Correct ENV_ADDR and ENV_SECT_SIZE value for QSPI and TFA >defconfigs of the board. > >Signed-off-by: Kuldeep Singh <kuldeep.singh at nxp.com> >--- Applied to u-boot-fsl-qoriq. Awaiting upstream. Thanks Priyanka
diff --git a/configs/ls1046aqds_qspi_defconfig b/configs/ls1046aqds_qspi_defconfig index c31c374..00b3568 100644 --- a/configs/ls1046aqds_qspi_defconfig +++ b/configs/ls1046aqds_qspi_defconfig @@ -34,6 +34,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.spi-0:2m(uboot),14m(free)" CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-qds-duart" CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_ENV_ADDR=0x40300000 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y diff --git a/configs/ls1046aqds_tfa_defconfig b/configs/ls1046aqds_tfa_defconfig index 07cdf8d..e412c05 100644 --- a/configs/ls1046aqds_tfa_defconfig +++ b/configs/ls1046aqds_tfa_defconfig @@ -4,7 +4,7 @@ CONFIG_TFABOOT=y CONFIG_SYS_TEXT_BASE=0x82000000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x500000 -CONFIG_ENV_SECT_SIZE=0x20000 +CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DM_GPIO=y CONFIG_NR_DRAM_BANKS=2 CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y @@ -42,7 +42,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_USE_ENV_SPI_BUS=y CONFIG_ENV_SPI_BUS=0 -CONFIG_ENV_ADDR=0x60500000 +CONFIG_ENV_ADDR=0x40500000 CONFIG_DM=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y diff --git a/configs/ls1046ardb_qspi_defconfig b/configs/ls1046ardb_qspi_defconfig index 6c2b157..5197868 100644 --- a/configs/ls1046ardb_qspi_defconfig +++ b/configs/ls1046ardb_qspi_defconfig @@ -30,6 +30,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.spi-0:1m(rcw),15m(u-boot),48m(kernel.i CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb" CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_ENV_ADDR=0x40300000 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y
CONFIG_ENV_ADDR helps in picking environment from flash before DDR init. The macro value is already defined in ls1046ardb_tfa_defconfig, also define the value as 0x40300000 in qspi_defconfig. ls1046aqds has one spansion flash "S25FL128S_64K" of size 16M with sector size 64K. Correct ENV_ADDR and ENV_SECT_SIZE value for QSPI and TFA defconfigs of the board. Signed-off-by: Kuldeep Singh <kuldeep.singh at nxp.com> --- v2: - Reword commit message as per Priyanka's comments. - Rebase to top configs/ls1046aqds_qspi_defconfig | 1 + configs/ls1046aqds_tfa_defconfig | 4 ++-- configs/ls1046ardb_qspi_defconfig | 1 + 3 files changed, 4 insertions(+), 2 deletions(-)