Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 13:43:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Pull request efi-2024-04-rc5

Browse source 
Documentation:
 
 * fix Python string escapes
 * develop: commands: Fix function prototype
 * fix incorrect path Documentation
 * fix mistyped "env flags" command
 * board: phytec: phycore-am62x: Update artifact names
 
 UEFI:
 
 * Invoke ft_board_setup() before efi_carve_out_dt_rsv()
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEK7wKXt3/btL6/yA+hO4vgnE3U0sFAmXyQU0ACgkQhO4vgnE3
 U0v5Ww/+LFusLohjO6aIE65NsMvEFUMXIZe2Ll6jBOXV+T8/foDnsRsFaeVx1GL5
 lJOjnlHSED3/Q3JIhL8KWn35CovykhLxsWkqdmvssXPuZH1k9Q2OZnyBnYcYJMJA
 kguEvpF6ynf70JGPK8w/GgNzqf2qzKe6SYTdgWKQeYO3mhcQT7pGvFXWK0qDVG47
 HKGY+g2vXD0GQxzeeIiVr1ZAQUu+FmXeiPDEIQ4tKki7HEoFvuj5rCldZEIelzHF
 LXGZ9nlHAOHK+7USkL+3vMs7VOvxndXi77maW8i0Dcn8bFcBP3/pJcduoNBZHHBS
 vnILeKux63FuhIxnHOGBP3OoxbW8RsZhn5C6+K/IMpKWzFw6Y577ZSp+dNKp9Gpc
 3P3HFTzXVQX6j7MqvsnMNCOHvGJ3ZFUJFsXx2r6bfKX8VcxMCbFbJg/fNu102f4y
 WCwWtgNmW4EuOHUupEfSnOLSZhRT1gliom5wcvTdt0ML9Z7mP9bYz+LkT+/P2WMA
 oEeppMo0+MSlbhoXX11UT8/hJD4n/tB85yrmUkuq2K3u+YRw0hy+3WpOT/62u9CC
 320HEX6XKrD8mvNM1XpWtylVo8KQNws0FBfWIrCwpDE52sKfHqlIVu95g3ZqyEOl
 bHFLQocagoCO8Pzdllm9N1rfTAGL84h2w2C4kmQTCUrzYvAkl6s=
 =QKo8
 -----END PGP SIGNATURE-----

Merge tag 'efi-2024-04-rc5' of https://source.denx.de/u-boot/custodians/u-boot-efi

Pull request efi-2024-04-rc5

Documentation:

* fix Python string escapes
* develop: commands: Fix function prototype
* fix incorrect path Documentation
* fix mistyped "env flags" command
* board: phytec: phycore-am62x: Update artifact names

UEFI:

* Invoke ft_board_setup() before efi_carve_out_dt_rsv()
This commit is contained in:
Tom Rini 2024-03-13 20:39:46 -04:00
commit 86fd291a79
8 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/board/phytec/phycore-am62x.rst
View file

@ -92,9 +92,9 @@ Assuming the uSD card is `/dev/mmcblk0`:
To boot from a micro SD card on a HSFS device simply copy the following
artifacts to the FAT partition:
* tiboot3.bin from R5 build as tiboot3.bin
* tispl.bin_unsigned from Cortex-A build as tispl.bin
* u-boot.img_unsigned from Cortex-A build as u-boot.img
* tiboot3.bin from R5 build
* tispl.bin from Cortex-A build
* u-boot.img from Cortex-A build
Boot
----

2
doc/develop/commands.rst
View file

@ -88,7 +88,7 @@ The command function pointer has to be of type
.. code-block:: c
int (*cmd)(struct cmd_tbl *cmdtp, int flag, int argc, const char *argv[]);
int (*cmd)(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
cmdtp
Table entry describing the command (see above).

2
doc/sphinx/cdomain.py
View file

@ -93,7 +93,7 @@ def markup_ctype_refs(match):
#
RE_expr = re.compile(r':c:(expr|texpr):`([^\`]+)`')
def markup_c_expr(match):
return '\ ``' + match.group(2) + '``\ '
return '\\ ``' + match.group(2) + '``\\ '
#
# Parse Sphinx 3.x C markups, replacing them by backward-compatible ones

2
doc/sphinx/kernel_abi.py
View file

@ -147,7 +147,7 @@ class KernelCmd(Directive):
code_block += "\n " + l
lines = code_block + "\n\n"
line_regex = re.compile("^#define LINENO (\S+)\#([0-9]+)$")
line_regex = re.compile(r"^#define LINENO (\S+)\#([0-9]+)$")
ln = 0
n = 0
f = fname

2
doc/sphinx/kerneldoc.py
View file

@ -130,7 +130,7 @@ class KernelDocDirective(Directive):
result = ViewList()
lineoffset = 0;
line_regex = re.compile("^#define LINENO ([0-9]+)$")
line_regex = re.compile(r"^#define LINENO ([0-9]+)$")
for line in lines:
match = line_regex.search(line)
if match:

14
doc/sphinx/maintainers_include.py
View file

@ -78,8 +78,8 @@ class MaintainersInclude(Include):
# Drop needless input whitespace.
line = line.rstrip()
# Linkify all non-wildcard refs to ReST files in Documentation/.
pat = '(Documentation/([^\s\?\*]*)\.rst)'
# Linkify all non-wildcard refs to ReST files in doc/.
pat = r'(doc/([^\s\?\*]*)\.rst)'
m = re.search(pat, line)
if m:
# maintainers.rst is in a subdirectory, so include "../".
@ -92,11 +92,11 @@ class MaintainersInclude(Include):
output = "| %s" % (line.replace("\\", "\\\\"))
# Look for and record field letter to field name mappings:
# R: Designated *reviewer*: FullName <address@domain>
m = re.search("\s(\S):\s", line)
m = re.search(r"\s(\S):\s", line)
if m:
field_letter = m.group(1)
if field_letter and not field_letter in fields:
m = re.search("\*([^\*]+)\*", line)
m = re.search(r"\*([^\*]+)\*", line)
if m:
fields[field_letter] = m.group(1)
elif subsystems:
@ -114,7 +114,7 @@ class MaintainersInclude(Include):
field_content = ""
# Collapse whitespace in subsystem name.
heading = re.sub("\s+", " ", line)
heading = re.sub(r"\s+", " ", line)
output = output + "%s\n%s" % (heading, "~" * len(heading))
field_prev = ""
else:
@ -177,11 +177,11 @@ class MaintainersInclude(Include):
if not self.state.document.settings.file_insertion_enabled:
raise self.warning('"%s" directive disabled.' % self.name)
# Walk up source path directories to find Documentation/../
# Walk up source path directories to find doc/../
path = self.state_machine.document.attributes['source']
path = os.path.realpath(path)
tail = path
while tail != "Documentation" and tail != "":
while tail != "doc" and tail != "":
(path, tail) = os.path.split(path)
# Append "MAINTAINERS"

2
doc/usage/cmd/env.rst
View file

@ -350,7 +350,7 @@ edit
exists
CONFIG_CMD_ENV_EXISTS
flsgs
flags
CONFIG_CMD_ENV_FLAGS
erase

11
lib/efi_loader/efi_helper.c
View file

@ -456,11 +456,11 @@ efi_status_t efi_install_fdt(void *fdt)
return EFI_LOAD_ERROR;
}
/* Create memory reservations as indicated by the device tree */
efi_carve_out_dt_rsv(fdt);
if (CONFIG_IS_ENABLED(GENERATE_ACPI_TABLE))
if (CONFIG_IS_ENABLED(GENERATE_ACPI_TABLE)) {
/* Create memory reservations as indicated by the device tree */
efi_carve_out_dt_rsv(fdt);
return EFI_SUCCESS;
}
/* Prepare device tree for payload */
ret = copy_fdt(&fdt);
@ -474,6 +474,9 @@ efi_status_t efi_install_fdt(void *fdt)
return EFI_LOAD_ERROR;
}
/* Create memory reservations as indicated by the device tree */
efi_carve_out_dt_rsv(fdt);
efi_try_purge_kaslr_seed(fdt);
if (CONFIG_IS_ENABLED(EFI_TCG2_PROTOCOL_MEASURE_DTB)) {