[U-Boot] [PATCH V4 7/7] test: vboot: clean its file
Philippe Reynes
philippe.reynes at softathome.com
Wed Nov 14 12:51:05 UTC 2018
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 at 1 by kernel and fdt at 1 by fdt-1)
Signed-off-by: Philippe Reynes <philippe.reynes at softathome.com>
---
test/py/tests/test_vboot.py | 2 +-
test/py/tests/vboot/sign-configs-sha1-pss.its | 18 +++++++++---------
test/py/tests/vboot/sign-configs-sha1.its | 18 +++++++++---------
test/py/tests/vboot/sign-configs-sha256-pss.its | 18 +++++++++---------
test/py/tests/vboot/sign-configs-sha256.its | 18 +++++++++---------
test/py/tests/vboot/sign-images-sha1-pss.its | 16 ++++++++--------
test/py/tests/vboot/sign-images-sha1.its | 16 ++++++++--------
test/py/tests/vboot/sign-images-sha256-pss.its | 16 ++++++++--------
test/py/tests/vboot/sign-images-sha256.its | 16 ++++++++--------
9 files changed, 69 insertions(+), 69 deletions(-)
Changelog:
v4:
- remove Reviewed-by Clement Peron (added by mistake)
- remove Reviewed-by Simon Glass (added by mistake)
v3:
- new patch in the serie (feedback from Clement Peron)
diff --git a/test/py/tests/test_vboot.py b/test/py/tests/test_vboot.py
index a3a3879..1e6ae7a 100644
--- a/test/py/tests/test_vboot.py
+++ b/test/py/tests/test_vboot.py
@@ -204,7 +204,7 @@ def test_vboot(u_boot_console):
fit_check_sign = cons.config.build_dir + '/tools/fit_check_sign'
dtc_args = '-I dts -O dtb -i %s' % tmpdir
dtb = '%ssandbox-u-boot.dtb' % tmpdir
- sig_node = '/configurations/conf at 1/signature at 1'
+ sig_node = '/configurations/conf-1/signature'
# Create an RSA key pair
public_exponent = 65537
diff --git a/test/py/tests/vboot/sign-configs-sha1-pss.its b/test/py/tests/vboot/sign-configs-sha1-pss.its
index 3c3ab20..72a5637 100644
--- a/test/py/tests/vboot/sign-configs-sha1-pss.its
+++ b/test/py/tests/vboot/sign-configs-sha1-pss.its
@@ -5,7 +5,7 @@
#address-cells = <1>;
images {
- kernel at 1 {
+ kernel {
data = /incbin/("test-kernel.bin");
type = "kernel_noload";
arch = "sandbox";
@@ -14,28 +14,28 @@
load = <0x4>;
entry = <0x8>;
kernel-version = <1>;
- hash at 1 {
+ hash-1 {
algo = "sha1";
};
};
- fdt at 1 {
+ fdt-1 {
description = "snow";
data = /incbin/("sandbox-kernel.dtb");
type = "flat_dt";
arch = "sandbox";
compression = "none";
fdt-version = <1>;
- hash at 1 {
+ hash-1 {
algo = "sha1";
};
};
};
configurations {
- default = "conf at 1";
- conf at 1 {
- kernel = "kernel at 1";
- fdt = "fdt at 1";
- signature at 1 {
+ default = "conf-1";
+ conf-1 {
+ kernel = "kernel";
+ fdt = "fdt-1";
+ signature {
algo = "sha1,rsa2048";
padding = "pss";
key-name-hint = "dev";
diff --git a/test/py/tests/vboot/sign-configs-sha1.its b/test/py/tests/vboot/sign-configs-sha1.its
index db2ed79..d8bc1fa 100644
--- a/test/py/tests/vboot/sign-configs-sha1.its
+++ b/test/py/tests/vboot/sign-configs-sha1.its
@@ -5,7 +5,7 @@
#address-cells = <1>;
images {
- kernel at 1 {
+ kernel {
data = /incbin/("test-kernel.bin");
type = "kernel_noload";
arch = "sandbox";
@@ -14,28 +14,28 @@
load = <0x4>;
entry = <0x8>;
kernel-version = <1>;
- hash at 1 {
+ hash-1 {
algo = "sha1";
};
};
- fdt at 1 {
+ fdt-1 {
description = "snow";
data = /incbin/("sandbox-kernel.dtb");
type = "flat_dt";
arch = "sandbox";
compression = "none";
fdt-version = <1>;
- hash at 1 {
+ hash-1 {
algo = "sha1";
};
};
};
configurations {
- default = "conf at 1";
- conf at 1 {
- kernel = "kernel at 1";
- fdt = "fdt at 1";
- signature at 1 {
+ default = "conf-1";
+ conf-1 {
+ kernel = "kernel";
+ fdt = "fdt-1";
+ signature {
algo = "sha1,rsa2048";
key-name-hint = "dev";
sign-images = "fdt", "kernel";
diff --git a/test/py/tests/vboot/sign-configs-sha256-pss.its b/test/py/tests/vboot/sign-configs-sha256-pss.its
index 8e33510..7bdcc7e 100644
--- a/test/py/tests/vboot/sign-configs-sha256-pss.its
+++ b/test/py/tests/vboot/sign-configs-sha256-pss.its
@@ -5,7 +5,7 @@
#address-cells = <1>;
images {
- kernel at 1 {
+ kernel {
data = /incbin/("test-kernel.bin");
type = "kernel_noload";
arch = "sandbox";
@@ -14,28 +14,28 @@
load = <0x4>;
entry = <0x8>;
kernel-version = <1>;
- hash at 1 {
+ hash-1 {
algo = "sha256";
};
};
- fdt at 1 {
+ fdt-1 {
description = "snow";
data = /incbin/("sandbox-kernel.dtb");
type = "flat_dt";
arch = "sandbox";
compression = "none";
fdt-version = <1>;
- hash at 1 {
+ hash-1 {
algo = "sha256";
};
};
};
configurations {
- default = "conf at 1";
- conf at 1 {
- kernel = "kernel at 1";
- fdt = "fdt at 1";
- signature at 1 {
+ default = "conf-1";
+ conf-1 {
+ kernel = "kernel";
+ fdt = "fdt-1";
+ signature {
algo = "sha256,rsa2048";
padding = "pss";
key-name-hint = "dev";
diff --git a/test/py/tests/vboot/sign-configs-sha256.its b/test/py/tests/vboot/sign-configs-sha256.its
index 1b3432e..f5591aa 100644
--- a/test/py/tests/vboot/sign-configs-sha256.its
+++ b/test/py/tests/vboot/sign-configs-sha256.its
@@ -5,7 +5,7 @@
#address-cells = <1>;
images {
- kernel at 1 {
+ kernel {
data = /incbin/("test-kernel.bin");
type = "kernel_noload";
arch = "sandbox";
@@ -14,28 +14,28 @@
load = <0x4>;
entry = <0x8>;
kernel-version = <1>;
- hash at 1 {
+ hash-1 {
algo = "sha256";
};
};
- fdt at 1 {
+ fdt-1 {
description = "snow";
data = /incbin/("sandbox-kernel.dtb");
type = "flat_dt";
arch = "sandbox";
compression = "none";
fdt-version = <1>;
- hash at 1 {
+ hash-1 {
algo = "sha256";
};
};
};
configurations {
- default = "conf at 1";
- conf at 1 {
- kernel = "kernel at 1";
- fdt = "fdt at 1";
- signature at 1 {
+ default = "conf-1";
+ conf-1 {
+ kernel = "kernel";
+ fdt = "fdt-1";
+ signature {
algo = "sha256,rsa2048";
key-name-hint = "dev";
sign-images = "fdt", "kernel";
diff --git a/test/py/tests/vboot/sign-images-sha1-pss.its b/test/py/tests/vboot/sign-images-sha1-pss.its
index d19c4d7..ded7ae4 100644
--- a/test/py/tests/vboot/sign-images-sha1-pss.its
+++ b/test/py/tests/vboot/sign-images-sha1-pss.its
@@ -5,7 +5,7 @@
#address-cells = <1>;
images {
- kernel at 1 {
+ kernel {
data = /incbin/("test-kernel.bin");
type = "kernel_noload";
arch = "sandbox";
@@ -14,20 +14,20 @@
load = <0x4>;
entry = <0x8>;
kernel-version = <1>;
- signature at 1 {
+ signature {
algo = "sha1,rsa2048";
padding = "pss";
key-name-hint = "dev";
};
};
- fdt at 1 {
+ fdt-1 {
description = "snow";
data = /incbin/("sandbox-kernel.dtb");
type = "flat_dt";
arch = "sandbox";
compression = "none";
fdt-version = <1>;
- signature at 1 {
+ signature {
algo = "sha1,rsa2048";
padding = "pss";
key-name-hint = "dev";
@@ -35,10 +35,10 @@
};
};
configurations {
- default = "conf at 1";
- conf at 1 {
- kernel = "kernel at 1";
- fdt = "fdt at 1";
+ default = "conf-1";
+ conf-1 {
+ kernel = "kernel";
+ fdt = "fdt-1";
};
};
};
diff --git a/test/py/tests/vboot/sign-images-sha1.its b/test/py/tests/vboot/sign-images-sha1.its
index f69326a..18c759e 100644
--- a/test/py/tests/vboot/sign-images-sha1.its
+++ b/test/py/tests/vboot/sign-images-sha1.its
@@ -5,7 +5,7 @@
#address-cells = <1>;
images {
- kernel at 1 {
+ kernel {
data = /incbin/("test-kernel.bin");
type = "kernel_noload";
arch = "sandbox";
@@ -14,29 +14,29 @@
load = <0x4>;
entry = <0x8>;
kernel-version = <1>;
- signature at 1 {
+ signature {
algo = "sha1,rsa2048";
key-name-hint = "dev";
};
};
- fdt at 1 {
+ fdt-1 {
description = "snow";
data = /incbin/("sandbox-kernel.dtb");
type = "flat_dt";
arch = "sandbox";
compression = "none";
fdt-version = <1>;
- signature at 1 {
+ signature {
algo = "sha1,rsa2048";
key-name-hint = "dev";
};
};
};
configurations {
- default = "conf at 1";
- conf at 1 {
- kernel = "kernel at 1";
- fdt = "fdt at 1";
+ default = "conf-1";
+ conf-1 {
+ kernel = "kernel";
+ fdt = "fdt-1";
};
};
};
diff --git a/test/py/tests/vboot/sign-images-sha256-pss.its b/test/py/tests/vboot/sign-images-sha256-pss.its
index 43612f8..34850cc 100644
--- a/test/py/tests/vboot/sign-images-sha256-pss.its
+++ b/test/py/tests/vboot/sign-images-sha256-pss.its
@@ -5,7 +5,7 @@
#address-cells = <1>;
images {
- kernel at 1 {
+ kernel {
data = /incbin/("test-kernel.bin");
type = "kernel_noload";
arch = "sandbox";
@@ -14,20 +14,20 @@
load = <0x4>;
entry = <0x8>;
kernel-version = <1>;
- signature at 1 {
+ signature {
algo = "sha256,rsa2048";
padding = "pss";
key-name-hint = "dev";
};
};
- fdt at 1 {
+ fdt-1 {
description = "snow";
data = /incbin/("sandbox-kernel.dtb");
type = "flat_dt";
arch = "sandbox";
compression = "none";
fdt-version = <1>;
- signature at 1 {
+ signature {
algo = "sha256,rsa2048";
padding = "pss";
key-name-hint = "dev";
@@ -35,10 +35,10 @@
};
};
configurations {
- default = "conf at 1";
- conf at 1 {
- kernel = "kernel at 1";
- fdt = "fdt at 1";
+ default = "conf-1";
+ conf-1 {
+ kernel = "kernel";
+ fdt = "fdt-1";
};
};
};
diff --git a/test/py/tests/vboot/sign-images-sha256.its b/test/py/tests/vboot/sign-images-sha256.its
index e6aa9fc..bb0f8ee 100644
--- a/test/py/tests/vboot/sign-images-sha256.its
+++ b/test/py/tests/vboot/sign-images-sha256.its
@@ -5,7 +5,7 @@
#address-cells = <1>;
images {
- kernel at 1 {
+ kernel {
data = /incbin/("test-kernel.bin");
type = "kernel_noload";
arch = "sandbox";
@@ -14,29 +14,29 @@
load = <0x4>;
entry = <0x8>;
kernel-version = <1>;
- signature at 1 {
+ signature {
algo = "sha256,rsa2048";
key-name-hint = "dev";
};
};
- fdt at 1 {
+ fdt-1 {
description = "snow";
data = /incbin/("sandbox-kernel.dtb");
type = "flat_dt";
arch = "sandbox";
compression = "none";
fdt-version = <1>;
- signature at 1 {
+ signature {
algo = "sha256,rsa2048";
key-name-hint = "dev";
};
};
};
configurations {
- default = "conf at 1";
- conf at 1 {
- kernel = "kernel at 1";
- fdt = "fdt at 1";
+ default = "conf-1";
+ conf-1 {
+ kernel = "kernel";
+ fdt = "fdt-1";
};
};
};
--
2.7.4
More information about the U-Boot
mailing list