Message ID | 20200316134150.11717-1-biwen.li@nxp.com |
---|---|
State | Accepted |
Commit | fc9a3d1b295cb15da06788fbb2f32d06b3888c57 |
Headers | show |
Series | [v2] include/configs: ls1012aqds: add default environment variable | expand |
>-----Original Message----- >From: U-Boot <u-boot-bounces at lists.denx.de> On Behalf Of Biwen Li >Sent: Monday, March 16, 2020 7:12 PM >To: Jagdish Gediya <jagdish.gediya at nxp.com>; Priyanka Jain ><priyanka.jain at nxp.com>; Shengzhou Liu <shengzhou.liu at nxp.com> >Cc: Alison Wang <alison.wang at nxp.com>; u-boot at lists.denx.de; Biwen Li ><biwen.li at nxp.com> >Subject: [v2, PATCH] include/configs: ls1012aqds: add default environment >variable > >This adds default environment variable for ls1012aqds > >Signed-off-by: Biwen Li <biwen.li at nxp.com> >--- >Change in v2: > - delete environment variable installer > > include/configs/ls1012aqds.h | 64 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 64 insertions(+) > >diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index >fb0d1ba6b2..063d1a8ac7 100644 >--- a/include/configs/ls1012aqds.h >+++ b/include/configs/ls1012aqds.h >@@ -110,5 +110,69 @@ > #define CONFIG_SYS_MEMTEST_START 0x80000000 > #define CONFIG_SYS_MEMTEST_END 0x9fffffff > >+#undef CONFIG_EXTRA_ENV_SETTINGS >+#define CONFIG_EXTRA_ENV_SETTINGS \ >+ "verify=no\0" \ >+ "fdt_high=0xffffffffffffffff\0" \ >+ "initrd_high=0xffffffffffffffff\0" \ >+ "fdt_addr=0x00f00000\0" \ >+ "kernel_addr=0x01000000\0" \ >+ "kernelheader_addr=0x600000\0" \ >+ "scriptaddr=0x80000000\0" \ >+ "scripthdraddr=0x80080000\0" \ >+ "fdtheader_addr_r=0x80100000\0" \ >+ "kernelheader_addr_r=0x80200000\0" \ >+ "kernel_addr_r=0x96000000\0" \ >+ "fdt_addr_r=0x90000000\0" \ >+ "load_addr=0xa0000000\0" \ >+ "kernel_size=0x2800000\0" \ >+ "kernelheader_size=0x40000\0" \ >+ "console=ttyS0,115200\0" \ >+ BOOTENV \ >+ "boot_scripts=ls1012aqds_boot.scr\0" \ >+ "boot_script_hdr=hdr_ls1012aqds_bs.out\0" \ >+ "scan_dev_for_boot_part=" \ >+ "part list ${devtype} ${devnum} devplist; " \ >+ "env exists devplist || setenv devplist 1; " \ >+ "for distro_bootpart in ${devplist}; do " \ >+ "if fstype ${devtype} " \ >+ "${devnum}:${distro_bootpart} " \ >+ "bootfstype; then " \ >+ "run scan_dev_for_boot; " \ >+ "fi; " \ >+ "done\0" \ >+ "scan_dev_for_boot=" \ >+ "echo Scanning ${devtype} " \ >+ "${devnum}:${distro_bootpart}...; " \ >+ "for prefix in ${boot_prefixes}; do " \ >+ "run scan_dev_for_scripts; " \ >+ "done;" \ >+ "\0" \ >+ "boot_a_script=" \ >+ "load ${devtype} ${devnum}:${distro_bootpart} " \ >+ "${scriptaddr} ${prefix}${script}; " \ >+ "env exists secureboot && load ${devtype} " \ >+ "${devnum}:${distro_bootpart} " \ >+ "${scripthdraddr} ${prefix}${boot_script_hdr}; " \ >+ "env exists secureboot " \ >+ "&& esbc_validate ${scripthdraddr};" \ >+ "source ${scriptaddr}\0" \ >+ "qspi_bootcmd=pfe stop; echo Trying load from qspi..;" \ >+ "sf probe 0:0 && sf read $load_addr " \ >+ "$kernel_addr $kernel_size; env exists secureboot " \ >+ "&& sf read $kernelheader_addr_r $kernelheader_addr " > \ >+ "$kernelheader_size && esbc_validate >${kernelheader_addr_r}; " \ >+ "bootm $load_addr#$board\0" >+ >+#undef CONFIG_BOOTCOMMAND >+#ifdef CONFIG_TFABOOT >+#undef QSPI_NOR_BOOTCOMMAND >+#define QSPI_NOR_BOOTCOMMAND "pfe stop; run distro_bootcmd; run >qspi_bootcmd; "\ You mentioned qspi_bootcmd in QSPI_NOR_BOOTCOMMAND. Is this correct ? Please confirm that you have tested the change for combinations of boot, secure/non-secure boot While testing do ensure to erase env and then test this change >+ "env exists secureboot && esbc_halt;" >+#else >+#define CONFIG_BOOTCOMMAND "pfe stop; run distro_bootcmd; run >qspi_bootcmd; "\ >+ "env exists secureboot && esbc_halt;" >+#endif >+ > #include <asm/fsl_secure_boot.h> > #endif /* __LS1012AQDS_H__ */ >-- >2.17.1 Priyanka
diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index fb0d1ba6b2..063d1a8ac7 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -110,5 +110,69 @@ #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END 0x9fffffff +#undef CONFIG_EXTRA_ENV_SETTINGS +#define CONFIG_EXTRA_ENV_SETTINGS \ + "verify=no\0" \ + "fdt_high=0xffffffffffffffff\0" \ + "initrd_high=0xffffffffffffffff\0" \ + "fdt_addr=0x00f00000\0" \ + "kernel_addr=0x01000000\0" \ + "kernelheader_addr=0x600000\0" \ + "scriptaddr=0x80000000\0" \ + "scripthdraddr=0x80080000\0" \ + "fdtheader_addr_r=0x80100000\0" \ + "kernelheader_addr_r=0x80200000\0" \ + "kernel_addr_r=0x96000000\0" \ + "fdt_addr_r=0x90000000\0" \ + "load_addr=0xa0000000\0" \ + "kernel_size=0x2800000\0" \ + "kernelheader_size=0x40000\0" \ + "console=ttyS0,115200\0" \ + BOOTENV \ + "boot_scripts=ls1012aqds_boot.scr\0" \ + "boot_script_hdr=hdr_ls1012aqds_bs.out\0" \ + "scan_dev_for_boot_part=" \ + "part list ${devtype} ${devnum} devplist; " \ + "env exists devplist || setenv devplist 1; " \ + "for distro_bootpart in ${devplist}; do " \ + "if fstype ${devtype} " \ + "${devnum}:${distro_bootpart} " \ + "bootfstype; then " \ + "run scan_dev_for_boot; " \ + "fi; " \ + "done\0" \ + "scan_dev_for_boot=" \ + "echo Scanning ${devtype} " \ + "${devnum}:${distro_bootpart}...; " \ + "for prefix in ${boot_prefixes}; do " \ + "run scan_dev_for_scripts; " \ + "done;" \ + "\0" \ + "boot_a_script=" \ + "load ${devtype} ${devnum}:${distro_bootpart} " \ + "${scriptaddr} ${prefix}${script}; " \ + "env exists secureboot && load ${devtype} " \ + "${devnum}:${distro_bootpart} " \ + "${scripthdraddr} ${prefix}${boot_script_hdr}; " \ + "env exists secureboot " \ + "&& esbc_validate ${scripthdraddr};" \ + "source ${scriptaddr}\0" \ + "qspi_bootcmd=pfe stop; echo Trying load from qspi..;" \ + "sf probe 0:0 && sf read $load_addr " \ + "$kernel_addr $kernel_size; env exists secureboot " \ + "&& sf read $kernelheader_addr_r $kernelheader_addr " \ + "$kernelheader_size && esbc_validate ${kernelheader_addr_r}; " \ + "bootm $load_addr#$board\0" + +#undef CONFIG_BOOTCOMMAND +#ifdef CONFIG_TFABOOT +#undef QSPI_NOR_BOOTCOMMAND +#define QSPI_NOR_BOOTCOMMAND "pfe stop; run distro_bootcmd; run qspi_bootcmd; "\ + "env exists secureboot && esbc_halt;" +#else +#define CONFIG_BOOTCOMMAND "pfe stop; run distro_bootcmd; run qspi_bootcmd; "\ + "env exists secureboot && esbc_halt;" +#endif + #include <asm/fsl_secure_boot.h> #endif /* __LS1012AQDS_H__ */
This adds default environment variable for ls1012aqds Signed-off-by: Biwen Li <biwen.li at nxp.com> --- Change in v2: - delete environment variable installer include/configs/ls1012aqds.h | 64 ++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+)