July 2022 - U-Boot

Pull request for efi-2022-10-rc1
by Heinrich Schuchardt 14 Jul '22

14 Jul '22

Dear Tom, The following changes since commit 36b661dc919da318c163a45f4a220d2e3d9db608: Merge branch 'next' (2022-07-11 14:58:57 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2022-10-rc1 for you to fetch changes up to a093d72e628a798238269eb77850d57ee50198bb: MAINTAINERS: add Ilias Apalodimas to EFI PAYLOAD as co-maintainer (2022-07-13 20:11:10 +0200) Gitlab CI showed no issue: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/12738 ---------------------------------------------------------------- Pull request for efi-2022-10-rc1 Documentation: * rework the mkimage.1 man-page * add a statistics page for v2022.07 * update environment description UEFI: * add Ilias Apalodimas as co-maintainer * fix a memory leak in efi_set_bootdev() * suppress a build warning ---------------------------------------------------------------- Heinrich Schuchardt (3): efi_loader: memory leak in efi_set_bootdev() efi_loader: suppress executable stack warning MAINTAINERS: add Ilias Apalodimas to EFI PAYLOAD as co-maintainer Masahisa Kojima (1): efi_loader: expose END device path node Sean Anderson (14): doc: mkimage: Use standard style for synopsis doc: mkimage: Use empty request instead of blank lines doc: mkimage: Reformat examples doc: mkimage: Regularize option documentation doc: mkimage: Use subsection macro doc: mkimage: Rearrange/remove some options doc: mkimage: Use correct capitalization for NAME doc: mkimage: Edit options for style and consistency doc: mkimage: Add BUGS section doc: mkimage: Add SEE ALSO section doc: mkimage: Remove AUTHORS section mkimage: Add long options doc: mkimage: Further document -o and -R doc: Add man page for dumpimage Tom Rini (3): doc: environment: Drop u-boot_addr_r doc: environment: Expand on fdt_addr, initrd_addr and loadaddr doc: Add statistics page for v2022.07 MAINTAINERS | 1 + cmd/bootefi.c | 4 +- doc/develop/statistics/u-boot-stats-v2022.07.rst | 805 +++++++++++++++++ doc/dumpimage.1 | 103 +++ doc/mkimage.1 | 1003 ++++++++++++++++------ doc/usage/environment.rst | 16 +- include/efi_loader.h | 3 + lib/efi_loader/efi_device_path.c | 2 +- scripts/Makefile.lib | 4 +- tools/mkimage.c | 45 +- 10 files changed, 1693 insertions(+), 293 deletions(-) create mode 100644 doc/develop/statistics/u-boot-stats-v2022.07.rst create mode 100644 doc/dumpimage.1

2 1

[PATCH 1/1] efi_loader: remove support for CONFIG_LCD
by Heinrich Schuchardt 14 Jul '22

14 Jul '22

There is no board left using CONFIG_LCD without CONFIG_DM_VIDEO. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- lib/efi_loader/Makefile | 1 - lib/efi_loader/efi_gop.c | 5 ----- 2 files changed, 6 deletions(-) diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile index aaaa25cefe..f54c244c32 100644 --- a/lib/efi_loader/Makefile +++ b/lib/efi_loader/Makefile @@ -66,7 +66,6 @@ obj-$(CONFIG_EFI_VARIABLES_PRESEED) += efi_var_seed.o endif obj-y += efi_watchdog.o obj-$(CONFIG_EFI_ESRT) += efi_esrt.o -obj-$(CONFIG_LCD) += efi_gop.o obj-$(CONFIG_DM_VIDEO) += efi_gop.o obj-$(CONFIG_BLK) += efi_disk.o obj-$(CONFIG_NET) += efi_net.o diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c index 2c81859807..5908b5c646 100644 --- a/lib/efi_loader/efi_gop.c +++ b/lib/efi_loader/efi_gop.c @@ -8,7 +8,6 @@ #include <common.h> #include <dm.h> #include <efi_loader.h> -#include <lcd.h> #include <log.h> #include <malloc.h> #include <video.h> @@ -459,11 +458,7 @@ efi_status_t EFIAPI gop_blt(struct efi_gop *this, struct efi_gop_pixel *buffer, if (ret != EFI_SUCCESS) return EFI_EXIT(ret); -#ifdef CONFIG_DM_VIDEO video_sync_all(); -#else - lcd_sync(); -#endif return EFI_EXIT(EFI_SUCCESS); } -- 2.36.1

2 1

[PATCH 0/3] fs/fat: fix handling of full disk
by Heinrich Schuchardt 14 Jul '22

14 Jul '22

Currently we have two functions with redundant coding to find an empty cluster: * find_empty_cluster() seeks from the beginning of the FAT table * determine_fatent() seeks after a given entry Both do not detect the end of the FAT table correctly and return an invalid cluster number if no empty entry if found. Correctly determine empty FAT entries and full disk correctly. Carve out a function for creating directory entries to avoid code duplication. Heinrich Schuchardt (3): fs: fat: finding an empty FAT cluster fs: fat: determine_fatent() error handling fs: fat: carve out fat_create_dir_entry() fs/fat/fat_write.c | 161 ++++++++++++++++++++++----------------------- 1 file changed, 79 insertions(+), 82 deletions(-) -- 2.30.2

2 6

[PATCH] spl: sdp: Pass the USB index to board_usb_init()
by Fabio Estevam 14 Jul '22

14 Jul '22

From: Fabio Estevam <festevam(a)denx.de> board_usb_init() should receive the controller_index as its first parameter instead of having it hardcoded as 0. All in-tree users have CONFIG_SPL_SDP_USB_DEV as 0, so this error should not affect any board. Fix it by passing controller_index as the parameter of board_usb_init(). Signed-off-by: Fabio Estevam <festevam(a)denx.de> --- common/spl/spl_sdp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c index 36c31aff099a..cc4fb4f7cca2 100644 --- a/common/spl/spl_sdp.c +++ b/common/spl/spl_sdp.c @@ -19,7 +19,7 @@ static int spl_sdp_load_image(struct spl_image_info *spl_image, usb_gadget_initialize(controller_index); - board_usb_init(0, USB_INIT_DEVICE); + board_usb_init(controller_index, USB_INIT_DEVICE); g_dnl_clear_detach(); ret = g_dnl_register("usb_dnl_sdp"); -- 2.25.1

2 1

[PATCH] sunxi: configs: streamline include/configs/sun*.h wrappers
by Andre Przywara 13 Jul '22

13 Jul '22

For mostly historic reasons we had configuration headers for each Allwinner CPU "family". These days they are mostly just including one common header, with the rest being somewhat empty. There were attempts to remove them, and to just use the one common header to begin with, but this has implications to the build system, which me might not be ready for, yet. To document this behaviour, and to avoid something sneaking in over time, make those files all the same (minus the CPU family name and the copyrights), and add a comment explaining that. This makes it easier to just remove those files later on, when needed and possible. Signed-off-by: Andre Przywara <andre.przywara(a)arm.com> --- Hi Tom, this is mostly to just confirm and document what we already established earlier: that those files are redundant, and are just needed to match CONFIG_SYS_CONFIG_NAME. In case we don't need or want that anymore, we can just remove them, without needing to think too hard about it. Cheers, Andre include/configs/sun4i.h | 10 ++-------- include/configs/sun50i.h | 19 ++----------------- include/configs/sun5i.h | 10 ++-------- include/configs/sun6i.h | 7 ++----- include/configs/sun7i.h | 6 ++---- include/configs/sun8i.h | 13 ++----------- include/configs/sun9i.h | 11 ++--------- include/configs/suniv.h | 7 ++----- 8 files changed, 16 insertions(+), 67 deletions(-) diff --git a/include/configs/sun4i.h b/include/configs/sun4i.h index 0e1baa91bb..70d451f224 100644 --- a/include/configs/sun4i.h +++ b/include/configs/sun4i.h @@ -2,18 +2,12 @@ /* * (C) Copyright 2012-2013 Henrik Nordstrom <henrik(a)henriknordstrom.net> * - * Configuration settings for the Allwinner A10 (sun4i) CPU + * Placeholder wrapper to allow addressing Allwinner A10 (sun4i) CPU + * based devices separately. Please do not add anything in here. */ #ifndef __CONFIG_H #define __CONFIG_H -/* - * A10 specific configuration - */ - -/* - * Include common sunxi configuration where most the settings are - */ #include <configs/sunxi-common.h> #endif /* __CONFIG_H */ diff --git a/include/configs/sun50i.h b/include/configs/sun50i.h index bc2e3a3d00..dfcb321d42 100644 --- a/include/configs/sun50i.h +++ b/include/configs/sun50i.h @@ -1,26 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Configuration settings for the Allwinner A64 (sun50i) CPU + * Placeholder wrapper to allow addressing Allwinner A64 (and later) sun50i + * CPU based devices separately. Please do not add anything in here. */ - #ifndef __CONFIG_H #define __CONFIG_H -/* - * A64 specific configuration - */ - -#ifndef CONFIG_SUN50I_GEN_H6 -#define GICD_BASE 0x1c81000 -#define GICC_BASE 0x1c82000 -#else -#define GICD_BASE 0x3021000 -#define GICC_BASE 0x3022000 -#endif - -/* - * Include common sunxi configuration where most the settings are - */ #include <configs/sunxi-common.h> #endif /* __CONFIG_H */ diff --git a/include/configs/sun5i.h b/include/configs/sun5i.h index ada18de753..3017307854 100644 --- a/include/configs/sun5i.h +++ b/include/configs/sun5i.h @@ -2,18 +2,12 @@ /* * (C) Copyright 2012-2013 Henrik Nordstrom <henrik(a)henriknordstrom.net> * - * Configuration settings for the Allwinner A13 (sun5i) CPU + * Placeholder wrapper to allow addressing Allwinner A13 (sun5i) CPU + * based devices separately. Please do not add anything in here. */ #ifndef __CONFIG_H #define __CONFIG_H -/* - * High Level Configuration Options - */ - -/* - * Include common sunxi configuration where most the settings are - */ #include <configs/sunxi-common.h> #endif /* __CONFIG_H */ diff --git a/include/configs/sun6i.h b/include/configs/sun6i.h index 0b1fedda10..cbe04ac3c2 100644 --- a/include/configs/sun6i.h +++ b/include/configs/sun6i.h @@ -4,15 +4,12 @@ * (C) Copyright 2013 Luke Kenneth Casson Leighton <lkcl(a)lkcl.net> * (C) Copyright 2013 Maxime Ripard <maxime.ripard(a)free-electrons.com> * - * Configuration settings for the Allwinner A31 (sun6i) CPU + * Placeholder wrapper to allow addressing Allwinner A31 (sun6i) CPU + * based devices separately. Please do not add anything in here. */ - #ifndef __CONFIG_H #define __CONFIG_H -/* - * Include common sunxi configuration where most the settings are - */ #include <configs/sunxi-common.h> #endif /* __CONFIG_H */ diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h index bc2779fa26..ad24ab98b5 100644 --- a/include/configs/sun7i.h +++ b/include/configs/sun7i.h @@ -3,14 +3,12 @@ * (C) Copyright 2012-2013 Henrik Nordstrom <henrik(a)henriknordstrom.net> * (C) Copyright 2013 Luke Kenneth Casson Leighton <lkcl(a)lkcl.net> * - * Configuration settings for the Allwinner A20 (sun7i) CPU + * Placeholder wrapper to allow addressing Allwinner A20 (sun7i) CPU + * based devices separately. Please do not add anything in here. */ #ifndef __CONFIG_H #define __CONFIG_H -/* - * Include common sunxi configuration where most the settings are - */ #include <configs/sunxi-common.h> #endif /* __CONFIG_H */ diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h index 106139d090..b6cd8d39a8 100644 --- a/include/configs/sun8i.h +++ b/include/configs/sun8i.h @@ -2,21 +2,12 @@ /* * (C) Copyright 2014 Chen-Yu Tsai <wens(a)csie.org> * - * Configuration settings for the Allwinner A23 (sun8i) CPU + * Placeholder wrapper to allow addressing Allwinner A23 (and later) sun8i + * CPU based devices separately. Please do not add anything in here. */ - #ifndef __CONFIG_H #define __CONFIG_H -/* - * A23 specific configuration - */ - -#include <asm/arch/cpu.h> - -/* - * Include common sunxi configuration where most the settings are - */ #include <configs/sunxi-common.h> #endif /* __CONFIG_H */ diff --git a/include/configs/sun9i.h b/include/configs/sun9i.h index 6ee08cf0d9..6bf5fc3f66 100644 --- a/include/configs/sun9i.h +++ b/include/configs/sun9i.h @@ -2,19 +2,12 @@ /* * (C) Copyright 2015 Hans de Goede <hdegoede(a)redhat.com> * - * Configuration settings for the Allwinner A80 (sun9i) CPU + * Placeholder wrapper to allow addressing Allwinner A80 (sun9i) CPU + * based devices separately. Please do not add anything in here. */ - #ifndef __CONFIG_H #define __CONFIG_H -/* - * A80 specific configuration - */ - -/* - * Include common sunxi configuration where most the settings are - */ #include <configs/sunxi-common.h> #endif /* __CONFIG_H */ diff --git a/include/configs/suniv.h b/include/configs/suniv.h index 6118cd5e1a..9cc1a77f6c 100644 --- a/include/configs/suniv.h +++ b/include/configs/suniv.h @@ -1,14 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Configuration settings for new Allwinner F-series (suniv) CPU + * Placeholder wrapper to allow addressing Allwinner F-series (suniv) CPU + * based devices separately. Please do not add anything in here. */ - #ifndef __CONFIG_H #define __CONFIG_H -/* - * Include common sunxi configuration where most the settings are - */ #include <configs/sunxi-common.h> #endif /* __CONFIG_H */ -- 2.25.1

2 1

PRAM and reserved memory for Linux
by Joakim Tjernlund 13 Jul '22

13 Jul '22

I added CONFIG_PRAM 4 and a reserved-memory DTS node for the same space but now u-boot complains when booting: ERROR: reserving fdt memory region failed (addr=703ff000 size=1000) The error is caused by arch_lmb_reserve() in arm which seem to reserve command line and board info ? If I remove the reserved-memory DTS node I don't get a reserved area in Linux, don't quite understand how PRAM is supposed to work? Jocke

2 3

[PATCH 1/7] doc: Migrate CodingStyle wiki page to Sphinx
by Tom Rini 13 Jul '22

13 Jul '22

Move the current CodingStyle wiki page to doc/develop/codingstyle.rst. The changes here are for formatting or slight rewording so that it reads well when linking to other Sphinx documents. Cc: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- Changes in v2: - Assorted wiki -> Sphinx style corrections and a few typo fixes, per Heinrich --- doc/develop/codingstyle.rst | 255 ++++++++++++++++++++++++++++++++++++ doc/develop/index.rst | 8 ++ 2 files changed, 263 insertions(+) create mode 100644 doc/develop/codingstyle.rst diff --git a/doc/develop/codingstyle.rst b/doc/develop/codingstyle.rst new file mode 100644 index 000000000000..bbeca42e656b --- /dev/null +++ b/doc/develop/codingstyle.rst @@ -0,0 +1,255 @@ +.. SPDX-License-Identifier: GPL-2.0+: + +U-Boot Coding Style +=================== + +The following Coding Style requirements shall be mandatory for all code contributed to +the U-Boot project. + +Exceptions are only allowed if code from other projects is integrated with no +or only minimal changes. + +The following rules apply: + +* All contributions to U-Boot should conform to the `Linux kernel + coding style <https://www.kernel.org/doc/html/latest/process/coding-style.html>`_ + and the `Lindent script <https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/scr…>`_. + * The exception for net files to the `multi-line comment + <https://www.kernel.org/doc/html/latest/process/coding-style.html#commenting>`_ + applies only to Linux, not to U-Boot. Only large hunks which are copied + unchanged from Linux may retain that comment format. + +* Use patman to send your patches (``tools/patman/patman -H`` for full + instructions). With a few tags in your commits this will check your patches + and take care of emailing them. + +* If you don't use patman, make sure to run ``scripts/checkpatch.pl``. For + more information, read :doc:`checkpatch`. Note that this should be done + *before* posting on the mailing list! + +* Source files originating from different projects (for example the MTD + subsystem or the hush shell code from the BusyBox project) may, after + careful consideration, be exempted from these rules. For such files, the + original coding style may be kept to ease subsequent migration to newer + versions of those sources. + +* Please note that U-Boot is implemented in C (and to some small parts in + Assembler); no C++ is used, so please do not use C++ style comments (//) in + your code. + + * The sole exception here is for SPDX tags in some files (checkpatch.pl will warn you). + +* Please also stick to the following formatting rules: + + * Remove any trailing white space + + * Use TAB characters for indentation and vertical alignment, not spaces + + * Make sure NOT to use DOS ``\r\n`` line feeds + + * Do not add more than 2 consecutive empty lines to source files + + * Do not add trailing empty lines to source files + + * Using the option ``git config --global color.diff auto`` will help to + visually see whitespace problems in ``diff`` output from ``git``. + + * In Emacs one can use ``=M-x whitespace-global-mode=`` to get visual + feedback on the nasty details. ``=M-x whitespace-cleanup=`` does The Right + Thing (tm) + +Submissions of new code or patches that do not conform to these requirements +shall be rejected with a request to reformat the changes. + +U-Boot Code Documentation +------------------------- + +U-Boot adopted the kernel-doc annotation style, this is the only exception from +multi-line comment rule of Coding Style. While not mandatory, adding +documentation is strongly advised. The Linux kernel `kernel-doc +<https://www.kernel.org/doc/html/latest/doc-guide/kernel-doc.html>`_ +documentation applies with no changes. + +Use structures for I/O access +----------------------------- + +U-Boot typically uses a C structure to map out the registers in an I/O region, +rather than offsets. The reasons for this are: + +* It dissociates the register location (offset) from the register type, which + means the developer has to make sure the type is right for each access, + whereas with the struct method, this is checked by the compiler; + +* It avoids actually writing all offsets, which is (more) error- prone; + +* It allows for better compile time sanity-checking of values we write to registers. + +Some reasons why you might not use C structures: + +* Where the registers appear at different offsets in different hardware + revisions supported by the same driver + +* Where the driver only uses a small subset of registers and it is not worth + defining a struct to cover them all, with large empty regions + +* Where the offset of a register might be hard to figure out when buried a long + way down a structure, possibly with embedded sub-structures + +* This may need to change to the kernel model if we allow for more run-time + detection of what drivers are appropriate for what we're running on. + +Please use check_member() to verify that your structure is the expected size, +or that particular members appear at the right offset. + +Include files +------------- + +You should follow this ordering in U-Boot. The common.h header (which is going +away at some point) should always be first, followed by other headers in order, +then headers with directories, then local files: + +.. code-block:: C + + #include <common.h> + #include <bootstage.h> + #include <dm.h> + #include <others.h> + #include <asm/...> + #include <arm/arch/...> + #include <dm/device_compat/.h> + #include <linux/...> + #include "local.h" + +Within that order, sort your includes. + +It is important to include common.h first since it provides basic features used +by most files, e.g. CONFIG options. + +For files that need to be compiled for the host (e.g. tools), you need to use +``#ifndef USE_HOSTCC`` to avoid including common.h since it includes a lot of +internal U-Boot things. See common/image.c for an example. + +If your file uses driver model, include <dm.h> in the C file. Do not include +dm.h in a header file. Try to use forward declarations (e.g. ``struct +udevice``) instead. + +Filenames +--------- + +For .c and .h files try to use underscore rather than hyphen unless you want +the file to stand out (e.g. driver-model uclasses should be named xxx-uclass.h. +Avoid upper case and keep the names fairly short. + +Function and struct comments +---------------------------- + +Non-trivial functions should have a comment which describes what they do. If it +is an exported function, put the comment in the header file so the API is in +one place. If it is a static function, put it in the C file. + +If the function returns errors, mention that and list the different errors that +are returned. If it is merely passing errors back from a function it calls, +then you can skip that. + +See `here +<https://www.kernel.org/doc/html/latest/doc-guide/kernel-doc.html#function-d…>`_ +for style. + +Driver model +------------ + +When declaring a device, try to use ``struct udevice *dev``, i.e. ``dev`` as the name: + +.. code-block:: C + + struct udevice *dev; + +Use ``ret`` as the return value: + +.. code-block:: C + + struct udevice *dev; + int ret; + + ret = uclass_first_device_err(UCLASS_ACPI_PMC, &dev); + if (ret) + return log_msg_ret("pmc", dev); + +Consider using log_ret() or log_msg_ret() to return a value (see above). + +Add a ``p`` suffix on return arguments: + +.. code-block:: C + + int dm_pci_find_class(uint find_class, int index, struct udevice **devp) + { + ... + *devp = dev; + + return 0; + } + +There are standard variable names that you should use in drivers: + +* ``struct xxx_priv`` and ``priv`` for dev_get_priv() + +* ``struct xxx_plat`` and ``plat`` for dev_get_platdata() + +For example: + +.. code-block:: C + + struct simple_bus_plat { + u32 base; + u32 size; + u32 target; + }; + + /* Davinci MMC board definitions */ + struct davinci_mmc_priv { + struct davinci_mmc_regs *reg_base; /* Register base address */ + uint input_clk; /* Input clock to MMC controller */ + struct gpio_desc cd_gpio; /* Card Detect GPIO */ + struct gpio_desc wp_gpio; /* Write Protect GPIO */ + }; + + struct rcar_gpio_priv *priv = dev_get_priv(dev); + + struct pl01x_serial_platdata *plat = dev_get_platdata(dev); + +Other +----- + +Some minor things: + +* Put a blank line before the last ``return`` in a function unless it is the only line: + +.. code-block:: C + + struct udevice *pci_get_controller(struct udevice *dev) + { + while (device_is_on_pci_bus(dev)) + dev = dev->parent; + + return dev; + } + +Tests +----- + +Please add tests when you add code. Please change or expand tests when you change code. + +Run the tests with:: + + make check + make qcheck (skips some tests) + +Python tests are in test/py/tests - see the docs in test/py for info. + +Try to write your tests in C if you can. For example, tests to check a command +will be much faster (10-100x or more) if they can directly call run_command() +and ut_check_console_line() instead of using Python to send commands over a +pipe to U-Boot. + +Tests run all supported CI systems (gitlab, travis, azure) using scripts in the +root of the U-Boot tree. diff --git a/doc/develop/index.rst b/doc/develop/index.rst index fe3564a9fbf4..dde47994c71a 100644 --- a/doc/develop/index.rst +++ b/doc/develop/index.rst @@ -3,6 +3,14 @@ Develop U-Boot ============== +General +------- + +.. toctree:: + :maxdepth: 1 + + codingstyle + Implementation -------------- -- 2.25.1

3 21

[gitdm v2] reports.py: Add very basic rST output
by Tom Rini 13 Jul '22

13 Jul '22

Add a -R option to gitdm to allow for reStructuredText output and add some very simple table generation. We assume that whatever uses this output will be including it in other documents and we only concern ourselves with making tables. Give ourselves 36 characters to fill in the nae field, as this tends to be long enough and can be corrected manually in the cases where it's slightly too short still. Cc: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- Changes in v2: - Rework how we declare a table, per Heinrich --- gitdm | 5 ++++- reports.py | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/gitdm b/gitdm index b837f0aafe27..3568d08f55af 100755 --- a/gitdm +++ b/gitdm @@ -59,6 +59,7 @@ FileReport = None # -D Output date statistics # -f file Write touched-files report to <file> # -h hfile HTML output to hfile +# -R rfile reStructuredText output to rfile # -H file Export individual developer raw data as CSV # -l count Maximum length for output lists # -n Use numstats instead of generated patch from git log @@ -80,7 +81,7 @@ def ParseOpts(): global ReportByFileType, ReportUnknowns, CompanyFilter, FileReport global HackersCSV - opts, rest = getopt.getopt(sys.argv[1:], 'ab:dC:c:Df:H:h:l:no:p:r:stUuwx:yz') + opts, rest = getopt.getopt(sys.argv[1:], 'ab:dC:c:Df:H:h:l:no:p:r:R:stUuwx:yz') for opt in opts: if opt[0] == '-a': AkpmOverLt = 1 @@ -111,6 +112,8 @@ def ParseOpts(): elif opt[0] == '-r': print('Filter on "%s"' % (opt[1])) FileFilter = re.compile(opt[1]) + elif opt[0] == '-R': + reports.SetrSTOutput(open(opt[1], 'w')) elif opt[0] == '-s': AuthorSOBs = 0 elif opt[0] == '-t': diff --git a/reports.py b/reports.py index 39c237bdae00..782ebb8fb032 100644 --- a/reports.py +++ b/reports.py @@ -14,6 +14,7 @@ import sys Outfile = sys.stdout HTMLfile = None +rSTfile = None ListCount = 999999 @@ -25,6 +26,10 @@ def SetHTMLOutput(file): global HTMLfile HTMLfile = file +def SetrSTOutput(file): + global rSTfile + rSTfile = file + def SetMaxList(max): global ListCount ListCount = max @@ -40,10 +45,21 @@ THead = '''<p> <tr><th colspan=3>%s</th></tr> ''' +RHead = ''' +.. table:: %s + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== +''' + def BeginReport(title): Outfile.write('\n%s\n' % title) if HTMLfile: HTMLfile.write(THead % title) + if rSTfile: + rSTfile.write(RHead % title) TRow = ' <tr><td>%s</td><td align="right">%d</td><td align="right">%.1f%%</td></tr>\n' TRowStr = ' <tr><td>%s</td><td align="right">%d</td><td>%s</td></tr>\n' @@ -54,6 +70,8 @@ def ReportLine(text, count, pct): Outfile.write ('%-25s %4d (%.1f%%)\n' % (text, count, pct)) if HTMLfile: HTMLfile.write(TRow % (text, count, pct)) + if rSTfile: + rSTfile.write(" %-36s %d (%.1f%%)\n" % (text.strip(), count, pct)) def ReportLineStr(text, count, extra): if count == 0: @@ -61,10 +79,14 @@ def ReportLineStr(text, count, extra): Outfile.write ('%-25s %4d %s\n' % (text, count, extra)) if HTMLfile: HTMLfile.write(TRowStr % (text, count, extra)) + if rSTfile: + rSTfile.write('%-36s %d %s\n' % (text, count, extra)) def EndReport(): if HTMLfile: HTMLfile.write('</table>\n\n') + if rSTfile: + rSTfile.write(' ==================================== =====\n\n') # # Comparison and report generation functions. -- 2.25.1

2 1

[PATCH v2 0/2] fpga: Convert some options to Kconfig
by Alexander Dahl 13 Jul '22

13 Jul '22

Hei hei, rebased this on recent master. One patch dropped. See changelog below. Greets Alex (implicit) v1 -> v2: - dropped patch 3, same kconfig symbol addressed with commit 60d45642fe0673514aced37e6cc95d4f0fe02a19 ("fpga: Remove CONFIG_FPGA_COUNT") Cc: Wolfgang Wegner <w.wegner(a)astro-kom.de> Cc: Michal Simek <michal.simek(a)amd.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Stefan Roese <sr(a)denx.de> Cc: Patrick Delaunay <patrick.delaunay(a)foss.st.com> Cc: "Marek Behún" <marek.behun(a)nic.cz> Alexander Dahl (2): fpga: Convert SYS_FPGA_CHECK_CTRLC to Kconfig fpga: Convert SYS_FPGA_PROG_FEEDBACK to Kconfig README | 7 ------- configs/astro_mcf5373l_defconfig | 1 + drivers/fpga/Kconfig | 10 ++++++++++ include/configs/astro_mcf5373l.h | 1 - scripts/config_whitelist.txt | 1 - 5 files changed, 11 insertions(+), 9 deletions(-) base-commit: 36b661dc919da318c163a45f4a220d2e3d9db608 -- 2.30.2

3 11

[PULL] Pull request for u-boot next / v2022.10 = u-boot-stm32-20220712
by Patrick DELAUNAY 13 Jul '22

13 Jul '22

I Tom, Please pull the STM32 related fixes for u-boot/next, v2022.10: u-boot-stm32-20220712 - Alignment with Linux kernel device tree v5.19 for stm32mp15 and stm32mp13 - Add OP-TEE nodes for stm32mp13x, aligned with upstreamed OP-TEE - Introduce of_to_plat ops in stm32_sdmmc2 driver - Activate more features in stm32mp13 defconfig and support of STM32MP13x Rev.Y - Drop fastboot and stm32prog trigger gpios on STM32MP15x DHCOM board CI status: https://source.denx.de/u-boot/custodians/u-boot-stm/-/pipelines/12721 Thanks, Patrick git request-pull origin/next https://source.denx.de/u-boot/custodians/u-boot-stm.git/ u-boot-stm32-20220712 The following changes since commit 05a4859637567b13219efd6f1707fb236648b1b7: Merge branch '2022-07-08-Kconfig-migrations' into next (2022-07-08 18:03:08 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-stm.git/ tags/u-boot-stm32-20220712 for you to fetch changes up to 48d9eaf6826a1816c5f9839a564ea6338da609a7: arm: dts: stm32mp1: Drop fastboot and stm32prog trigger gpios on DHCOM (2022-07-12 11:48:15 +0200) ---------------------------------------------------------------- - Alignment with Linux kernel device tree v5.19 for stm32mp15 and stm32mp13 - Add OP-TEE nodes for stm32mp13x, alligned with upstreamed OP-TEE - Introduce of_to_plat ops in stm32_sdmmc2 driver - Activate more features in stm32mp13 defconfig and support of STM32MP13x Rev.Y - Drop fastboot and stm32prog trigger gpios on STM32MP15x DHCOM board ---------------------------------------------------------------- Johann Neuhauser (1): arm: dts: stm32mp1: Drop fastboot and stm32prog trigger gpios on DHCOM Lionel Debieve (1): rng: stm32mp1_rng: add conditional reset feature for STM32MP13x Patrick Delaunay (19): configs: stm32m15: support STM32MP_BOARD_EXTRA_ENV for st boards ARM: dts: stm32mp13: add OP-TEE nodes ARM: dts: stm32mp13: add SCMI nodes mmc: stm32_sdmmc2: cosmetic: rename stm32_sdmmc_bind mmc: stm32_sdmmc2: remove privdata mmc: stm32_sdmmc2: introduce of_to_plat ops ARM: dts: stm32mp15: alignment with v5.19 clk: stm32: add support compatible st, stm32mp1-rcc-secure configs: stm32mp15: increase malloc size for pre-reloc ARM: dts: stm32: add SCMI version of STM32 boards (DK1/DK2/ED1/EV1) i2c: stm32: add support for the st,stm32mp13 SOC stm32mp: add support of STM32MP13x Rev.Y ARM: dts: stm32mp13: alignment with v5.19 ARM: dts: stm32mp13: activate led on STM32MP13F-DK configs: stm32mp13: Add support for baudrates higher than 115200 configs: stm32mp13: activate RNG support configs: stm32mp13: activate RTC support configs: stm32mp13: activate I2C support configs: stm32mp13: activate some command arch/arm/dts/Makefile | 4 ++ arch/arm/dts/stm32mp13-u-boot.dtsi | 24 +++++++++ arch/arm/dts/stm32mp131.dtsi | 57 +++++++++++++++++++++- arch/arm/dts/stm32mp135f-dk-u-boot.dtsi | 10 ++++ arch/arm/dts/stm32mp135f-dk.dts | 40 +++++++++++++++ arch/arm/dts/stm32mp15-pinctrl.dtsi | 64 ++++++++++++++++++++++++ arch/arm/dts/stm32mp15-scmi-u-boot.dtsi | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/stm32mp15-scmi.dtsi | 109 +++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/stm32mp151.dtsi | 10 ++-- arch/arm/dts/stm32mp157a-dk1-scmi-u-boot.dtsi | 57 ++++++++++++++++++++++ arch/arm/dts/stm32mp157a-dk1-scmi.dts | 79 ++++++++++++++++++++++++++++++ arch/arm/dts/stm32mp157c-dk2-scmi-u-boot.dtsi | 6 +++ arch/arm/dts/stm32mp157c-dk2-scmi.dts | 85 ++++++++++++++++++++++++++++++++ arch/arm/dts/stm32mp157c-ed1-scmi-u-boot.dtsi | 47 ++++++++++++++++++ arch/arm/dts/stm32mp157c-ed1-scmi.dts | 84 ++++++++++++++++++++++++++++++++ arch/arm/dts/stm32mp157c-ev1-scmi-u-boot.dtsi | 17 +++++++ arch/arm/dts/stm32mp157c-ev1-scmi.dts | 90 ++++++++++++++++++++++++++++++++++ arch/arm/dts/stm32mp157c-ev1.dts | 4 +- arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi | 2 - arch/arm/mach-stm32mp/include/mach/sys_proto.h | 1 + arch/arm/mach-stm32mp/stm32mp13x.c | 3 ++ configs/stm32mp13_defconfig | 24 +++++++++ configs/stm32mp15_defconfig | 2 +- doc/board/st/stm32mp1.rst | 19 ++++++++ drivers/i2c/stm32f7_i2c.c | 5 ++ drivers/misc/stm32_rcc.c | 1 + drivers/mmc/stm32_sdmmc2.c | 224 ++++++++++++++++++++++++++++++++++++++++++------------------------------------------ drivers/rng/stm32mp1_rng.c | 61 +++++++++++++++++------ include/configs/stm32mp13_st_common.h | 5 ++ include/configs/stm32mp15_st_common.h | 3 +- include/dt-bindings/clock/stm32fx-clock.h | 4 +- include/dt-bindings/clock/stm32mp1-clks.h | 23 +++++++++ include/dt-bindings/pinctrl/stm32-pinfunc.h | 1 + include/dt-bindings/reset/stm32mp1-resets.h | 14 ++++++ 34 files changed, 1206 insertions(+), 140 deletions(-) create mode 100644 arch/arm/dts/stm32mp15-scmi-u-boot.dtsi create mode 100644 arch/arm/dts/stm32mp15-scmi.dtsi create mode 100644 arch/arm/dts/stm32mp157a-dk1-scmi-u-boot.dtsi create mode 100644 arch/arm/dts/stm32mp157a-dk1-scmi.dts create mode 100644 arch/arm/dts/stm32mp157c-dk2-scmi-u-boot.dtsi create mode 100644 arch/arm/dts/stm32mp157c-dk2-scmi.dts create mode 100644 arch/arm/dts/stm32mp157c-ed1-scmi-u-boot.dtsi create mode 100644 arch/arm/dts/stm32mp157c-ed1-scmi.dts create mode 100644 arch/arm/dts/stm32mp157c-ev1-scmi-u-boot.dtsi create mode 100644 arch/arm/dts/stm32mp157c-ev1-scmi.dts

2 1