summaryrefslogtreecommitdiff
path: root/tools/binman/test
diff options
context:
space:
mode:
Diffstat (limited to 'tools/binman/test')
-rw-r--r--tools/binman/test/021_image_pad.dts2
-rw-r--r--tools/binman/test/024_sorted.dts2
-rw-r--r--tools/binman/test/028_pack_4gb_outside.dts2
-rw-r--r--tools/binman/test/029_x86_rom.dts (renamed from tools/binman/test/029_x86-rom.dts)2
-rw-r--r--tools/binman/test/030_x86_rom_me_no_desc.dts (renamed from tools/binman/test/030_x86-rom-me-no-desc.dts)0
-rw-r--r--tools/binman/test/031_x86_rom_me.dts (renamed from tools/binman/test/031_x86-rom-me.dts)0
-rw-r--r--tools/binman/test/032_intel_vga.dts (renamed from tools/binman/test/032_intel-vga.dts)0
-rw-r--r--tools/binman/test/033_x86_start16.dts (renamed from tools/binman/test/033_x86-start16.dts)0
-rw-r--r--tools/binman/test/042_intel_fsp.dts (renamed from tools/binman/test/042_intel-fsp.dts)0
-rw-r--r--tools/binman/test/043_intel_cmc.dts (renamed from tools/binman/test/043_intel-cmc.dts)0
-rw-r--r--tools/binman/test/046_intel_vbt.dts (renamed from tools/binman/test/046_intel-vbt.dts)0
-rw-r--r--tools/binman/test/048_x86_start16_spl.dts (renamed from tools/binman/test/048_x86-start16-spl.dts)0
-rw-r--r--tools/binman/test/053_symbols.dts2
-rw-r--r--tools/binman/test/081_x86_start16_tpl.dts (renamed from tools/binman/test/081_x86-start16-tpl.dts)0
-rw-r--r--tools/binman/test/098_4gb_and_skip_at_start_together.dts (renamed from tools/binman/test/80_4gb_and_skip_at_start_together.dts)0
-rw-r--r--tools/binman/test/111_x86_rom_ifwi.dts (renamed from tools/binman/test/111_x86-rom-ifwi.dts)2
-rw-r--r--tools/binman/test/112_x86_rom_ifwi_nodesc.dts (renamed from tools/binman/test/112_x86-rom-ifwi-nodesc.dts)2
-rw-r--r--tools/binman/test/113_x86_rom_ifwi_nodata.dts (renamed from tools/binman/test/113_x86-rom-ifwi-nodata.dts)2
-rw-r--r--tools/binman/test/144_x86_reset16.dts13
-rw-r--r--tools/binman/test/145_x86_reset16_spl.dts13
-rw-r--r--tools/binman/test/146_x86_reset16_tpl.dts13
-rw-r--r--tools/binman/test/147_intel_fit.dts20
-rw-r--r--tools/binman/test/148_intel_fit_missing.dts17
-rw-r--r--tools/binman/test/149_symbols_tpl.dts28
-rw-r--r--tools/binman/test/150_powerpc_mpc85xx_bootpg_resetvec.dts (renamed from tools/binman/test/81_powerpc_mpc85xx_bootpg_resetvec.dts)0
-rw-r--r--tools/binman/test/151_x86_rom_ifwi_section.dts33
-rw-r--r--tools/binman/test/152_intel_fsp_m.dts14
-rw-r--r--tools/binman/test/Makefile14
-rwxr-xr-xtools/binman/test/bss_databin5020 -> 0 bytes
-rwxr-xr-xtools/binman/test/u_boot_binman_symsbin4924 -> 0 bytes
-rw-r--r--tools/binman/test/u_boot_binman_syms.c1
-rw-r--r--tools/binman/test/u_boot_binman_syms.lds1
-rwxr-xr-xtools/binman/test/u_boot_binman_syms_badbin4890 -> 0 bytes
-rwxr-xr-xtools/binman/test/u_boot_binman_syms_sizebin4825 -> 0 bytes
-rwxr-xr-xtools/binman/test/u_boot_no_ucode_ptrbin4182 -> 0 bytes
-rwxr-xr-xtools/binman/test/u_boot_ucode_ptrbin4175 -> 0 bytes
-rw-r--r--tools/binman/test/u_boot_ucode_ptr.lds3
37 files changed, 171 insertions, 15 deletions
diff --git a/tools/binman/test/021_image_pad.dts b/tools/binman/test/021_image_pad.dts
index c6516689d9..1ff8dab296 100644
--- a/tools/binman/test/021_image_pad.dts
+++ b/tools/binman/test/021_image_pad.dts
@@ -10,7 +10,7 @@
};
u-boot {
- offset = <20>;
+ offset = <24>;
};
};
};
diff --git a/tools/binman/test/024_sorted.dts b/tools/binman/test/024_sorted.dts
index d35d39f077..b79d9adf68 100644
--- a/tools/binman/test/024_sorted.dts
+++ b/tools/binman/test/024_sorted.dts
@@ -7,7 +7,7 @@
binman {
sort-by-offset;
u-boot {
- offset = <22>;
+ offset = <26>;
};
u-boot-spl {
diff --git a/tools/binman/test/028_pack_4gb_outside.dts b/tools/binman/test/028_pack_4gb_outside.dts
index 2216abfb70..11a1f6059e 100644
--- a/tools/binman/test/028_pack_4gb_outside.dts
+++ b/tools/binman/test/028_pack_4gb_outside.dts
@@ -13,7 +13,7 @@
};
u-boot-spl {
- offset = <0xffffffeb>;
+ offset = <0xffffffe7>;
};
};
};
diff --git a/tools/binman/test/029_x86-rom.dts b/tools/binman/test/029_x86_rom.dts
index d5c69f9d4a..88aa007bba 100644
--- a/tools/binman/test/029_x86-rom.dts
+++ b/tools/binman/test/029_x86_rom.dts
@@ -13,7 +13,7 @@
};
u-boot-spl {
- offset = <0xffffffeb>;
+ offset = <0xffffffe7>;
};
};
};
diff --git a/tools/binman/test/030_x86-rom-me-no-desc.dts b/tools/binman/test/030_x86_rom_me_no_desc.dts
index 796cb87afc..796cb87afc 100644
--- a/tools/binman/test/030_x86-rom-me-no-desc.dts
+++ b/tools/binman/test/030_x86_rom_me_no_desc.dts
diff --git a/tools/binman/test/031_x86-rom-me.dts b/tools/binman/test/031_x86_rom_me.dts
index b8b0a5a74b..b8b0a5a74b 100644
--- a/tools/binman/test/031_x86-rom-me.dts
+++ b/tools/binman/test/031_x86_rom_me.dts
diff --git a/tools/binman/test/032_intel-vga.dts b/tools/binman/test/032_intel_vga.dts
index 9c532d03d3..9c532d03d3 100644
--- a/tools/binman/test/032_intel-vga.dts
+++ b/tools/binman/test/032_intel_vga.dts
diff --git a/tools/binman/test/033_x86-start16.dts b/tools/binman/test/033_x86_start16.dts
index 2e279dee9d..2e279dee9d 100644
--- a/tools/binman/test/033_x86-start16.dts
+++ b/tools/binman/test/033_x86_start16.dts
diff --git a/tools/binman/test/042_intel-fsp.dts b/tools/binman/test/042_intel_fsp.dts
index 8a7c889251..8a7c889251 100644
--- a/tools/binman/test/042_intel-fsp.dts
+++ b/tools/binman/test/042_intel_fsp.dts
diff --git a/tools/binman/test/043_intel-cmc.dts b/tools/binman/test/043_intel_cmc.dts
index 5a56c7d881..5a56c7d881 100644
--- a/tools/binman/test/043_intel-cmc.dts
+++ b/tools/binman/test/043_intel_cmc.dts
diff --git a/tools/binman/test/046_intel-vbt.dts b/tools/binman/test/046_intel_vbt.dts
index 733f5751d5..733f5751d5 100644
--- a/tools/binman/test/046_intel-vbt.dts
+++ b/tools/binman/test/046_intel_vbt.dts
diff --git a/tools/binman/test/048_x86-start16-spl.dts b/tools/binman/test/048_x86_start16_spl.dts
index e2009f15f0..e2009f15f0 100644
--- a/tools/binman/test/048_x86-start16-spl.dts
+++ b/tools/binman/test/048_x86_start16_spl.dts
diff --git a/tools/binman/test/053_symbols.dts b/tools/binman/test/053_symbols.dts
index 9f135676cb..8af575158f 100644
--- a/tools/binman/test/053_symbols.dts
+++ b/tools/binman/test/053_symbols.dts
@@ -10,7 +10,7 @@
};
u-boot {
- offset = <20>;
+ offset = <24>;
};
u-boot-spl2 {
diff --git a/tools/binman/test/081_x86-start16-tpl.dts b/tools/binman/test/081_x86_start16_tpl.dts
index 68e6bbd68f..68e6bbd68f 100644
--- a/tools/binman/test/081_x86-start16-tpl.dts
+++ b/tools/binman/test/081_x86_start16_tpl.dts
diff --git a/tools/binman/test/80_4gb_and_skip_at_start_together.dts b/tools/binman/test/098_4gb_and_skip_at_start_together.dts
index 90c467d910..90c467d910 100644
--- a/tools/binman/test/80_4gb_and_skip_at_start_together.dts
+++ b/tools/binman/test/098_4gb_and_skip_at_start_together.dts
diff --git a/tools/binman/test/111_x86-rom-ifwi.dts b/tools/binman/test/111_x86_rom_ifwi.dts
index 63b5972cc8..c0ba4f2ea4 100644
--- a/tools/binman/test/111_x86-rom-ifwi.dts
+++ b/tools/binman/test/111_x86_rom_ifwi.dts
@@ -20,7 +20,7 @@
convert-fit;
u-boot-tpl {
- replace;
+ ifwi-replace;
ifwi-subpart = "IBBP";
ifwi-entry = "IBBL";
};
diff --git a/tools/binman/test/112_x86-rom-ifwi-nodesc.dts b/tools/binman/test/112_x86_rom_ifwi_nodesc.dts
index 21ec4654ff..0874440ab5 100644
--- a/tools/binman/test/112_x86-rom-ifwi-nodesc.dts
+++ b/tools/binman/test/112_x86_rom_ifwi_nodesc.dts
@@ -19,7 +19,7 @@
filename = "ifwi.bin";
u-boot-tpl {
- replace;
+ ifwi-replace;
ifwi-subpart = "IBBP";
ifwi-entry = "IBBL";
};
diff --git a/tools/binman/test/113_x86-rom-ifwi-nodata.dts b/tools/binman/test/113_x86_rom_ifwi_nodata.dts
index 62486fd990..82a4bc8cdd 100644
--- a/tools/binman/test/113_x86-rom-ifwi-nodata.dts
+++ b/tools/binman/test/113_x86_rom_ifwi_nodata.dts
@@ -20,7 +20,7 @@
_testing {
return-unknown-contents;
- replace;
+ ifwi-replace;
ifwi-subpart = "IBBP";
ifwi-entry = "IBBL";
};
diff --git a/tools/binman/test/144_x86_reset16.dts b/tools/binman/test/144_x86_reset16.dts
new file mode 100644
index 0000000000..ba90333b27
--- /dev/null
+++ b/tools/binman/test/144_x86_reset16.dts
@@ -0,0 +1,13 @@
+/dts-v1/;
+
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ binman {
+ size = <16>;
+
+ x86-reset16 {
+ };
+ };
+};
diff --git a/tools/binman/test/145_x86_reset16_spl.dts b/tools/binman/test/145_x86_reset16_spl.dts
new file mode 100644
index 0000000000..cc8d97a7e6
--- /dev/null
+++ b/tools/binman/test/145_x86_reset16_spl.dts
@@ -0,0 +1,13 @@
+/dts-v1/;
+
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ binman {
+ size = <16>;
+
+ x86-reset16-spl {
+ };
+ };
+};
diff --git a/tools/binman/test/146_x86_reset16_tpl.dts b/tools/binman/test/146_x86_reset16_tpl.dts
new file mode 100644
index 0000000000..041b16f3de
--- /dev/null
+++ b/tools/binman/test/146_x86_reset16_tpl.dts
@@ -0,0 +1,13 @@
+/dts-v1/;
+
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ binman {
+ size = <16>;
+
+ x86-reset16-tpl {
+ };
+ };
+};
diff --git a/tools/binman/test/147_intel_fit.dts b/tools/binman/test/147_intel_fit.dts
new file mode 100644
index 0000000000..01ec40e5c7
--- /dev/null
+++ b/tools/binman/test/147_intel_fit.dts
@@ -0,0 +1,20 @@
+/dts-v1/;
+
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ binman {
+ end-at-4gb;
+ size = <0x80>;
+
+ u-boot {
+ };
+
+ intel-fit {
+ };
+
+ intel-fit-ptr {
+ };
+ };
+};
diff --git a/tools/binman/test/148_intel_fit_missing.dts b/tools/binman/test/148_intel_fit_missing.dts
new file mode 100644
index 0000000000..388c76b1ab
--- /dev/null
+++ b/tools/binman/test/148_intel_fit_missing.dts
@@ -0,0 +1,17 @@
+/dts-v1/;
+
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ binman {
+ end-at-4gb;
+ size = <0x80>;
+
+ u-boot {
+ };
+
+ intel-fit-ptr {
+ };
+ };
+};
diff --git a/tools/binman/test/149_symbols_tpl.dts b/tools/binman/test/149_symbols_tpl.dts
new file mode 100644
index 0000000000..dfc84af5e7
--- /dev/null
+++ b/tools/binman/test/149_symbols_tpl.dts
@@ -0,0 +1,28 @@
+/dts-v1/;
+
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ binman {
+ pad-byte = <0xff>;
+ u-boot-spl {
+ offset = <4>;
+ };
+
+ u-boot-spl2 {
+ offset = <0x1c>;
+ type = "u-boot-spl";
+ };
+
+ u-boot {
+ offset = <0x34>;
+ };
+
+ section {
+ u-boot-tpl {
+ type = "u-boot-tpl";
+ };
+ };
+ };
+};
diff --git a/tools/binman/test/81_powerpc_mpc85xx_bootpg_resetvec.dts b/tools/binman/test/150_powerpc_mpc85xx_bootpg_resetvec.dts
index 8f4b16c399..8f4b16c399 100644
--- a/tools/binman/test/81_powerpc_mpc85xx_bootpg_resetvec.dts
+++ b/tools/binman/test/150_powerpc_mpc85xx_bootpg_resetvec.dts
diff --git a/tools/binman/test/151_x86_rom_ifwi_section.dts b/tools/binman/test/151_x86_rom_ifwi_section.dts
new file mode 100644
index 0000000000..7e455c3a4b
--- /dev/null
+++ b/tools/binman/test/151_x86_rom_ifwi_section.dts
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ binman {
+ sort-by-offset;
+ end-at-4gb;
+ size = <0x800000>;
+ intel-descriptor {
+ filename = "descriptor.bin";
+ };
+
+ intel-ifwi {
+ offset-unset;
+ filename = "fitimage.bin";
+ convert-fit;
+
+ section {
+ ifwi-replace;
+ ifwi-subpart = "IBBP";
+ ifwi-entry = "IBBL";
+ u-boot-tpl {
+ };
+ u-boot-dtb {
+ };
+ };
+ };
+ };
+};
diff --git a/tools/binman/test/152_intel_fsp_m.dts b/tools/binman/test/152_intel_fsp_m.dts
new file mode 100644
index 0000000000..b6010f31c2
--- /dev/null
+++ b/tools/binman/test/152_intel_fsp_m.dts
@@ -0,0 +1,14 @@
+/dts-v1/;
+
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ binman {
+ size = <16>;
+
+ intel-fsp-m {
+ filename = "fsp_m.bin";
+ };
+ };
+};
diff --git a/tools/binman/test/Makefile b/tools/binman/test/Makefile
index e58fc80775..bdbb009874 100644
--- a/tools/binman/test/Makefile
+++ b/tools/binman/test/Makefile
@@ -1,5 +1,5 @@
#
-# Builds test programs
+# Builds test programs. This is launched from elf_test.BuildElfTestFiles()
#
# Copyright (C) 2017 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
@@ -7,11 +7,13 @@
# SPDX-License-Identifier: GPL-2.0+
#
-CFLAGS := -march=i386 -m32 -nostdlib -I ../../../include
+VPATH := $(SRC)
+CFLAGS := -march=i386 -m32 -nostdlib -I $(SRC)../../../include \
+ -Wl,--no-dynamic-linker
-LDS_UCODE := -T u_boot_ucode_ptr.lds
-LDS_BINMAN := -T u_boot_binman_syms.lds
-LDS_BINMAN_BAD := -T u_boot_binman_syms_bad.lds
+LDS_UCODE := -T $(SRC)u_boot_ucode_ptr.lds
+LDS_BINMAN := -T $(SRC)u_boot_binman_syms.lds
+LDS_BINMAN_BAD := -T $(SRC)u_boot_binman_syms_bad.lds
TARGETS = u_boot_ucode_ptr u_boot_no_ucode_ptr bss_data \
u_boot_binman_syms u_boot_binman_syms.bin u_boot_binman_syms_bad \
@@ -25,7 +27,7 @@ u_boot_no_ucode_ptr: u_boot_no_ucode_ptr.c
u_boot_ucode_ptr: CFLAGS += $(LDS_UCODE)
u_boot_ucode_ptr: u_boot_ucode_ptr.c
-bss_data: CFLAGS += bss_data.lds
+bss_data: CFLAGS += $(SRC)bss_data.lds
bss_data: bss_data.c
u_boot_binman_syms.bin: u_boot_binman_syms
diff --git a/tools/binman/test/bss_data b/tools/binman/test/bss_data
deleted file mode 100755
index afa28282aa..0000000000
--- a/tools/binman/test/bss_data
+++ /dev/null
Binary files differ
diff --git a/tools/binman/test/u_boot_binman_syms b/tools/binman/test/u_boot_binman_syms
deleted file mode 100755
index 126a1a6230..0000000000
--- a/tools/binman/test/u_boot_binman_syms
+++ /dev/null
Binary files differ
diff --git a/tools/binman/test/u_boot_binman_syms.c b/tools/binman/test/u_boot_binman_syms.c
index 4898f983e3..4520b319f1 100644
--- a/tools/binman/test/u_boot_binman_syms.c
+++ b/tools/binman/test/u_boot_binman_syms.c
@@ -11,3 +11,4 @@
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, image_pos);
+binman_sym_declare(unsigned long, u_boot_any, size);
diff --git a/tools/binman/test/u_boot_binman_syms.lds b/tools/binman/test/u_boot_binman_syms.lds
index 29cf9d0e54..926df873cb 100644
--- a/tools/binman/test/u_boot_binman_syms.lds
+++ b/tools/binman/test/u_boot_binman_syms.lds
@@ -25,5 +25,6 @@ SECTIONS
KEEP(*(SORT(.binman_sym*)));
__binman_sym_end = .;
}
+ .interp : { *(.interp*) }
}
diff --git a/tools/binman/test/u_boot_binman_syms_bad b/tools/binman/test/u_boot_binman_syms_bad
deleted file mode 100755
index 8da3d9d48f..0000000000
--- a/tools/binman/test/u_boot_binman_syms_bad
+++ /dev/null
Binary files differ
diff --git a/tools/binman/test/u_boot_binman_syms_size b/tools/binman/test/u_boot_binman_syms_size
deleted file mode 100755
index d691e897c0..0000000000
--- a/tools/binman/test/u_boot_binman_syms_size
+++ /dev/null
Binary files differ
diff --git a/tools/binman/test/u_boot_no_ucode_ptr b/tools/binman/test/u_boot_no_ucode_ptr
deleted file mode 100755
index f72462f0be..0000000000
--- a/tools/binman/test/u_boot_no_ucode_ptr
+++ /dev/null
Binary files differ
diff --git a/tools/binman/test/u_boot_ucode_ptr b/tools/binman/test/u_boot_ucode_ptr
deleted file mode 100755
index dbfb184cec..0000000000
--- a/tools/binman/test/u_boot_ucode_ptr
+++ /dev/null
Binary files differ
diff --git a/tools/binman/test/u_boot_ucode_ptr.lds b/tools/binman/test/u_boot_ucode_ptr.lds
index 0cf9b762b5..cf4d1b8bbd 100644
--- a/tools/binman/test/u_boot_ucode_ptr.lds
+++ b/tools/binman/test/u_boot_ucode_ptr.lds
@@ -9,9 +9,10 @@ ENTRY(_start)
SECTIONS
{
- . = 0xfffffdf0;
+ . = 0xfffffe14;
_start = .;
.ucode : {
*(.ucode)
}
+ .interp : { *(.interp*) }
}