diff mbox series

configs: ls1043aqds: Configure QSPI related configs

Message ID 1591857764-8953-1-git-send-email-kuldeep.singh@nxp.com
State Superseded
Delegated to: Priyanka Jain
Headers show
Series configs: ls1043aqds: Configure QSPI related configs | expand

Commit Message

Kuldeep Singh June 11, 2020, 6:42 a.m. UTC
LS1043A-QDS has "s25fl128s" flash of size 16M with 64K sector size.
The board requires few spi-flash related configs to be updated in TFA
and QSPI _defconfigs.

Following are the changes:
- Define/Update CONFIG_ENV_ADDR
- Unset CONFIG_SPI_FLASH_BAR
- Correct CONFIG_ENV_SECT_SIZE
- Enable CONFIG_SYS_RELOC_GD_ENV_ADDR

Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com>
---
 configs/ls1043aqds_qspi_defconfig            | 1 +
 configs/ls1043aqds_tfa_SECURE_BOOT_defconfig | 1 +
 configs/ls1043aqds_tfa_defconfig             | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

Comments

Priyanka Jain (OSS) July 20, 2020, 2:22 p.m. UTC | #1
>-----Original Message-----
>From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Kuldeep Singh
>Sent: Thursday, June 11, 2020 12:13 PM
>To: u-boot@lists.denx.de
>Cc: Priyanka Jain <priyanka.jain@nxp.com>; Kuldeep Singh
><kuldeep.singh@nxp.com>
>Subject: [PATCH] configs: ls1043aqds: Configure QSPI related configs
>
>LS1043A-QDS has "s25fl128s" flash of size 16M with 64K sector size.
>The board requires few spi-flash related configs to be updated in TFA and
>QSPI _defconfigs.
>
>Following are the changes:
>- Define/Update CONFIG_ENV_ADDR
>- Unset CONFIG_SPI_FLASH_BAR
>- Correct CONFIG_ENV_SECT_SIZE
>- Enable CONFIG_SYS_RELOC_GD_ENV_ADDR
>
>Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com>
>---
> configs/ls1043aqds_qspi_defconfig            | 1 +
> configs/ls1043aqds_tfa_SECURE_BOOT_defconfig | 1 +
> configs/ls1043aqds_tfa_defconfig             | 3 ++-
> 3 files changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/configs/ls1043aqds_qspi_defconfig
>b/configs/ls1043aqds_qspi_defconfig
>index a018b22..bb92b4c 100644
>--- a/configs/ls1043aqds_qspi_defconfig
>+++ b/configs/ls1043aqds_qspi_defconfig
>@@ -35,6 +35,7 @@
>CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:1m(uboot),5m(kernel),1m(d
>tb),9m(file_sy
> CONFIG_OF_CONTROL=y
> CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-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/ls1043aqds_tfa_SECURE_BOOT_defconfig
>b/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
>index 3ee5d28..a9d7131 100644
>--- a/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
>+++ b/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
>@@ -48,6 +48,7 @@ CONFIG_SYS_FLASH_CFI=y  CONFIG_MTD_RAW_NAND=y
>CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_BUS=1
>+# CONFIG_SPI_FLASH_BAR is not set
> CONFIG_SPI_FLASH_SPANSION=y
> CONFIG_PHYLIB=y
> CONFIG_PHYLIB_10G=y
>diff --git a/configs/ls1043aqds_tfa_defconfig
>b/configs/ls1043aqds_tfa_defconfig
>index 297788b..eb1f905 100644
>--- a/configs/ls1043aqds_tfa_defconfig
>+++ b/configs/ls1043aqds_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
>@@ -43,6 +43,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
>CONFIG_USE_ENV_SPI_BUS=y
> CONFIG_ENV_SPI_BUS=0
> CONFIG_ENV_ADDR=0x60500000
>+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
Please confirm that all boot-sources will work fine with this change.

Regards
Priyanka
<snip>
Kuldeep Singh July 23, 2020, 5:32 a.m. UTC | #2
[...]
> Please confirm that all boot-sources will work fine with this change.

Please hold both the patches for a moment. I will test other boot sources and will let you know the results.
Priyanka Jain Oct. 23, 2020, 3:51 a.m. UTC | #3
>-----Original Message-----
>From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Kuldeep Singh
>Sent: Thursday, July 23, 2020 11:02 AM
>To: Priyanka Jain (OSS) <priyanka.jain@oss.nxp.com>; u-boot@lists.denx.de
>Subject: RE: [PATCH] configs: ls1043aqds: Configure QSPI related configs
>
>[...]
>> Please confirm that all boot-sources will work fine with this change.
>
>Please hold both the patches for a moment. I will test other boot sources and
>will let you know the results.

Any update?

Regards
Priyanka
Kuldeep Singh Oct. 23, 2020, 9:08 a.m. UTC | #4
> -----Original Message-----
> From: Priyanka Jain <priyanka.jain@nxp.com>
> Sent: Friday, October 23, 2020 9:22 AM
> To: Kuldeep Singh <kuldeep.singh@nxp.com>; Priyanka Jain (OSS)
> <priyanka.jain@oss.nxp.com>; u-boot@lists.denx.de
> Subject: RE: [PATCH] configs: ls1043aqds: Configure QSPI related configs
> 
> >-----Original Message-----
> >From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Kuldeep Singh
> >Sent: Thursday, July 23, 2020 11:02 AM
> >To: Priyanka Jain (OSS) <priyanka.jain@oss.nxp.com>;
> >u-boot@lists.denx.de
> >Subject: RE: [PATCH] configs: ls1043aqds: Configure QSPI related
> >configs
> >
> >[...]
> >> Please confirm that all boot-sources will work fine with this change.
> >
> >Please hold both the patches for a moment. I will test other boot
> >sources and will let you know the results.
> 
> Any update?

This seems to be a generalized problem and needs to be fixed in u-boot env. I will work on it and provide the fix soon.
diff mbox series

Patch

diff --git a/configs/ls1043aqds_qspi_defconfig b/configs/ls1043aqds_qspi_defconfig
index a018b22..bb92b4c 100644
--- a/configs/ls1043aqds_qspi_defconfig
+++ b/configs/ls1043aqds_qspi_defconfig
@@ -35,6 +35,7 @@  CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:1m(uboot),5m(kernel),1m(dtb),9m(file_sy
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-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/ls1043aqds_tfa_SECURE_BOOT_defconfig b/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
index 3ee5d28..a9d7131 100644
--- a/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
@@ -48,6 +48,7 @@  CONFIG_SYS_FLASH_CFI=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_BUS=1
+# CONFIG_SPI_FLASH_BAR is not set
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHYLIB_10G=y
diff --git a/configs/ls1043aqds_tfa_defconfig b/configs/ls1043aqds_tfa_defconfig
index 297788b..eb1f905 100644
--- a/configs/ls1043aqds_tfa_defconfig
+++ b/configs/ls1043aqds_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
@@ -43,6 +43,7 @@  CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_BUS=y
 CONFIG_ENV_SPI_BUS=0
 CONFIG_ENV_ADDR=0x60500000
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y
 CONFIG_SATA_CEVA=y
 CONFIG_FSL_CAAM=y