summaryrefslogtreecommitdiff
path: root/tools/binman/test
diff options
context:
space:
mode:
Diffstat (limited to 'tools/binman/test')
-rw-r--r--tools/binman/test/08_pack.dts2
-rw-r--r--tools/binman/test/12_pack_inv_align.dts2
-rw-r--r--tools/binman/test/14_pack_overlap.dts2
-rw-r--r--tools/binman/test/21_image_pad.dts2
-rw-r--r--tools/binman/test/24_sorted.dts6
-rw-r--r--tools/binman/test/25_pack_zero_size.dts2
-rw-r--r--tools/binman/test/27_pack_4gb_no_size.dts6
-rw-r--r--tools/binman/test/28_pack_4gb_outside.dts6
-rw-r--r--tools/binman/test/29_x86-rom.dts6
-rw-r--r--tools/binman/test/30_x86-rom-me-no-desc.dts4
-rw-r--r--tools/binman/test/31_x86-rom-me.dts4
-rw-r--r--tools/binman/test/34_x86_ucode.dts2
-rw-r--r--tools/binman/test/35_x86_single_ucode.dts2
-rw-r--r--tools/binman/test/37_x86_no_ucode.dts2
-rw-r--r--tools/binman/test/38_x86_ucode_missing_node.dts2
-rw-r--r--tools/binman/test/39_x86_ucode_missing_node2.dts2
-rw-r--r--tools/binman/test/40_x86_ucode_not_in_image.dts2
-rw-r--r--tools/binman/test/44_x86_optional_ucode.dts2
-rw-r--r--tools/binman/test/45_prop_test.dts4
-rw-r--r--tools/binman/test/49_x86_ucode_spl.dts2
-rw-r--r--tools/binman/test/53_symbols.dts2
-rw-r--r--tools/binman/test/58_x86_ucode_spl_needs_retry.dts2
-rwxr-xr-xtools/binman/test/u_boot_binman_symsbin4921 -> 4916 bytes
-rw-r--r--tools/binman/test/u_boot_binman_syms.c6
24 files changed, 36 insertions, 36 deletions
diff --git a/tools/binman/test/08_pack.dts b/tools/binman/test/08_pack.dts
index dc63d99dcb..a88785d835 100644
--- a/tools/binman/test/08_pack.dts
+++ b/tools/binman/test/08_pack.dts
@@ -24,7 +24,7 @@
u-boot-fixed {
type = "u-boot";
- pos = <61>;
+ offset = <61>;
};
};
};
diff --git a/tools/binman/test/12_pack_inv_align.dts b/tools/binman/test/12_pack_inv_align.dts
index 1d9d80a65c..d8dd600edb 100644
--- a/tools/binman/test/12_pack_inv_align.dts
+++ b/tools/binman/test/12_pack_inv_align.dts
@@ -6,7 +6,7 @@
binman {
u-boot {
- pos = <5>;
+ offset = <5>;
align = <4>;
};
};
diff --git a/tools/binman/test/14_pack_overlap.dts b/tools/binman/test/14_pack_overlap.dts
index 611cfd9730..3895cba3bd 100644
--- a/tools/binman/test/14_pack_overlap.dts
+++ b/tools/binman/test/14_pack_overlap.dts
@@ -10,7 +10,7 @@
u-boot-align {
type = "u-boot";
- pos = <3>;
+ offset = <3>;
};
};
};
diff --git a/tools/binman/test/21_image_pad.dts b/tools/binman/test/21_image_pad.dts
index bf39dc1b6f..c6516689d9 100644
--- a/tools/binman/test/21_image_pad.dts
+++ b/tools/binman/test/21_image_pad.dts
@@ -10,7 +10,7 @@
};
u-boot {
- pos = <20>;
+ offset = <20>;
};
};
};
diff --git a/tools/binman/test/24_sorted.dts b/tools/binman/test/24_sorted.dts
index 43a7831341..d35d39f077 100644
--- a/tools/binman/test/24_sorted.dts
+++ b/tools/binman/test/24_sorted.dts
@@ -5,13 +5,13 @@
#size-cells = <1>;
binman {
- sort-by-pos;
+ sort-by-offset;
u-boot {
- pos = <22>;
+ offset = <22>;
};
u-boot-spl {
- pos = <1>;
+ offset = <1>;
};
};
};
diff --git a/tools/binman/test/25_pack_zero_size.dts b/tools/binman/test/25_pack_zero_size.dts
index 7d2baad3c6..e863c44e3f 100644
--- a/tools/binman/test/25_pack_zero_size.dts
+++ b/tools/binman/test/25_pack_zero_size.dts
@@ -9,7 +9,7 @@
};
u-boot-spl {
- pos = <0>;
+ offset = <0>;
};
};
};
diff --git a/tools/binman/test/27_pack_4gb_no_size.dts b/tools/binman/test/27_pack_4gb_no_size.dts
index e0b6519e75..371cca10d5 100644
--- a/tools/binman/test/27_pack_4gb_no_size.dts
+++ b/tools/binman/test/27_pack_4gb_no_size.dts
@@ -5,14 +5,14 @@
#size-cells = <1>;
binman {
- sort-by-pos;
+ sort-by-offset;
end-at-4gb;
u-boot {
- pos = <0xfffffff0>;
+ offset = <0xfffffff0>;
};
u-boot-spl {
- pos = <0xfffffff7>;
+ offset = <0xfffffff7>;
};
};
};
diff --git a/tools/binman/test/28_pack_4gb_outside.dts b/tools/binman/test/28_pack_4gb_outside.dts
index 18d6bb5b8a..2216abfb70 100644
--- a/tools/binman/test/28_pack_4gb_outside.dts
+++ b/tools/binman/test/28_pack_4gb_outside.dts
@@ -5,15 +5,15 @@
#size-cells = <1>;
binman {
- sort-by-pos;
+ sort-by-offset;
end-at-4gb;
size = <32>;
u-boot {
- pos = <0>;
+ offset = <0>;
};
u-boot-spl {
- pos = <0xffffffeb>;
+ offset = <0xffffffeb>;
};
};
};
diff --git a/tools/binman/test/29_x86-rom.dts b/tools/binman/test/29_x86-rom.dts
index d49078e19e..d5c69f9d4a 100644
--- a/tools/binman/test/29_x86-rom.dts
+++ b/tools/binman/test/29_x86-rom.dts
@@ -5,15 +5,15 @@
#size-cells = <1>;
binman {
- sort-by-pos;
+ sort-by-offset;
end-at-4gb;
size = <32>;
u-boot {
- pos = <0xffffffe0>;
+ offset = <0xffffffe0>;
};
u-boot-spl {
- pos = <0xffffffeb>;
+ offset = <0xffffffeb>;
};
};
};
diff --git a/tools/binman/test/30_x86-rom-me-no-desc.dts b/tools/binman/test/30_x86-rom-me-no-desc.dts
index 68d3ce09ec..796cb87afc 100644
--- a/tools/binman/test/30_x86-rom-me-no-desc.dts
+++ b/tools/binman/test/30_x86-rom-me-no-desc.dts
@@ -5,12 +5,12 @@
#size-cells = <1>;
binman {
- sort-by-pos;
+ sort-by-offset;
end-at-4gb;
size = <16>;
intel-me {
filename = "me.bin";
- pos-unset;
+ offset-unset;
};
};
};
diff --git a/tools/binman/test/31_x86-rom-me.dts b/tools/binman/test/31_x86-rom-me.dts
index ee3dac875a..b8b0a5a74b 100644
--- a/tools/binman/test/31_x86-rom-me.dts
+++ b/tools/binman/test/31_x86-rom-me.dts
@@ -5,7 +5,7 @@
#size-cells = <1>;
binman {
- sort-by-pos;
+ sort-by-offset;
end-at-4gb;
size = <0x800000>;
intel-descriptor {
@@ -14,7 +14,7 @@
intel-me {
filename = "me.bin";
- pos-unset;
+ offset-unset;
};
};
};
diff --git a/tools/binman/test/34_x86_ucode.dts b/tools/binman/test/34_x86_ucode.dts
index 64a6c2c3d5..40725731cd 100644
--- a/tools/binman/test/34_x86_ucode.dts
+++ b/tools/binman/test/34_x86_ucode.dts
@@ -5,7 +5,7 @@
#size-cells = <1>;
binman {
- sort-by-pos;
+ sort-by-offset;
end-at-4gb;
size = <0x200>;
u-boot-with-ucode-ptr {
diff --git a/tools/binman/test/35_x86_single_ucode.dts b/tools/binman/test/35_x86_single_ucode.dts
index 973e97f864..2b1f086a41 100644
--- a/tools/binman/test/35_x86_single_ucode.dts
+++ b/tools/binman/test/35_x86_single_ucode.dts
@@ -5,7 +5,7 @@
#size-cells = <1>;
binman {
- sort-by-pos;
+ sort-by-offset;
end-at-4gb;
size = <0x200>;
u-boot-with-ucode-ptr {
diff --git a/tools/binman/test/37_x86_no_ucode.dts b/tools/binman/test/37_x86_no_ucode.dts
index 9e12156ee2..6da49c3da6 100644
--- a/tools/binman/test/37_x86_no_ucode.dts
+++ b/tools/binman/test/37_x86_no_ucode.dts
@@ -5,7 +5,7 @@
#size-cells = <1>;
binman {
- sort-by-pos;
+ sort-by-offset;
end-at-4gb;
size = <0x200>;
u-boot-with-ucode-ptr {
diff --git a/tools/binman/test/38_x86_ucode_missing_node.dts b/tools/binman/test/38_x86_ucode_missing_node.dts
index d6cf0d844e..720677c9c1 100644
--- a/tools/binman/test/38_x86_ucode_missing_node.dts
+++ b/tools/binman/test/38_x86_ucode_missing_node.dts
@@ -5,7 +5,7 @@
#size-cells = <1>;
binman {
- sort-by-pos;
+ sort-by-offset;
end-at-4gb;
size = <0x200>;
u-boot-with-ucode-ptr {
diff --git a/tools/binman/test/39_x86_ucode_missing_node2.dts b/tools/binman/test/39_x86_ucode_missing_node2.dts
index b7e26c5ae4..10ac086d54 100644
--- a/tools/binman/test/39_x86_ucode_missing_node2.dts
+++ b/tools/binman/test/39_x86_ucode_missing_node2.dts
@@ -5,7 +5,7 @@
#size-cells = <1>;
binman {
- sort-by-pos;
+ sort-by-offset;
end-at-4gb;
size = <0x200>;
u-boot-with-ucode-ptr {
diff --git a/tools/binman/test/40_x86_ucode_not_in_image.dts b/tools/binman/test/40_x86_ucode_not_in_image.dts
index 67d17d392f..609725824a 100644
--- a/tools/binman/test/40_x86_ucode_not_in_image.dts
+++ b/tools/binman/test/40_x86_ucode_not_in_image.dts
@@ -5,7 +5,7 @@
#size-cells = <1>;
binman {
- sort-by-pos;
+ sort-by-offset;
size = <0x200>;
u-boot-with-ucode-ptr {
};
diff --git a/tools/binman/test/44_x86_optional_ucode.dts b/tools/binman/test/44_x86_optional_ucode.dts
index abe1322798..24a7040d31 100644
--- a/tools/binman/test/44_x86_optional_ucode.dts
+++ b/tools/binman/test/44_x86_optional_ucode.dts
@@ -5,7 +5,7 @@
#size-cells = <1>;
binman {
- sort-by-pos;
+ sort-by-offset;
end-at-4gb;
size = <0x200>;
u-boot-with-ucode-ptr {
diff --git a/tools/binman/test/45_prop_test.dts b/tools/binman/test/45_prop_test.dts
index d22e460d29..064de2b316 100644
--- a/tools/binman/test/45_prop_test.dts
+++ b/tools/binman/test/45_prop_test.dts
@@ -5,12 +5,12 @@
#size-cells = <1>;
binman {
- sort-by-pos;
+ sort-by-offset;
end-at-4gb;
size = <16>;
intel-me {
filename = "me.bin";
- pos-unset;
+ offset-unset;
intval = <3>;
intarray = <5 6>;
byteval = [08];
diff --git a/tools/binman/test/49_x86_ucode_spl.dts b/tools/binman/test/49_x86_ucode_spl.dts
index 67db93ad50..350d2c4730 100644
--- a/tools/binman/test/49_x86_ucode_spl.dts
+++ b/tools/binman/test/49_x86_ucode_spl.dts
@@ -5,7 +5,7 @@
#size-cells = <1>;
binman {
- sort-by-pos;
+ sort-by-offset;
end-at-4gb;
size = <0x200>;
u-boot-spl-with-ucode-ptr {
diff --git a/tools/binman/test/53_symbols.dts b/tools/binman/test/53_symbols.dts
index 980b066eb2..9f135676cb 100644
--- a/tools/binman/test/53_symbols.dts
+++ b/tools/binman/test/53_symbols.dts
@@ -10,7 +10,7 @@
};
u-boot {
- pos = <20>;
+ offset = <20>;
};
u-boot-spl2 {
diff --git a/tools/binman/test/58_x86_ucode_spl_needs_retry.dts b/tools/binman/test/58_x86_ucode_spl_needs_retry.dts
index e2cb80cf6e..a04adaaf7b 100644
--- a/tools/binman/test/58_x86_ucode_spl_needs_retry.dts
+++ b/tools/binman/test/58_x86_ucode_spl_needs_retry.dts
@@ -7,7 +7,7 @@
#size-cells = <1>;
binman {
- sort-by-pos;
+ sort-by-offset;
end-at-4gb;
size = <0x200>;
u-boot-spl-with-ucode-ptr {
diff --git a/tools/binman/test/u_boot_binman_syms b/tools/binman/test/u_boot_binman_syms
index 2e02dc0ca9..f2dcb887ed 100755
--- a/tools/binman/test/u_boot_binman_syms
+++ b/tools/binman/test/u_boot_binman_syms
Binary files differ
diff --git a/tools/binman/test/u_boot_binman_syms.c b/tools/binman/test/u_boot_binman_syms.c
index d8371610a5..cbb2f3f7b1 100644
--- a/tools/binman/test/u_boot_binman_syms.c
+++ b/tools/binman/test/u_boot_binman_syms.c
@@ -8,6 +8,6 @@
#define CONFIG_BINMAN
#include <binman_sym.h>
-binman_sym_declare(unsigned long, u_boot_spl, pos);
-binman_sym_declare(unsigned long long, u_boot_spl2, pos);
-binman_sym_declare(unsigned long, u_boot_any, pos);
+binman_sym_declare(unsigned long, u_boot_spl, offset);
+binman_sym_declare(unsigned long long, u_boot_spl2, offset);
+binman_sym_declare(unsigned long, u_boot_any, offset);