Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-22 20:58:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: vboot: clean its file

Browse source 
This update the its file used in vboot test to respect the new
node style name defined in doc/uImage.FIT (for example: replace
kernel@1 by kernel and fdt@1 by fdt-1)

Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Philippe Reynes 2018-11-14 13:51:05 +01:00 • committed by Tom Rini
parent e246b728ee
commit ed47097a04
9 changed files with 69 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/py/tests/test_vboot.py
View file

@ -204,7 +204,7 @@ def test_vboot(u_boot_console):
fit_check_sign = cons.config.build_dir + '/tools/fit_check_sign' fit_check_sign = cons.config.build_dir + '/tools/fit_check_sign'
dtc_args = '-I dts -O dtb -i %s' % tmpdir dtc_args = '-I dts -O dtb -i %s' % tmpdir
dtb = '%ssandbox-u-boot.dtb' % tmpdir dtb = '%ssandbox-u-boot.dtb' % tmpdir
sig_node = '/configurations/conf@1/signature@1' sig_node = '/configurations/conf-1/signature'
# Create an RSA key pair # Create an RSA key pair
public_exponent = 65537 public_exponent = 65537

18
test/py/tests/vboot/sign-configs-sha1-pss.its
View file

@ -5,7 +5,7 @@
#address-cells = <1>; #address-cells = <1>;
images { images {
kernel@1 { kernel {
data = /incbin/("test-kernel.bin"); data = /incbin/("test-kernel.bin");
type = "kernel_noload"; type = "kernel_noload";
arch = "sandbox"; arch = "sandbox";
@ -14,28 +14,28 @@
load = <0x4>; load = <0x4>;
entry = <0x8>; entry = <0x8>;
kernel-version = <1>; kernel-version = <1>;
hash@1 { hash-1 {
algo = "sha1"; algo = "sha1";
}; };
}; };
fdt@1 { fdt-1 {
description = "snow"; description = "snow";
data = /incbin/("sandbox-kernel.dtb"); data = /incbin/("sandbox-kernel.dtb");
type = "flat_dt"; type = "flat_dt";
arch = "sandbox"; arch = "sandbox";
compression = "none"; compression = "none";
fdt-version = <1>; fdt-version = <1>;
hash@1 { hash-1 {
algo = "sha1"; algo = "sha1";
}; };
}; };
}; };
configurations { configurations {
default = "conf@1"; default = "conf-1";
conf@1 { conf-1 {
kernel = "kernel@1"; kernel = "kernel";
fdt = "fdt@1"; fdt = "fdt-1";
signature@1 { signature {
algo = "sha1,rsa2048"; algo = "sha1,rsa2048";
padding = "pss"; padding = "pss";
key-name-hint = "dev"; key-name-hint = "dev";

18
test/py/tests/vboot/sign-configs-sha1.its
View file

@ -5,7 +5,7 @@
#address-cells = <1>; #address-cells = <1>;
images { images {
kernel@1 { kernel {
data = /incbin/("test-kernel.bin"); data = /incbin/("test-kernel.bin");
type = "kernel_noload"; type = "kernel_noload";
arch = "sandbox"; arch = "sandbox";
@ -14,28 +14,28 @@
load = <0x4>; load = <0x4>;
entry = <0x8>; entry = <0x8>;
kernel-version = <1>; kernel-version = <1>;
hash@1 { hash-1 {
algo = "sha1"; algo = "sha1";
}; };
}; };
fdt@1 { fdt-1 {
description = "snow"; description = "snow";
data = /incbin/("sandbox-kernel.dtb"); data = /incbin/("sandbox-kernel.dtb");
type = "flat_dt"; type = "flat_dt";
arch = "sandbox"; arch = "sandbox";
compression = "none"; compression = "none";
fdt-version = <1>; fdt-version = <1>;
hash@1 { hash-1 {
algo = "sha1"; algo = "sha1";
}; };
}; };
}; };
configurations { configurations {
default = "conf@1"; default = "conf-1";
conf@1 { conf-1 {
kernel = "kernel@1"; kernel = "kernel";
fdt = "fdt@1"; fdt = "fdt-1";
signature@1 { signature {
algo = "sha1,rsa2048"; algo = "sha1,rsa2048";
key-name-hint = "dev"; key-name-hint = "dev";
sign-images = "fdt", "kernel"; sign-images = "fdt", "kernel";

18
test/py/tests/vboot/sign-configs-sha256-pss.its
View file

@ -5,7 +5,7 @@
#address-cells = <1>; #address-cells = <1>;
images { images {
kernel@1 { kernel {
data = /incbin/("test-kernel.bin"); data = /incbin/("test-kernel.bin");
type = "kernel_noload"; type = "kernel_noload";
arch = "sandbox"; arch = "sandbox";
@ -14,28 +14,28 @@
load = <0x4>; load = <0x4>;
entry = <0x8>; entry = <0x8>;
kernel-version = <1>; kernel-version = <1>;
hash@1 { hash-1 {
algo = "sha256"; algo = "sha256";
}; };
}; };
fdt@1 { fdt-1 {
description = "snow"; description = "snow";
data = /incbin/("sandbox-kernel.dtb"); data = /incbin/("sandbox-kernel.dtb");
type = "flat_dt"; type = "flat_dt";
arch = "sandbox"; arch = "sandbox";
compression = "none"; compression = "none";
fdt-version = <1>; fdt-version = <1>;
hash@1 { hash-1 {
algo = "sha256"; algo = "sha256";
}; };
}; };
}; };
configurations { configurations {
default = "conf@1"; default = "conf-1";
conf@1 { conf-1 {
kernel = "kernel@1"; kernel = "kernel";
fdt = "fdt@1"; fdt = "fdt-1";
signature@1 { signature {
algo = "sha256,rsa2048"; algo = "sha256,rsa2048";
padding = "pss"; padding = "pss";
key-name-hint = "dev"; key-name-hint = "dev";

18
test/py/tests/vboot/sign-configs-sha256.its
View file

@ -5,7 +5,7 @@
#address-cells = <1>; #address-cells = <1>;
images { images {
kernel@1 { kernel {
data = /incbin/("test-kernel.bin"); data = /incbin/("test-kernel.bin");
type = "kernel_noload"; type = "kernel_noload";
arch = "sandbox"; arch = "sandbox";
@ -14,28 +14,28 @@
load = <0x4>; load = <0x4>;
entry = <0x8>; entry = <0x8>;
kernel-version = <1>; kernel-version = <1>;
hash@1 { hash-1 {
algo = "sha256"; algo = "sha256";
}; };
}; };
fdt@1 { fdt-1 {
description = "snow"; description = "snow";
data = /incbin/("sandbox-kernel.dtb"); data = /incbin/("sandbox-kernel.dtb");
type = "flat_dt"; type = "flat_dt";
arch = "sandbox"; arch = "sandbox";
compression = "none"; compression = "none";
fdt-version = <1>; fdt-version = <1>;
hash@1 { hash-1 {
algo = "sha256"; algo = "sha256";
}; };
}; };
}; };
configurations { configurations {
default = "conf@1"; default = "conf-1";
conf@1 { conf-1 {
kernel = "kernel@1"; kernel = "kernel";
fdt = "fdt@1"; fdt = "fdt-1";
signature@1 { signature {
algo = "sha256,rsa2048"; algo = "sha256,rsa2048";
key-name-hint = "dev"; key-name-hint = "dev";
sign-images = "fdt", "kernel"; sign-images = "fdt", "kernel";

16
test/py/tests/vboot/sign-images-sha1-pss.its
View file

@ -5,7 +5,7 @@
#address-cells = <1>; #address-cells = <1>;
images { images {
kernel@1 { kernel {
data = /incbin/("test-kernel.bin"); data = /incbin/("test-kernel.bin");
type = "kernel_noload"; type = "kernel_noload";
arch = "sandbox"; arch = "sandbox";
@ -14,20 +14,20 @@
load = <0x4>; load = <0x4>;
entry = <0x8>; entry = <0x8>;
kernel-version = <1>; kernel-version = <1>;
signature@1 { signature {
algo = "sha1,rsa2048"; algo = "sha1,rsa2048";
padding = "pss"; padding = "pss";
key-name-hint = "dev"; key-name-hint = "dev";
}; };
}; };
fdt@1 { fdt-1 {
description = "snow"; description = "snow";
data = /incbin/("sandbox-kernel.dtb"); data = /incbin/("sandbox-kernel.dtb");
type = "flat_dt"; type = "flat_dt";
arch = "sandbox"; arch = "sandbox";
compression = "none"; compression = "none";
fdt-version = <1>; fdt-version = <1>;
signature@1 { signature {
algo = "sha1,rsa2048"; algo = "sha1,rsa2048";
padding = "pss"; padding = "pss";
key-name-hint = "dev"; key-name-hint = "dev";
@ -35,10 +35,10 @@
}; };
}; };
configurations { configurations {
default = "conf@1"; default = "conf-1";
conf@1 { conf-1 {
kernel = "kernel@1"; kernel = "kernel";
fdt = "fdt@1"; fdt = "fdt-1";
}; };
}; };
}; };

16
test/py/tests/vboot/sign-images-sha1.its
View file

@ -5,7 +5,7 @@
#address-cells = <1>; #address-cells = <1>;
images { images {
kernel@1 { kernel {
data = /incbin/("test-kernel.bin"); data = /incbin/("test-kernel.bin");
type = "kernel_noload"; type = "kernel_noload";
arch = "sandbox"; arch = "sandbox";
@ -14,29 +14,29 @@
load = <0x4>; load = <0x4>;
entry = <0x8>; entry = <0x8>;
kernel-version = <1>; kernel-version = <1>;
signature@1 { signature {
algo = "sha1,rsa2048"; algo = "sha1,rsa2048";
key-name-hint = "dev"; key-name-hint = "dev";
}; };
}; };
fdt@1 { fdt-1 {
description = "snow"; description = "snow";
data = /incbin/("sandbox-kernel.dtb"); data = /incbin/("sandbox-kernel.dtb");
type = "flat_dt"; type = "flat_dt";
arch = "sandbox"; arch = "sandbox";
compression = "none"; compression = "none";
fdt-version = <1>; fdt-version = <1>;
signature@1 { signature {
algo = "sha1,rsa2048"; algo = "sha1,rsa2048";
key-name-hint = "dev"; key-name-hint = "dev";
}; };
}; };
}; };
configurations { configurations {
default = "conf@1"; default = "conf-1";
conf@1 { conf-1 {
kernel = "kernel@1"; kernel = "kernel";
fdt = "fdt@1"; fdt = "fdt-1";
}; };
}; };
}; };

16
test/py/tests/vboot/sign-images-sha256-pss.its
View file

@ -5,7 +5,7 @@
#address-cells = <1>; #address-cells = <1>;
images { images {
kernel@1 { kernel {
data = /incbin/("test-kernel.bin"); data = /incbin/("test-kernel.bin");
type = "kernel_noload"; type = "kernel_noload";
arch = "sandbox"; arch = "sandbox";
@ -14,20 +14,20 @@
load = <0x4>; load = <0x4>;
entry = <0x8>; entry = <0x8>;
kernel-version = <1>; kernel-version = <1>;
signature@1 { signature {
algo = "sha256,rsa2048"; algo = "sha256,rsa2048";
padding = "pss"; padding = "pss";
key-name-hint = "dev"; key-name-hint = "dev";
}; };
}; };
fdt@1 { fdt-1 {
description = "snow"; description = "snow";
data = /incbin/("sandbox-kernel.dtb"); data = /incbin/("sandbox-kernel.dtb");
type = "flat_dt"; type = "flat_dt";
arch = "sandbox"; arch = "sandbox";
compression = "none"; compression = "none";
fdt-version = <1>; fdt-version = <1>;
signature@1 { signature {
algo = "sha256,rsa2048"; algo = "sha256,rsa2048";
padding = "pss"; padding = "pss";
key-name-hint = "dev"; key-name-hint = "dev";
@ -35,10 +35,10 @@
}; };
}; };
configurations { configurations {
default = "conf@1"; default = "conf-1";
conf@1 { conf-1 {
kernel = "kernel@1"; kernel = "kernel";
fdt = "fdt@1"; fdt = "fdt-1";
}; };
}; };
}; };

16
test/py/tests/vboot/sign-images-sha256.its
View file

@ -5,7 +5,7 @@
#address-cells = <1>; #address-cells = <1>;
images { images {
kernel@1 { kernel {
data = /incbin/("test-kernel.bin"); data = /incbin/("test-kernel.bin");
type = "kernel_noload"; type = "kernel_noload";
arch = "sandbox"; arch = "sandbox";
@ -14,29 +14,29 @@
load = <0x4>; load = <0x4>;
entry = <0x8>; entry = <0x8>;
kernel-version = <1>; kernel-version = <1>;
signature@1 { signature {
algo = "sha256,rsa2048"; algo = "sha256,rsa2048";
key-name-hint = "dev"; key-name-hint = "dev";
}; };
}; };
fdt@1 { fdt-1 {
description = "snow"; description = "snow";
data = /incbin/("sandbox-kernel.dtb"); data = /incbin/("sandbox-kernel.dtb");
type = "flat_dt"; type = "flat_dt";
arch = "sandbox"; arch = "sandbox";
compression = "none"; compression = "none";
fdt-version = <1>; fdt-version = <1>;
signature@1 { signature {
algo = "sha256,rsa2048"; algo = "sha256,rsa2048";
key-name-hint = "dev"; key-name-hint = "dev";
}; };
}; };
}; };
configurations { configurations {
default = "conf@1"; default = "conf-1";
conf@1 { conf-1 {
kernel = "kernel@1"; kernel = "kernel";
fdt = "fdt@1"; fdt = "fdt-1";
}; };
}; };
}; };