diff options
| author | Tom Rini <[email protected]> | 2025-03-24 20:10:55 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-03-24 20:10:55 -0600 |
| commit | 647cb87b5ab2ad6469cf42f3272f00688bd26039 (patch) | |
| tree | 80e947190747a13ece8909ee95dbfed016f49170 /scripts | |
| parent | d574229880378081691dc06c430424015be0740c (diff) | |
| parent | 3d8be1f5ec30180748259a251efe4f63c8b4b329 (diff) | |
Merge tag 'v2025.04-rc5' into next
Prepare v2025.04-rc5
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.lib | 4 | ||||
| -rwxr-xr-x | scripts/checkpatch.pl | 6 | ||||
| -rwxr-xr-x | scripts/event_dump.py | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 18993435eae..275c308154b 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -513,8 +513,8 @@ $(obj)/%_efi.S: $(obj)/%.efi $(call cmd,S_efi) quiet_cmd_efi_objcopy = OBJCOPY $@ -cmd_efi_objcopy = $(OBJCOPY) -j .header -j .text -j .sdata -j .data -j \ - .dynamic -j .dynsym -j .rel* -j .rela* -j .reloc \ +cmd_efi_objcopy = $(OBJCOPY) -j .header -j .text -j .sdata -j .data \ + -j .dynamic -j .dynstr -j .dynsym -j .rel* -j .reloc \ $(if $(EFI_TARGET),$(EFI_TARGET),-O binary) $^ $@ $(obj)/%.efi: $(obj)/%_efi.so diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index f9f8891c0c4..414019c5b89 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2692,6 +2692,12 @@ sub u_boot_line { ERROR("PRE_SCHEMA", "Driver model schema uses 'bootph-...' tags now\n" . $herecurr); } + + # Do not allow CONFIG_xPL_BUILD in device trees + if ($realfile =~ /\.dtsi?$/ && $line =~ /^\+.*CONFIG_(X|S|T|V)PL_BUILD.*/) { + ERROR("CONFIG_xPL_BUILD", + "Do not use CONFIG_xPL_BUILD in device trees\n" . $herecurr); + } } sub exclude_global_initialisers { diff --git a/scripts/event_dump.py b/scripts/event_dump.py index 24dfe2bda91..61bb3a8eb92 100755 --- a/scripts/event_dump.py +++ b/scripts/event_dump.py @@ -107,7 +107,7 @@ def main(argv): Args: argv (list of str): List of program arguments, excluding arvg[0] """ - epilog = 'Show a list of even spies in a U-Boot EFL file' + epilog = 'Show a list of event spies in a U-Boot ELF file' parser = ArgumentParser(epilog=epilog) parser.add_argument('elf', type=str, help='ELF file to decode') parser.add_argument('-e', '--endian', type=str, default='auto', |