diff mbox series

[v3,2/2] configs: ls2080ardb: Make BOOT command access flash memory as per spi-mem

Message ID 1584512804-16844-2-git-send-email-kuldeep.singh@nxp.com
State Accepted
Commit 934eb607adf74f8cc88c3e7f2ffe9c56e479f612
Headers show
Series [v3,1/2] configs: ls2080ardb: Make MC_INIT access flash memory as per spi-mem | expand

Commit Message

Kuldeep Singh March 18, 2020, 6:26 a.m. UTC
BOOT command currently access spi-nor flash memory directly. As per spi-mem
framework, flash memory access via absolute addresses is no more possible.
Use flash APIs to access memory instead of directly using it.

Signed-off-by: Kuldeep Singh <kuldeep.singh at nxp.com>
---
v3:
-Rebase

v2:
-Rebase to top
-Reword commit message

 include/configs/ls2080ardb.h | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

Comments

Priyanka Jain (OSS) March 18, 2020, 10:32 a.m. UTC | #1
>-----Original Message-----
>From: U-Boot <u-boot-bounces at lists.denx.de> On Behalf Of Kuldeep Singh
>Sent: Wednesday, March 18, 2020 11:57 AM
>To: Priyanka Jain <priyanka.jain at nxp.com>; u-boot at lists.denx.de
>Cc: Kuldeep Singh <kuldeep.singh at nxp.com>
>Subject: [Patch v3 2/2] configs: ls2080ardb: Make BOOT command access flash
>memory as per spi-mem
>
>BOOT command currently access spi-nor flash memory directly. As per spi-
>mem framework, flash memory access via absolute addresses is no more
>possible.
>Use flash APIs to access memory instead of directly using it.
>
>Signed-off-by: Kuldeep Singh <kuldeep.singh at nxp.com>
>---
>v3:
>-Rebase
>
>v2:
>-Rebase to top
>-Reword commit message
>
> include/configs/ls2080ardb.h | 14 ++++++++++----
> 1 file changed, 10 insertions(+), 4 deletions(-)
>
>diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index
>d36e928..b8e5dd3 100644
>--- a/include/configs/ls2080ardb.h
>+++ b/include/configs/ls2080ardb.h
>@@ -508,10 +508,13 @@ unsigned long get_board_sys_clk(void);
>
> #ifdef CONFIG_TFABOOT
> #define QSPI_NOR_BOOTCOMMAND
>	\
>+			"sf probe 0:0; "				\
>+			"sf read 0x806c0000 0x6c0000 0x40000; "
>	\
> 			"env exists mcinitcmd && env exists secureboot "\
>-			"&& esbc_validate 0x206C0000; "
>	\
>+			"&& esbc_validate 0x806c0000; "
>	\
>+			"sf read 0x80d00000 0xd00000 0x100000; "	\
> 			"env exists mcinitcmd && "			\
>-			"fsl_mc lazyapply dpl 0x20d00000; "		\
>+			"fsl_mc lazyapply dpl 0x80d00000; "		\
> 			"run distro_bootcmd;run qspi_bootcmd; "
>	\
> 			"env exists secureboot && esbc_halt;"
>
>@@ -538,10 +541,13 @@ unsigned long get_board_sys_clk(void);  #ifdef
>CONFIG_QSPI_BOOT
> /* Try to boot an on-QSPI kernel first, then do normal distro boot */
> #define CONFIG_BOOTCOMMAND
>	\
>+			"sf probe 0:0; "				\
>+			"sf read 0x806c0000 0x6c0000 0x40000; "
>	\
> 			"env exists mcinitcmd && env exists secureboot "\
>-			"&& esbc_validate 0x206C0000; "
>	\
>+			"&& esbc_validate 0x806C0000; "
>	\
>+			"sf read 0x80d00000 0xd00000 0x100000; "	\
> 			"env exists mcinitcmd && "			\
>-			"fsl_mc lazyapply dpl 0x20d00000; "		\
>+			"fsl_mc lazyapply dpl 0x80d00000; "		\
> 			"run distro_bootcmd;run qspi_bootcmd; "
>	\
> 			"env exists secureboot && esbc_halt;"
> #elif defined(CONFIG_SD_BOOT)
>--
>2.7.4
Same comment as previous, please provide testing status for both secure and non-secure boot

Regards
Priyanka
Kuldeep Singh March 18, 2020, 11:10 a.m. UTC | #2
> -----Original Message-----
> From: Priyanka Jain (OSS) <priyanka.jain at oss.nxp.com>
> Sent: Wednesday, March 18, 2020 4:03 PM
> To: Kuldeep Singh <kuldeep.singh at nxp.com>; u-boot at lists.denx.de
> Cc: Kuldeep Singh <kuldeep.singh at nxp.com>
> Subject: RE: [Patch v3 2/2] configs: ls2080ardb: Make BOOT command
> access flash memory as per spi-mem
> 
> >-----Original Message-----
> >From: U-Boot <u-boot-bounces at lists.denx.de> On Behalf Of Kuldeep
> Singh
> >Sent: Wednesday, March 18, 2020 11:57 AM
> >To: Priyanka Jain <priyanka.jain at nxp.com>; u-boot at lists.denx.de
> >Cc: Kuldeep Singh <kuldeep.singh at nxp.com>
> >Subject: [Patch v3 2/2] configs: ls2080ardb: Make BOOT command access
> >flash memory as per spi-mem
> >
> >BOOT command currently access spi-nor flash memory directly. As per
> >spi- mem framework, flash memory access via absolute addresses is no
> >more possible.
> >Use flash APIs to access memory instead of directly using it.
> >
> >Signed-off-by: Kuldeep Singh <kuldeep.singh at nxp.com>
> >---
> >v3:
> >-Rebase
> >
> >v2:
> >-Rebase to top
> >-Reword commit message
> >
> > include/configs/ls2080ardb.h | 14 ++++++++++----
> > 1 file changed, 10 insertions(+), 4 deletions(-)
> >
> >diff --git a/include/configs/ls2080ardb.h
> >b/include/configs/ls2080ardb.h index
> >d36e928..b8e5dd3 100644
> >--- a/include/configs/ls2080ardb.h
> >+++ b/include/configs/ls2080ardb.h
> >@@ -508,10 +508,13 @@ unsigned long get_board_sys_clk(void);
> >
> > #ifdef CONFIG_TFABOOT
> > #define QSPI_NOR_BOOTCOMMAND
> >	\
> >+			"sf probe 0:0; "				\
> >+			"sf read 0x806c0000 0x6c0000 0x40000; "
> >	\
> > 			"env exists mcinitcmd && env exists secureboot "\
> >-			"&& esbc_validate 0x206C0000; "
> >	\
> >+			"&& esbc_validate 0x806c0000; "
> >	\
> >+			"sf read 0x80d00000 0xd00000 0x100000; "	\
> > 			"env exists mcinitcmd && "			\
> >-			"fsl_mc lazyapply dpl 0x20d00000; "		\
> >+			"fsl_mc lazyapply dpl 0x80d00000; "		\
> > 			"run distro_bootcmd;run qspi_bootcmd; "
> >	\
> > 			"env exists secureboot && esbc_halt;"
> >
> >@@ -538,10 +541,13 @@ unsigned long get_board_sys_clk(void);  #ifdef
> >CONFIG_QSPI_BOOT
> > /* Try to boot an on-QSPI kernel first, then do normal distro boot */
> >#define CONFIG_BOOTCOMMAND
> >	\
> >+			"sf probe 0:0; "				\
> >+			"sf read 0x806c0000 0x6c0000 0x40000; "
> >	\
> > 			"env exists mcinitcmd && env exists secureboot "\
> >-			"&& esbc_validate 0x206C0000; "
> >	\
> >+			"&& esbc_validate 0x806C0000; "
> >	\
> >+			"sf read 0x80d00000 0xd00000 0x100000; "	\
> > 			"env exists mcinitcmd && "			\
> >-			"fsl_mc lazyapply dpl 0x20d00000; "		\
> >+			"fsl_mc lazyapply dpl 0x80d00000; "		\
> > 			"run distro_bootcmd;run qspi_bootcmd; "
> >	\
> > 			"env exists secureboot && esbc_halt;"
> > #elif defined(CONFIG_SD_BOOT)
> >--
> >2.7.4
> Same comment as previous, please provide testing status for both secure
> and non-secure boot

These 2 patches are valid when new qspi driver is accepted.
i.e depends on https://patchwork.ozlabs.org/project/uboot/list/?series=159796

Moreover, I will give you status/logs for both secure and non-secure boot.

Thanks
Kuldeep
 

> Regards
> Priyanka
diff mbox series

Patch

diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index d36e928..b8e5dd3 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -508,10 +508,13 @@  unsigned long get_board_sys_clk(void);
 
 #ifdef CONFIG_TFABOOT
 #define QSPI_NOR_BOOTCOMMAND						\
+			"sf probe 0:0; "				\
+			"sf read 0x806c0000 0x6c0000 0x40000; "		\
 			"env exists mcinitcmd && env exists secureboot "\
-			"&& esbc_validate 0x206C0000; "			\
+			"&& esbc_validate 0x806c0000; "			\
+			"sf read 0x80d00000 0xd00000 0x100000; "	\
 			"env exists mcinitcmd && "			\
-			"fsl_mc lazyapply dpl 0x20d00000; "		\
+			"fsl_mc lazyapply dpl 0x80d00000; "		\
 			"run distro_bootcmd;run qspi_bootcmd; "		\
 			"env exists secureboot && esbc_halt;"
 
@@ -538,10 +541,13 @@  unsigned long get_board_sys_clk(void);
 #ifdef CONFIG_QSPI_BOOT
 /* Try to boot an on-QSPI kernel first, then do normal distro boot */
 #define CONFIG_BOOTCOMMAND						\
+			"sf probe 0:0; "				\
+			"sf read 0x806c0000 0x6c0000 0x40000; "		\
 			"env exists mcinitcmd && env exists secureboot "\
-			"&& esbc_validate 0x206C0000; "			\
+			"&& esbc_validate 0x806C0000; "			\
+			"sf read 0x80d00000 0xd00000 0x100000; "	\
 			"env exists mcinitcmd && "			\
-			"fsl_mc lazyapply dpl 0x20d00000; "		\
+			"fsl_mc lazyapply dpl 0x80d00000; "		\
 			"run distro_bootcmd;run qspi_bootcmd; "		\
 			"env exists secureboot && esbc_halt;"
 #elif defined(CONFIG_SD_BOOT)