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 doc-2023-10-rc3-2

Browse source 
Documentation:
 
 * csf_examples: csf.sh: Remove unneeded export ATF_LOAD_ADDR line
 * printf() codes: correct format specifier for unsigned int
 * Fix typos in clk.h, irq.h.
 * Correct description of proftool
 
 Other:
 
 * Quieten test for erofs filesystem presence
 * spl: don't assume NVMe partition 1 exists
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEbcT5xx8ppvoGt20zxIHbvCwFGsQFAmTgJesACgkQxIHbvCwF
 GsTteA/+OrA4XhmKbR9FPV+8Prwxs+SdRzTxBQ/UTz0UqjreICcpoPlk8ca8oAUa
 Tlg631k+ROdESEj6H7V3Q/pe3iPp9zyXpSAXJjtVxUwJ/C9xJRTwveuOhyNVM8d8
 st5BCfGVA/qrx5dmUw8Nj7QrPCoPpo05hL5X2McTsbGtJupwvzPH4GRCRkro4Zuq
 lVB1yEL2jwyjQ+wUPojQwxcaqYX26T7jHiU+NQz3ZNMhynFhnq9iO2PYMo3d+IIc
 9EiBBDJnACJg/uVam8urLJqn7tbuAroMat6/Unw7lHoAJgoQDjYhD2DnK/cEHIYU
 lIWZrwBeZGDKDSu0NM+FBSPygA9MwnIyLqDjW55qIquDYwms41ElQFeHjmnvAvJX
 8Kq1Souj+VAJzu6CRQOQAgpyBrWvbXMSnzYBVnKNFfwnKco07mR2xIys7CnkKQsA
 /Ig3VG5xaRpQCJ9jG4nGRVqC0/ivNeye7GIB6YbtktZywk1+bOamsf1LrFsqq+/G
 vf5qQvoJcwDtXeDmOAXRz0KEgRXR+Abc4DXexYJ7YDQiUavUv7cCPGUpSS6pP1Jy
 M1l6TgpP0Gk8ZN1I1dCyeEdDSZGgBAXYL8No1K/tC1STsrD/RjNEPyFywOQtzXis
 +iQ/pq+NZaWObN4CEB084Rx632QA8pxJz0ewu8eD/RFfrVZpRhg=
 =d5QR
 -----END PGP SIGNATURE-----

Merge tag 'doc-2023-10-rc3-2' of https://source.denx.de/u-boot/custodians/u-boot-efi

Pull request doc-2023-10-rc3-2

Documentation:

* csf_examples: csf.sh: Remove unneeded export ATF_LOAD_ADDR line
* printf() codes: correct format specifier for unsigned int
* Fix typos in clk.h, irq.h.
* Correct description of proftool

Other:

* Quieten test for erofs filesystem presence
* spl: don't assume NVMe partition 1 exists
This commit is contained in:
Tom Rini 2023-08-19 10:13:28 -04:00
commit 406a5ddf9d
7 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/spl/spl_blk_fs.c
View file

@ -44,7 +44,6 @@ int spl_blk_load_image(struct spl_image_info *spl_image,
enum uclass_id uclass_id, int devnum, int partnum)
{
const char *filename = CONFIG_SPL_FS_LOAD_PAYLOAD_NAME;
struct disk_partition part_info = {};
struct legacy_img_hdr *header;
struct blk_desc *blk_desc;
loff_t actlen, filesize;
@ -59,11 +58,6 @@ int spl_blk_load_image(struct spl_image_info *spl_image,
blk_show_device(uclass_id, devnum);
header = spl_get_load_buffer(-sizeof(*header), sizeof(*header));
ret = part_get_info(blk_desc, 1, &part_info);
if (ret) {
printf("spl: no partition table found. Err - %d\n", ret);
goto out;
}
dev.ifname = blk_get_uclass_name(uclass_id);
snprintf(dev.dev_part_str, sizeof(dev.dev_part_str) - 1, "%x:%x",

6
doc/develop/printf.rst
View file

@ -105,19 +105,19 @@ for the individual integer types.
=================== ==================
Type Format specifier
=================== ==================
bool %d, %x
bool %d, %x
char %d, %x
unsigned char %u, %x
short %d, %x
unsigned short %u, %x
int %d, %x
unsigned int %d, %x
unsigned int %u, %x
long %ld, %lx
unsigned long %lu, %lx
long long %lld, %llx
unsigned long long %llu, %llx
off_t %llu, %llx
ptr_diff_t %td, %tx
ptr_diff_t %td, %tx
fdt_addr_t %pa, see pointers
fdt_size_t %pa, see pointers
phys_addr_t %pa, see pointers

6
doc/develop/trace.rst
View file

@ -139,7 +139,7 @@ There is a -f option available to select a function graph:
.. code-block:: console
$ ./sandbox/tools/proftool -m sandbox/System.map -t trace -f funcgraph dump-ftrace >trace.dat
$ ./sandbox/tools/proftool -m sandbox/System.map -t trace -f funcgraph dump-ftrace -o trace.dat
Again, you can use kernelshark or trace-cmd to look at the output. In this case
you will see the time taken by each function shown against its exit record.
@ -171,7 +171,7 @@ command:
.. code-block:: console
$ ./sandbox/tools/proftool -m sandbox/System.map -t trace dump-flamegraph >trace.fg
$ ./sandbox/tools/proftool -m sandbox/System.map -t trace dump-flamegraph -o trace.fg
$ flamegraph.pl trace.fg >trace.svg
You can load the .svg file into a viewer. If you use Chrome (and some other
@ -191,7 +191,7 @@ spend in each call stack:
.. code-block:: console
$ ./sandbox/tools/proftool -m sandbox/System.map -t trace dump-flamegraph -f timing >trace.fg
$ ./sandbox/tools/proftool -m sandbox/System.map -t trace dump-flamegraph -f timing -o trace.fg
$ flamegraph.pl trace.fg >trace.svg
Note that trace collection does slow down execution so the timings will be

1
doc/imx/habv4/csf_examples/mx8m/csf.sh
View file

@ -11,7 +11,6 @@
# 1) Build U-Boot (e.g. for i.MX8MM)
#
# export ATF_LOAD_ADDR=0x920000
# cp -Lv /path/to/arm-trusted-firmware/build/imx8mm/release/bl31.bin .
# cp -Lv /path/to/firmware-imx-8.14/firmware/ddr/synopsys/ddr3* .
# make -j imx8mm_board_defconfig

4
fs/erofs/super.c
View file

@ -68,14 +68,14 @@ int erofs_read_superblock(void)
ret = erofs_blk_read(data, 0, erofs_blknr(sizeof(data)));
if (ret < 0) {
erofs_err("cannot read erofs superblock: %d", ret);
erofs_dbg("cannot read erofs superblock: %d", ret);
return -EIO;
}
dsb = (struct erofs_super_block *)(data + EROFS_SUPER_OFFSET);
ret = -EINVAL;
if (le32_to_cpu(dsb->magic) != EROFS_SUPER_MAGIC_V1) {
erofs_err("cannot find valid erofs superblock");
erofs_dbg("cannot find valid erofs superblock");
return ret;
}

2
include/clk-uclass.h
View file

@ -64,7 +64,7 @@ int of_xlate(struct clk *clock, struct ofnode_phandle_args *args);
/**
* request() - Request a translated clock.
* @clock: The clock struct to request; this has been fille in by
* @clock: The clock struct to request; this has been filled in by
* a previoux xxx_xlate() function call, or by the caller
* of clk_request().
*

2
include/irq.h
View file

@ -109,7 +109,7 @@ struct irq_ops {
* xxx_xlate() call, or as the only step in implementing a client's
* irq_request() call.
*
* @irq: The irq struct to request; this has been fille in by
* @irq: The irq struct to request; this has been filled in by
* a previoux xxx_xlate() function call, or by the caller
* of irq_request().
* @return 0 if OK, or a negative error code.