Skip to content

Commit 229647c

Browse files
add kernel and dtb validation
1 parent 2b677de commit 229647c

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

include/configs/ls1046ccx.h

+16-6
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,8 @@
7676
"run crypto_set_key && " \
7777
"setexpr filesize ${filesize} - 0x30 && " \
7878
"blob dec ${loadaddr_ram_enc} ${loadaddr_ram_dec} ${filesize} ${loadaddr_ram_key}\0" \
79-
"crypto_verify_kernel=" \
80-
"run sata_to_ram_kernel_sig && " \
81-
"esbc_validate ${loadaddr_ram_kernel_header} ${crypto_key_kernel\0" \
82-
"crypto_verify_dtb=" \
83-
"run sata_to_ram_dtb_sig && " \
84-
"esbc_validate ${loadaddr_ram_dtb_header} ${crypto_key_dtb}\0" \
79+
"crypto_verify_kernel=esbc_validate ${loadaddr_ram_kernel_header} ${crypto_key_kernel\0" \
80+
"crypto_verify_dtb=esbc_validate ${loadaddr_ram_dtb_header} ${crypto_key_dtb}\0" \
8581
"crypto_key_kernel=\0" \
8682
"crypto_key_dtb=\0" \
8783
"hwconfig=fsl_ddr:bank_intlv=auto\0" \
@@ -133,6 +129,14 @@
133129
"setenv filename Image && " \
134130
"setenv loadaddr_ram ${loadaddr_ram_kernel} && " \
135131
"run sdcard_to_ram\0" \
132+
"sdcard_to_ram_dtb_sig=" \
133+
"setenv filename linux.dtb.sig && " \
134+
"setenv loadaddr_ram ${loadaddr_ram_dtb_header} && " \
135+
"run sdcard_to_ram\0" \
136+
"sdcard_to_ram_kernel_sig=" \
137+
"setenv filename Image.sig && " \
138+
"setenv loadaddr_ram ${loadaddr_ram_kernel_header} && " \
139+
"run sdcard_to_ram\0" \
136140
"sata_to_ram_dtb=" \
137141
"setenv filename boot-${bootarg_rootpart}/linux.dtb && " \
138142
"setenv loadaddr_ram ${loadaddr_ram_dtb} && " \
@@ -194,15 +198,21 @@
194198
"run bootargs_set_console && " \
195199
"run bootargs_set_ccx && " \
196200
"run sdcard_to_ram_dtb && " \
201+
"run sdcard_to_ram_dtb_sig && " \
202+
"run crypto_verify_dtb &&" \
197203
"run sdcard_to_ram_kernel && " \
204+
"run sdcard_to_ram_kernel_sig && " \
205+
"run crypto_verify_kernel &&" \
198206
"booti ${loadaddr_ram_kernel} - ${loadaddr_ram_dtb}\0" \
199207
"boot_kernel_sata=" \
200208
"run bootargs_set_rootfs && " \
201209
"run bootargs_set_console && " \
202210
"run bootargs_set_ccx && " \
203211
"run sata_to_ram_dtb && " \
212+
"run sata_to_ram_dtb_sig && " \
204213
"run crypto_verify_dtb &&" \
205214
"run sata_to_ram_kernel && " \
215+
"run sata_to_ram_kernel_sig && " \
206216
"run crypto_verify_kernel &&" \
207217
"booti ${loadaddr_ram_kernel} - ${loadaddr_ram_dtb}\0" \
208218
"system_set_ids=" \

0 commit comments

Comments
 (0)