[PATCH] include/configs: ls1012aqds: add default environment variable

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] include/configs: ls1012aqds: add default environment variable

Biwen Li (OSS)
From: Biwen Li <[hidden email]>

This adds default environment variable for ls1012aqds

Signed-off-by: Biwen Li <[hidden email]>
---
 include/configs/ls1012aqds.h | 64 ++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h
index 9498a03f40..dacb670c24 100644
--- a/include/configs/ls1012aqds.h
+++ b/include/configs/ls1012aqds.h
@@ -103,5 +103,69 @@
 
 #define CONFIG_PCI_SCAN_SHOW
 
+#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__ */
--
2.17.1

Reply | Threaded
Open this post in threaded view
|

RE: [PATCH] include/configs: ls1012aqds: add default environment variable

Priyanka Jain (OSS)

>-----Original Message-----
>From: U-Boot <[hidden email]> On Behalf Of Biwen Li
>Sent: Thursday, October 15, 2020 2:15 PM
>To: Priyanka Jain <[hidden email]>
>Cc: Jiafei Pan <[hidden email]>; [hidden email]; Biwen Li
><[hidden email]>
>Subject: [PATCH] include/configs: ls1012aqds: add default environment
>variable
>
>From: Biwen Li <[hidden email]>
>
>This adds default environment variable for ls1012aqds
>
>Signed-off-by: Biwen Li <[hidden email]>
>---
> include/configs/ls1012aqds.h | 64
>++++++++++++++++++++++++++++++++++++
> 1 file changed, 64 insertions(+)
>
>diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index
>9498a03f40..dacb670c24 100644
>--- a/include/configs/ls1012aqds.h
>+++ b/include/configs/ls1012aqds.h
>@@ -103,5 +103,69 @@
>
> #define CONFIG_PCI_SCAN_SHOW
>
>+#undef CONFIG_EXTRA_ENV_SETTINGS
>+#define CONFIG_EXTRA_ENV_SETTINGS \
>+ "verify=no\0" \
>+ "fdt_high=0xffffffffffffffff\0" \
>+ "initrd_high=0xffffffffffffffff\0" \
<snip>
----------------------------------------------------------------------
ERROR: fdt or initrd relocation disabled at boot time
#26: FILE: include/configs/ls1012aqds.h:108:
+       "fdt_high=0xffffffffffffffff\0"         \

ERROR: fdt or initrd relocation disabled at boot time
#27: FILE: include/configs/ls1012aqds.h:109:
+       "initrd_high=0xffffffffffffffff\0"      \

Kindly fix above checkpatch error.

Regards
Priyanka