include/configs: ls1012aqds: add default environment variable
PATCH v2 1/1 include/configs: ls1012aqds: add default environment variable
This adds default environment variable for ls1012aqds
---
Change in v2:
- delete environment variable installer
include/configs/ls1012aqds.h | 64 ++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+)
include/configs/ls1012aqds.h +64 -0
@@ -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__ */
Signature · 1 line
2.17.1
PATCH v2 1/1 include/configs: ls1012aqds: add default environment variable
Quoted 88 lines
-----Original Message-----
From: U-Boot <[email protected]> On Behalf Of Biwen Li
Sent: Monday, March 16, 2020 7:12 PM
To: Jagdish Gediya <[email protected]>; Priyanka Jain <[email protected]>; Shengzhou Liu <[email protected]>
Cc: Alison Wang <[email protected]>; u-boot at lists.denx.de; Biwen Li <[email protected]>
Subject: [v2, PATCH]include/configs: ls1012aqds: add default environment variableThis adds default environment variable for ls1012aqds
Signed-off-by Biwen Li <[email protected]>---
Change in v2:
- delete environment variable installer
include/configs/ls1012aqds.h| 64 ++++++++++++++++++++++++++++++++++++1 file changed, 64 insertions(+)include/configs/ls1012aqds.h index renamed from include/configs/ls1012aqds.h +0
-0
fb0d1ba6b2..063d1a8ac7100644include/configs/ls1012aqds.h +58
-0@@ -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
Quoted 1 line
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
Quoted 11 lines
include/configs/ls1012aqds.h +3
-0+ "env exists secureboot && esbc_halt;" +#else +#define CONFIG_BOOTCOMMAND "pfe stop; run distro_bootcmd; run
qspi_bootcmd; "\include/configs/ls1012aqds.h +3
-0+ "env exists secureboot && esbc_halt;" +#endif +#include <
asm/fsl_secure_boot.h>
#endif /*__LS1012AQDS_H__*/
--
2.17.1
Priyanka
PATCH v2 1/1 include/configs: ls1012aqds: add default environment variable
Quoted 88 lines
Quoted 10 lines
-----Original Message-----
From: U-Boot <[email protected]> On Behalf Of Biwen Li
Sent: Monday, March 16, 2020 7:12 PM
To: Jagdish Gediya <[email protected]>; Priyanka Jain <[email protected]>; Shengzhou Liu <[email protected]>
Cc: Alison Wang <[email protected]>; u-boot at lists.denx.de; Biwen Li <[email protected]>
Subject: [v2, PATCH]include/configs: ls1012aqds: add default environment variableQuoted 8 lines
This adds default environment variable for ls1012aqds
Signed-off-by Biwen Li <[email protected]>---
Change in v2:
- delete environment variable installer
include/configs/ls1012aqds.h| 64++++++++++++++++++++++++++++++++++++
Quoted 69 lines
1 file changed, 64 insertions(+)(quoted diff) +0
-0
b/include/configs/ls1012aqds.hindexfb0d1ba6b2..063d1a8ac7100644include/configs/ls1012aqds.h +56
-0@@ -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
Quoted 8 lines
Quoted 3 lines
include/configs/ls1012aqds.h +2
-0+#undef QSPI_NOR_BOOTCOMMAND +#define QSPI_NOR_BOOTCOMMAND "pfe stop; run distro_bootcmd; run
qspi_bootcmd; "\You mentioned
qspi_bootcmdinQSPI_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
Sure, have tested non-secure boot.It is workable.
Quoted 12 lines
Quoted 11 lines
include/configs/ls1012aqds.h +3
-0+ "env exists secureboot && esbc_halt;" +#else +#define CONFIG_BOOTCOMMAND "pfe stop; run distro_bootcmd; run
qspi_bootcmd; "\include/configs/ls1012aqds.h +3
-0+ "env exists secureboot && esbc_halt;" +#endif +#include <
asm/fsl_secure_boot.h>
#endif /*__LS1012AQDS_H__*/
--
2.17.1Priyanka