Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Pull request for efi-2023-04-rc1-2

Browse source 
Documentation
 
 * man-pages for source, blkcache, bdinfo
 * fix references to distro documentation
 
 UEFI:
 
 * allow clear screen by scrolling
 * ensure that file ubootefi.var is created
 * fix CapsuleMax variable reporting
 
 Others:
 
 * reduce verbosity of fat_read_file()
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEbcT5xx8ppvoGt20zxIHbvCwFGsQFAmPK4d8ACgkQxIHbvCwF
 GsTF7g/9GV5pCoXX3Z3y5s7aLdbCrTxl0R1cMkVEupwQ2t9kIhenVxI1xC/lYIq4
 8DQN5LEB98iH9Ivl28nnsbQnznHlAh0MOzIEVgw0UcAvxLT59hCHyaNcFPAXQsE6
 oVb0H6EX1QhP6j645nHtTq8dbgXP+a8VCN6KFE+j4mS46h+4wQwmV8hHZh/sUF4X
 bFs4aAkRULndQ3hrgj+GnNwQwEnek9VUkoa+28qOwZdAmRrfQfz3uY8mcvE+k0lh
 fHHu6+7KMOBR0wC288/tdCcejyDmPseFU1aflbxJ7GqOp3Jfth2MK+mmKFJ0FeeQ
 mJtlcLXH7fEdymisoVSBpwYFeN+G394yxLNhqnVP2zt88gDFp42zNz56tT6vOhR7
 t5VjmdpWqQOff9A0U7FCtatM8D7kCVDME+prVztQuQ92ED3GiBuY+NHggHo2GgC6
 tezJRpYLD9OBFIfDVRPYDJ0M4NISCCFzHLYQqUZ/IE9InHS34j4oGfjkPgCuxO5l
 y8caw2tcxazdX+QZ2m2jdf0i1pyexk/pYsPBtZcmwg1vwNzFg4a9E19Uq4+IxJVg
 1LyKQ84QdcSzYE8DKZVaqG4Dg2MQZz8huMV35/H/xXIFhsU983HKLGIyG6Cjtuc/
 aAasn2kGlD4mulEB76aXNO09Mb6F0lQwW6yCzN8g+2RKugsEq3w=
 =gM74
 -----END PGP SIGNATURE-----

Merge tag 'efi-2023-04-rc1-2' of https://source.denx.de/u-boot/custodians/u-boot-efi

Pull request for efi-2023-04-rc1-2

Documentation

* man-pages for source, blkcache, bdinfo
* fix references to distro documentation

UEFI:

* allow clear screen by scrolling
* ensure that file ubootefi.var is created
* fix CapsuleMax variable reporting

Others:

* reduce verbosity of fat_read_file()
This commit is contained in:
Tom Rini 2023-01-20 14:23:20 -05:00
commit dd31cd58b0
16 changed files with 434 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/README.gpt
View file

@ -177,7 +177,7 @@ To restore GUID partition table one needs to:
"name=u-boot,size=60MiB;name=boot,size=60Mib,bootable;name=rootfs,size=0"
It can be used to locate bootable disks with command
"part list <interface> <dev> -bootable <varname>",
please check out doc/README.distro for use.
please check out doc/develop/distro.rst for use.
2. Define 'CONFIG_EFI_PARTITION' and 'CONFIG_CMD_GPT'

2
doc/README.uniphier
View file

@ -336,7 +336,7 @@ Deployment for Distro Boot
--------------------------
UniPhier SoC family boot the kernel in a generic manner as described in
doc/README.distro .
doc/develop/distro.rst.
To boot the kernel, you need to deploy necesssary components to a file
system on one of your block devices (eMMC, NAND, USB drive, etc.).

3
doc/board/emulation/qemu-x86.rst
View file

@ -57,7 +57,8 @@ to instantiate. Note, the maximum supported CPU number in QEMU is 255.
U-Boot uses 'distro_bootcmd' by default when booting on x86 QEMU. This tries to
load a boot script, kernel, and ramdisk from several different interfaces. For
the default boot order, see 'qemu-x86.h'. For more information, see
'README.distro'. Most Linux distros can be booted by writing a uboot script.
'doc/develop/distro.rst'. Most Linux distros can be booted by writing a uboot
script.
For example, Debian (stretch) can be booted by creating a script file named
'boot.txt' with the contents::

2
doc/board/st/stm32mp1.rst
View file

@ -478,7 +478,7 @@ or:
+-------+--------+---------+------------------------+------------------------+
And the 4th partition (Rootfs) is marked bootable with a file extlinux.conf
following the Generic Distribution feature (doc/README.distro for use).
following the Generic Distribution feature (doc/develop/distro.rst for use).
The size of fip or ssbl partition must be enough for the associated binary file,
4MB and 2MB are default values.

2
doc/board/tbs/tbs2910.rst
View file

@ -181,7 +181,7 @@ If that fails it will then try to boot from several interfaces using
'distro_bootcmd': It will first try to boot from the microSD slot, then the
SD slot, then the internal eMMC, then the SATA interface and finally the USB
interface. For more information on how to configure your distribution to boot,
see 'README.distro'.
see 'doc/develop/distro.rst'.
Links:
------

119
doc/usage/cmd/bdinfo.rst Normal file
View file

@ -0,0 +1,119 @@
.. SPDX-License-Identifier: GPL-2.0+
.. Copyright 2023, Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
bdinfo command
==============
Synopsis
--------
::
bdinfo
Description
-----------
The *bdinfo* command prints information about the board.
Example
=======
::
=> bdinfo
boot_params = 0x0000000000000000
DRAM bank = 0x0000000000000000
-> start = 0x0000000040000000
-> size = 0x0000000100000000
flashstart = 0x0000000000000000
flashsize = 0x0000000004000000
flashoffset = 0x00000000000e87f8
baudrate = 115200 bps
relocaddr = 0x000000013fefb000
reloc off = 0x000000013fefb000
Build = 64-bit
current eth = virtio-net#32
ethaddr = 52:52:52:52:52:52
IP addr = 10.0.2.15
fdt_blob = 0x000000013edbadb0
new_fdt = 0x000000013edbadb0
fdt_size = 0x0000000000100000
lmb_dump_all:
memory.cnt = 0x1
memory[0] [0x40000000-0x13fffffff], 0x100000000 bytes flags: 0
reserved.cnt = 0x2
reserved[0] [0x13ddb3000-0x13fffffff], 0x0224d000 bytes flags: 0
reserved[1] [0x13edb6930-0x13fffffff], 0x012496d0 bytes flags: 0
devicetree = board
arch_number = 0x0000000000000000
TLB addr = 0x000000013fff0000
irq_sp = 0x000000013edbada0
sp start = 0x000000013edbada0
Early malloc usage: 3a8 / 2000
=>
boot_params
address of the memory area for boot parameters
DRAM bank
index, start address and end address of a memory bank
baudrate
baud rate of the serial console
relocaddr
address to which U-Boot has relocated itself
reloc off
relocation offset, difference between *relocaddr* and the text base
Build
bitness of the system
current eth
name of the active network device
IP addr
network address, value of the environment variable *ipaddr*
fdt_blob
address of U-Boot's own device tree, NULL if none
new_fdt
location of the relocated device tree
fdt_size
space reserved for relocated device space
lmb_dump_all
available memory and memory reservations
devicetree
source of the device-tree
arch_number
unique id for the board
TLB addr
address of the translation lookaside buffer
irq_sp
address of the IRQ stack pointer
sp start
initial stack pointer address
Early malloc usage
amount of memory used in the early malloc memory and its maximum size
as defined by CONFIGSYS_MALLOC_F_LEN
Configuration
-------------
The bdinfo command is available if CONFIG_CMD_BDI=y.
Return code
-----------
The return code $? is 0 (true).

74
doc/usage/cmd/blkcache.rst Normal file
View file

@ -0,0 +1,74 @@
.. SPDX-License-Identifier: GPL-2.0+
.. Copyright 2023, Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
blkcache command
================
Synopsis
--------
::
blkcache show
blkcache configure <blocks> <entries>
Description
-----------
The *blkcache* command is used to control the size of the block cache and to
display statistics.
The block cache buffers data read from block devices. This speeds up the access
to file-systems.
show
show and reset statistics
configure
set the maximum number of cache entries and the maximum number of blocks per
entry
blocks
maximum number of blocks per cache entry. The block size is device specific.
The initial value is 8.
entries
maximum number of entries in the cche. The initial value is 32.
Example
-------
.. code-block::
=> blkcache show
hits: 296
misses: 149
entries: 7
max blocks/entry: 8
max cache entries: 32
=> blkcache show
hits: 0
misses: 0
entries: 7
max blocks/entry: 8
max cache entries: 32
=> blkcache configure 16 64
changed to max of 64 entries of 16 blocks each
=> blkcache show
hits: 0
misses: 0
entries: 0
max blocks/entry: 16
max cache entries: 64
=>
Configuration
-------------
The blkcache command is only available if CONFIG_CMD_BLOCK_CACHE=y.
Return code
-----------
If the command succeeds, the return code $? is set 0 (true). In case of an
error the return code is set to 1 (false).

193
doc/usage/cmd/source.rst Normal file
View file

@ -0,0 +1,193 @@
.. SPDX-License-Identifier: GPL-2.0+
.. Copyright 2022, Heinrich Schuchardt <xypron.glpk@gmx.de>
source command
==============
Synopsis
--------
::
source [<addr>][:[<image>]|#[<config>]]
Description
-----------
The *source* command is used to execute a script file from memory.
Two formats for script files exist:
* legacy U-Boot image format
* Flat Image Tree (FIT)
The benefit of the FIT images is that they can be signed and verifed as
decribed in :download:`signature.txt <../../uImage.FIT/signature.txt>`.
Both formats can be created with the mkimage tool.
addr
location of the script file in memory, defaults to CONFIG_SYS_LOAD_ADDR.
image
name of an image in a FIT file
config
name of a configuration in a FIT file. A hash sign following white space
starts a comment. Hence, if no *addr* is specified, the hash sign has to be
escaped with a backslash or the argument must be quoted.
If both *image* and *config* are omitted, the default configuration is used, or
if no configuration is defined, the default image.
Examples
--------
FIT image
'''''''''
For creating a FIT image an image tree source file (\*.its) is needed. Here is
an example (source.its).
.. code-block::
/dts-v1/;
/ {
description = "FIT image to test the source command";
#address-cells = <1>;
images {
default = "script-1";
script-1 {
data = "echo 1";
type = "script";
compression = "none";
};
script-2 {
data = "echo 2";
type = "script";
compression = "none";
};
};
configurations {
default = "conf-2";
conf-1 {
script = "script-1";
};
conf-2 {
script = "script-2";
};
};
};
The FIT image file (boot.itb) is created with:
.. code-block:: bash
mkimage -f source.its boot.itb
In U-Boot the script can be loaded and execute like this
.. code-block::
=> load host 0:1 $loadaddr boot.itb
1552 bytes read in 0 ms
=> source $loadaddr#conf-1
## Executing script at 00000000
1
=> source $loadaddr#conf-2
## Executing script at 00000000
2
=> source $loadaddr:script-1
## Executing script at 00000000
1
=> source $loadaddr:script-2
## Executing script at 00000000
2
=> source $loadaddr
## Executing script at 00000000
2
=> source \#conf-1
## Executing script at 00000000
1
=> source '#conf-1'
## Executing script at 00000000
1
=> source ':script-1'
## Executing script at 00000000
1
=> source
## Executing script at 00000000
2
=>
Instead of specifying command line instructions directly in the *data* property
of the image tree source file another file can be included. Here is a minimal
example which encapsulates the file boot.txt:
.. code-block::
/dts-v1/;
/ {
description = "";
images {
script {
data = /incbin/("./boot.txt");
type = "script";
};
};
};
Legacy U-Boot image
'''''''''''''''''''
A script file using the legacy U-Boot image file format can be created based on
a text file. Let's use this example text file (boot.txt):
.. code-block:: bash
echo Hello from a script
echo -------------------
The boot scripts (boot.scr) is created with:
.. code-block:: bash
mkimage -T script -n 'Test script' -d boot.txt boot.scr
The script can be execute in U-boot like this:
.. code-block::
=> load host 0:1 $loadaddr boot.scr
122 bytes read in 0 ms
=> source $loadaddr
## Executing script at 00000000
Hello from a script
-------------------
=> source
## Executing script at 00000000
Hello from a script
-------------------
=>
Configuration
-------------
The source command is only available if CONFIG_CMD_SOURCE=y.
The FIT image file format requires CONFIG_FIT=y.#
The legacy U-Boot image file format requires CONFIG_LEGACY_IMAGE_FORMAT=y.
On hardened systems support for the legacy U-Boot image format should be
disabled as these images cannot be signed and verified.
Return value
------------
If the scripts is executed successfully, the return value $? is 0 (true).
Otherwise it is 1 (false).

3
doc/usage/index.rst
View file

@ -23,6 +23,8 @@ Shell commands
cmd/addrmap
cmd/askenv
cmd/base
cmd/bdinfo
cmd/blkcache
cmd/bootd
cmd/bootdev
cmd/bootefi
@ -75,6 +77,7 @@ Shell commands
cmd/setexpr
cmd/size
cmd/sound
cmd/source
cmd/temperature
cmd/tftpput
cmd/true

22
fs/fat/fat.c
View file

@ -1243,8 +1243,8 @@ out_free_itr:
return ret;
}
int file_fat_read_at(const char *filename, loff_t pos, void *buffer,
loff_t maxsize, loff_t *actread)
int fat_read_file(const char *filename, void *buf, loff_t offset, loff_t len,
loff_t *actread)
{
fsdata fsdata;
fat_itr *itr;
@ -1261,12 +1261,12 @@ int file_fat_read_at(const char *filename, loff_t pos, void *buffer,
if (ret)
goto out_free_both;
debug("reading %s at pos %llu\n", filename, pos);
debug("reading %s at pos %llu\n", filename, offset);
/* For saving default max clustersize memory allocated to malloc pool */
dir_entry *dentptr = itr->dent;
ret = get_contents(&fsdata, dentptr, pos, buffer, maxsize, actread);
ret = get_contents(&fsdata, dentptr, offset, buf, len, actread);
out_free_both:
free(fsdata.fatbuf);
@ -1280,25 +1280,13 @@ int file_fat_read(const char *filename, void *buffer, int maxsize)
loff_t actread;
int ret;
ret = file_fat_read_at(filename, 0, buffer, maxsize, &actread);
ret = fat_read_file(filename, buffer, 0, maxsize, &actread);
if (ret)
return ret;
else
return actread;
}
int fat_read_file(const char *filename, void *buf, loff_t offset, loff_t len,
loff_t *actread)
{
int ret;
ret = file_fat_read_at(filename, offset, buf, len, actread);
if (ret)
printf("** Unable to read file %s **\n", filename);
return ret;
}
typedef struct {
struct fs_dir_stream parent;
struct fs_dirent dirent;

2
include/fat.h
View file

@ -200,8 +200,6 @@ static inline u32 sect_to_clust(fsdata *fsdata, int sect)
int file_fat_detectfs(void);
int fat_exists(const char *filename);
int fat_size(const char *filename, loff_t *size);
int file_fat_read_at(const char *filename, loff_t pos, void *buffer,
loff_t maxsize, loff_t *actread);
int file_fat_read(const char *filename, void *buffer, int maxsize);
int fat_set_blk_dev(struct blk_desc *rbdd, struct disk_partition *info);
int fat_register_device(struct blk_desc *dev_desc, int part_no);

9
lib/efi_loader/Kconfig
View file

@ -124,6 +124,15 @@ config EFI_SET_TIME
Provide the SetTime() runtime service at boottime. This service
can be used by an EFI application to adjust the real time clock.
config EFI_SCROLL_ON_CLEAR_SCREEN
bool "Avoid overwriting previous output on clear screen"
help
Instead of erasing the screen content when the console screen should
be cleared, emit blank new lines so that previous output is scrolled
out of sight rather than overwritten. On serial consoles this allows
to capture complete boot logs (except for interactive menus etc.)
and can ease debugging related issues.
config EFI_HAVE_CAPSULE_SUPPORT
bool

19
lib/efi_loader/efi_console.c
View file

@ -461,10 +461,21 @@ static efi_status_t EFIAPI efi_cout_set_attribute(
}
/**
* efi_cout_clear_screen() - clear screen
* efi_clear_screen() - clear screen
*/
static void efi_clear_screen(void)
{
if (CONFIG_IS_ENABLED(EFI_SCROLL_ON_CLEAR_SCREEN)) {
unsigned int row, screen_rows, screen_columns;
/* Avoid overwriting previous outputs on streaming consoles */
screen_rows = efi_cout_modes[efi_con_mode.mode].rows;
screen_columns = efi_cout_modes[efi_con_mode.mode].columns;
printf(ESC "[%u;%uH", screen_rows, screen_columns);
for (row = 1; row < screen_rows; row++)
printf("\n");
}
/*
* The Linux console wants both a clear and a home command. The video
* uclass does not support <ESC>[H without coordinates, yet.
@ -489,6 +500,12 @@ static efi_status_t EFIAPI efi_cout_clear_screen(
{
EFI_ENTRY("%p", this);
/* Set default colors if not done yet */
if (efi_con_mode.attribute == 0) {
efi_con_mode.attribute = 0x07;
printf(ESC "[0;37;40m");
}
efi_clear_screen();
return EFI_EXIT(EFI_SUCCESS);

2
lib/efi_loader/efi_setup.c
View file

@ -128,7 +128,7 @@ static efi_status_t efi_init_capsule(void)
{
efi_status_t ret = EFI_SUCCESS;
if (IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_UPDATE)) {
if (IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)) {
ret = efi_set_variable_int(u"CapsuleMax",
&efi_guid_capsule_report,
EFI_VARIABLE_READ_ONLY |

2
lib/efi_loader/efi_tcg2.c
View file

@ -2417,7 +2417,7 @@ efi_status_t efi_tcg2_register(void)
ret = platform_get_tpm2_device(&dev);
if (ret != EFI_SUCCESS) {
log_warning("Unable to find TPMv2 device\n");
log_warning("Missing TPMv2 device for EFI_TCG_PROTOCOL\n");
return EFI_SUCCESS;
}

8
lib/efi_loader/efi_variable.c
View file

@ -334,9 +334,11 @@ efi_status_t efi_set_variable_int(const u16 *variable_name,
else
ret = EFI_SUCCESS;
/* Write non-volatile EFI variables to file */
if (attributes & EFI_VARIABLE_NON_VOLATILE &&
ret == EFI_SUCCESS && efi_obj_list_initialized == EFI_SUCCESS)
/*
* Write non-volatile EFI variables to file
* TODO: check if a value change has occured to avoid superfluous writes
*/
if (attributes & EFI_VARIABLE_NON_VOLATILE)
efi_var_to_file();
return EFI_SUCCESS;