Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 5cfcf7e0fdb265672dd8ee7d3e881190ed06ff98

Authored by Simon Glass
1 parent 00ae40b3ae
Exists in smarc_8mq_lf_v2020.04 and in 20 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf-6.6.52-2.2.0, emb_lf_v2022.04, emb_lf_v2023.04, emb_lf_v2024.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

binman: Add tests binaries with binman symbols 

For testing we need to build some ELF files containing binman symbols. Add
these to the Makefile and check in the binaries:

   u_boot_binman_syms - normal, valid ELF file
   u_boot_binman_syms_bad - missing the __image_copy_start symbol
   u_boot_binman_syms_size - has a binman symbol with an invalid size

Signed-off-by: Simon Glass <sjg@chromium.org>

Showing 9 changed files with 103 additions and 1 deletions Inline Diff

tools/binman/test/Makefile
Diff comments   View file @ 5cfcf7e
1 # 1 #
2 # Builds test programs 2 # Builds test programs
3 # 3 #
4 # Copyright (C) 2017 Google, Inc 4 # Copyright (C) 2017 Google, Inc
5 # Written by Simon Glass <sjg@chromium.org> 5 # Written by Simon Glass <sjg@chromium.org>
6 # 6 #
7 # SPDX-License-Identifier: GPL-2.0+ 7 # SPDX-License-Identifier: GPL-2.0+
8 # 8 #
9 9
10 CFLAGS := -march=i386 -m32 -nostdlib -I ../../../include 10 CFLAGS := -march=i386 -m32 -nostdlib -I ../../../include
11 11
12 LDS_UCODE := -T u_boot_ucode_ptr.lds 12 LDS_UCODE := -T u_boot_ucode_ptr.lds
13 LDS_BINMAN := -T u_boot_binman_syms.lds
14 LDS_BINMAN_BAD := -T u_boot_binman_syms_bad.lds
13 15
14 TARGETS = u_boot_ucode_ptr u_boot_no_ucode_ptr bss_data 16 TARGETS = u_boot_ucode_ptr u_boot_no_ucode_ptr bss_data \
17 u_boot_binman_syms u_boot_binman_syms.bin u_boot_binman_syms_bad \
18 u_boot_binman_syms_size
15 19
16 all: $(TARGETS) 20 all: $(TARGETS)
17 21
18 u_boot_no_ucode_ptr: CFLAGS += $(LDS_UCODE) 22 u_boot_no_ucode_ptr: CFLAGS += $(LDS_UCODE)
19 u_boot_no_ucode_ptr: u_boot_no_ucode_ptr.c 23 u_boot_no_ucode_ptr: u_boot_no_ucode_ptr.c
20 24
21 u_boot_ucode_ptr: CFLAGS += $(LDS_UCODE) 25 u_boot_ucode_ptr: CFLAGS += $(LDS_UCODE)
22 u_boot_ucode_ptr: u_boot_ucode_ptr.c 26 u_boot_ucode_ptr: u_boot_ucode_ptr.c
23 27
24 bss_data: CFLAGS += bss_data.lds 28 bss_data: CFLAGS += bss_data.lds
25 bss_data: bss_data.c 29 bss_data: bss_data.c
30
31 u_boot_binman_syms.bin: u_boot_binman_syms
32 objcopy -O binary $< -R .note.gnu.build-id $@
33
34 u_boot_binman_syms: CFLAGS += $(LDS_BINMAN)
35 u_boot_binman_syms: u_boot_binman_syms.c
36
37 u_boot_binman_syms_bad: CFLAGS += $(LDS_BINMAN_BAD)
38 u_boot_binman_syms_bad: u_boot_binman_syms_bad.c
39
40 u_boot_binman_syms_size: CFLAGS += $(LDS_BINMAN)
41 u_boot_binman_syms_size: u_boot_binman_syms_size.c
26 42
27 clean: 43 clean:
28 rm -f $(TARGETS) 44 rm -f $(TARGETS)
29 45
30 help: 46 help:
31 @echo "Makefile for binman test programs" 47 @echo "Makefile for binman test programs"
32 @echo 48 @echo
33 @echo "Intended for use on x86 hosts" 49 @echo "Intended for use on x86 hosts"
34 @echo 50 @echo
35 @echo "Targets:" 51 @echo "Targets:"
36 @echo 52 @echo
37 @echo -e "\thelp - Print help (this is it!)" 53 @echo -e "\thelp - Print help (this is it!)"
38 @echo -e "\tall - Builds test programs (default targget)" 54 @echo -e "\tall - Builds test programs (default targget)"
39 @echo -e "\tclean - Delete output files" 55 @echo -e "\tclean - Delete output files"
40 56
tools/binman/test/u_boot_binman_syms
Diff comments   View file @ 5cfcf7e
No preview for this file type
tools/binman/test/u_boot_binman_syms.c
Diff comments   View file @ 5cfcf7e
File was created 1 /*
2 * Copyright (c) 2017 Google, Inc
3 *
4 * SPDX-License-Identifier: GPL-2.0+
5 *
6 * Simple program to create some binman symbols. This is used by binman tests.
7 */
8
9 #define CONFIG_BINMAN
10 #include <binman_sym.h>
11
12 binman_sym_declare(unsigned long, u_boot_spl, pos);
13 binman_sym_declare(unsigned long long, u_boot_spl2, pos);
14 binman_sym_declare(unsigned long, u_boot_any, pos);
15
tools/binman/test/u_boot_binman_syms.lds
Diff comments   View file @ 5cfcf7e
File was created 1 /*
2 * Copyright (c) 2016 Google, Inc
3 *
4 * SPDX-License-Identifier: GPL-2.0+
5 */
6
7 OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
8 OUTPUT_ARCH(i386)
9 ENTRY(_start)
10
11 SECTIONS
12 {
13 . = 0x00000000;
14 _start = .;
15
16 . = ALIGN(4);
17 .text :
18 {
19 __image_copy_start = .;
20 *(.text*)
21 }
22
23 . = ALIGN(4);
24 .binman_sym_table : {
25 __binman_sym_start = .;
26 KEEP(*(SORT(.binman_sym*)));
27 __binman_sym_end = .;
28 }
29
30 }
31
tools/binman/test/u_boot_binman_syms_bad
Diff comments   View file @ 5cfcf7e
No preview for this file type
tools/binman/test/u_boot_binman_syms_bad.c
Diff comments   View file @ 5cfcf7e
File was created 1 u_boot_binman_syms.c
tools/binman/test/u_boot_binman_syms_bad.lds
Diff comments   View file @ 5cfcf7e
File was created 1 /*
2 * Copyright (c) 2016 Google, Inc
3 *
4 * SPDX-License-Identifier: GPL-2.0+
5 */
6
7 OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
8 OUTPUT_ARCH(i386)
9 ENTRY(_start)
10
11 SECTIONS
12 {
13 . = 0x00000000;
14 _start = .;
15
16 . = ALIGN(4);
17 .text :
18 {
19 *(.text*)
20 }
21
22 . = ALIGN(4);
23 .binman_sym_table : {
24 __binman_sym_start = .;
25 KEEP(*(SORT(.binman_sym*)));
26 __binman_sym_end = .;
27 }
28
29 }
30
tools/binman/test/u_boot_binman_syms_size
Diff comments   View file @ 5cfcf7e
No preview for this file type
tools/binman/test/u_boot_binman_syms_size.c
Diff comments   View file @ 5cfcf7e
File was created 1 /*
2 * Copyright (c) 2017 Google, Inc
3 *
4 * SPDX-License-Identifier: GPL-2.0+
5 *
6 * Simple program to create some binman symbols. This is used by binman tests.
7 */
8
9 #define CONFIG_BINMAN
10 #include <binman_sym.h>
11
12 binman_sym_declare(char, u_boot_spl, pos);
13