[Patch v2 1/2] configs: ls2080ardb: Make MC_INIT access flash memory as per spi-mem
MC_INIT 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@nxp.com --- v2: -Rebase to top -reword commit message
include/configs/ls2080ardb.h | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index a35bb0f..7a8168b 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -317,11 +317,15 @@ unsigned long get_board_sys_clk(void); #include <config_distro_bootcmd.h>
#ifdef CONFIG_TFABOOT -#define QSPI_MC_INIT_CMD \ - "env exists secureboot && " \ - "esbc_validate 0x20640000 && " \ - "esbc_validate 0x20680000;" \ - "fsl_mc start mc 0x20a00000 0x20e00000 \0" +#define QSPI_MC_INIT_CMD \ + "sf probe 0:0;sf read 0x80a00000 0xa00000 0x100000;" \ + " sf read 0x80e00000 0xe00000 0x100000; " \ + "env exists secureboot && " \ + "sf read 0x80640000 0x640000 0x40000 && " \ + "esbc_validate 0x80640000 && " \ + "sf read 0x80680000 0x680000 0x40000 && " \ + "esbc_validate 0x80680000; " \ + "fsl_mc start mc 0x80a00000 0x80e00000 \0" #define SD_MC_INIT_CMD \ "mmcinfo;mmc read 0x80a00000 0x5000 0x1200;" \ "mmc read 0x80e00000 0x7000 0x800;" \ @@ -338,11 +342,15 @@ unsigned long get_board_sys_clk(void); "fsl_mc start mc 0x580a00000 0x580e00000 \0" #else #ifdef CONFIG_QSPI_BOOT -#define MC_INIT_CMD \ - "mcinitcmd=env exists secureboot && " \ - "esbc_validate 0x20640000 && " \ - "esbc_validate 0x20680000;" \ - "fsl_mc start mc 0x20a00000 0x20e00000 \0" +#define MC_INIT_CMD \ + "mcinitcmd=sf probe 0:0;sf read 0x80a00000 0xa00000 0x100000; " \ + " sf read 0x80e00000 0xe00000 0x100000; " \ + "env exists secureboot && " \ + "sf read 0x80640000 0x640000 0x40000 && " \ + "sf read 0x80680000 0x680000 0x40000 && " \ + "esbc_validate 0x80640000 && " \ + "esbc_validate 0x80680000;" \ + "fsl_mc start mc 0x80a00000 0x80e00000 \0" #elif defined(CONFIG_SD_BOOT) #define MC_INIT_CMD \ "mcinitcmd=mmcinfo;mmc read 0x80000000 0x5000 0x800;" \
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@nxp.com --- v2: -Rebase to top -Reword commit message
include/configs/ls2080ardb.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 7a8168b..eae753d 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -505,9 +505,11 @@ unsigned long get_board_sys_clk(void); #ifdef CONFIG_TFABOOT #define QSPI_NOR_BOOTCOMMAND \ "env exists mcinitcmd && env exists secureboot "\ - "&& esbc_validate 0x206C0000; " \ + "&& sf read 0x806c0000 0x6c0000 0x40000 " \ + "&& esbc_validate 0x806C0000; " \ "env exists mcinitcmd && " \ - "fsl_mc lazyapply dpl 0x20d00000; " \ + "sf read 0x80d00000 0xd00000 0x100000; " \ + "fsl_mc lazyapply dpl 0x80d00000; " \ "run distro_bootcmd;run qspi_bootcmd; " \ "env exists secureboot && esbc_halt;"
@@ -535,9 +537,11 @@ unsigned long get_board_sys_clk(void); /* Try to boot an on-QSPI kernel first, then do normal distro boot */ #define CONFIG_BOOTCOMMAND \ "env exists mcinitcmd && env exists secureboot "\ - "&& esbc_validate 0x206C0000; " \ + "&& sf read 0x806c0000 0x6c0000 0x40000 " \ + "&& esbc_validate 0x806C0000; " \ "env exists mcinitcmd && " \ - "fsl_mc lazyapply dpl 0x20d00000; " \ + "sf read 0x80d00000 0xd00000 0x100000 && " \ + "fsl_mc lazyapply dpl 0x80d00000; " \ "run distro_bootcmd;run qspi_bootcmd; " \ "env exists secureboot && esbc_halt;" #elif defined(CONFIG_SD_BOOT)
participants (1)
-
Kuldeep Singh