January 2025 - U-Boot

[PATCH 1/1] doc: move licenses to doc/
by Heinrich Schuchardt 14 Jan '25

14 Jan '25

* Move all license texts to doc/ * Convert README to restructured text and rename to index.rst * Replace '+' suffix by '-or-later' suffix * The eCos-2.0 license is OSI approved. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- doc/develop/sending_patches.rst | 6 +- doc/index.rst | 1 + {Licenses => doc/licenses}/Exceptions | 0 {Licenses => doc/licenses}/OFL.txt | 0 {Licenses => doc/licenses}/bsd-2-clause.txt | 0 {Licenses => doc/licenses}/bsd-3-clause.txt | 0 {Licenses => doc/licenses}/bzip2-1.0.6.txt | 0 {Licenses => doc/licenses}/eCos-2.0.txt | 0 {Licenses => doc/licenses}/gpl-2.0.txt | 0 {Licenses => doc/licenses}/ibm-pibs.txt | 0 Licenses/README => doc/licenses/index.rst | 198 ++++++++++++++------ {Licenses => doc/licenses}/isc.txt | 0 {Licenses => doc/licenses}/lgpl-2.0.txt | 0 {Licenses => doc/licenses}/lgpl-2.1.txt | 0 {Licenses => doc/licenses}/mit.txt | 0 {Licenses => doc/licenses}/r8a779x_usb3.txt | 0 {Licenses => doc/licenses}/x11.txt | 0 17 files changed, 142 insertions(+), 63 deletions(-) rename {Licenses => doc/licenses}/Exceptions (100%) rename {Licenses => doc/licenses}/OFL.txt (100%) rename {Licenses => doc/licenses}/bsd-2-clause.txt (100%) rename {Licenses => doc/licenses}/bsd-3-clause.txt (100%) rename {Licenses => doc/licenses}/bzip2-1.0.6.txt (100%) rename {Licenses => doc/licenses}/eCos-2.0.txt (100%) rename {Licenses => doc/licenses}/gpl-2.0.txt (100%) rename {Licenses => doc/licenses}/ibm-pibs.txt (100%) rename Licenses/README => doc/licenses/index.rst (45%) rename {Licenses => doc/licenses}/isc.txt (100%) rename {Licenses => doc/licenses}/lgpl-2.0.txt (100%) rename {Licenses => doc/licenses}/lgpl-2.1.txt (100%) rename {Licenses => doc/licenses}/mit.txt (100%) rename {Licenses => doc/licenses}/r8a779x_usb3.txt (100%) rename {Licenses => doc/licenses}/x11.txt (100%) diff --git a/doc/develop/sending_patches.rst b/doc/develop/sending_patches.rst index ee6e34089b5..390d466dadc 100644 --- a/doc/develop/sending_patches.rst +++ b/doc/develop/sending_patches.rst @@ -305,10 +305,10 @@ Notes 1. U-Boot is Free Software that can redistributed and/or modified under the terms of the `GNU General Public License <http://www.fsf.org/licensing/licenses/gpl.html>`_ (GPL). Currently (August - 2022) version 2 of the GPL applies. Please see :download:`Licensing - <../../Licenses/README>` for details. To allow that later versions of U-Boot + 2022) version 2 of the GPL applies. Please see :doc:`Licensing + <../licenses/index>` for details. To allow that later versions of U-Boot may be released under a later version of the GPL, all new code that gets - added to U-Boot shall use a "GPL-2.0+" SPDX-License-Identifier. + added to U-Boot shall use a "GPL-2.0-or-later" SPDX-License-Identifier. 2. All code must follow the :doc:`codingstyle` requirements. diff --git a/doc/index.rst b/doc/index.rst index 43398627d89..ffb1d1c97ff 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -38,6 +38,7 @@ want to contribute to U-Boot. :maxdepth: 2 develop/index + licenses/index U-Boot API documentation diff --git a/Licenses/Exceptions b/doc/licenses/Exceptions similarity index 100% rename from Licenses/Exceptions rename to doc/licenses/Exceptions diff --git a/Licenses/OFL.txt b/doc/licenses/OFL.txt similarity index 100% rename from Licenses/OFL.txt rename to doc/licenses/OFL.txt diff --git a/Licenses/bsd-2-clause.txt b/doc/licenses/bsd-2-clause.txt similarity index 100% rename from Licenses/bsd-2-clause.txt rename to doc/licenses/bsd-2-clause.txt diff --git a/Licenses/bsd-3-clause.txt b/doc/licenses/bsd-3-clause.txt similarity index 100% rename from Licenses/bsd-3-clause.txt rename to doc/licenses/bsd-3-clause.txt diff --git a/Licenses/bzip2-1.0.6.txt b/doc/licenses/bzip2-1.0.6.txt similarity index 100% rename from Licenses/bzip2-1.0.6.txt rename to doc/licenses/bzip2-1.0.6.txt diff --git a/Licenses/eCos-2.0.txt b/doc/licenses/eCos-2.0.txt similarity index 100% rename from Licenses/eCos-2.0.txt rename to doc/licenses/eCos-2.0.txt diff --git a/Licenses/gpl-2.0.txt b/doc/licenses/gpl-2.0.txt similarity index 100% rename from Licenses/gpl-2.0.txt rename to doc/licenses/gpl-2.0.txt diff --git a/Licenses/ibm-pibs.txt b/doc/licenses/ibm-pibs.txt similarity index 100% rename from Licenses/ibm-pibs.txt rename to doc/licenses/ibm-pibs.txt diff --git a/Licenses/README b/doc/licenses/index.rst similarity index 45% rename from Licenses/README rename to doc/licenses/index.rst index d09f0fe2cb8..fabf4a82bdb 100644 --- a/Licenses/README +++ b/doc/licenses/index.rst @@ -1,6 +1,9 @@ -SPDX-License-Identifier: GPL-2.0 +.. SPDX-License-Identifier: GPL-2.0 - U-Boot is Free Software. It is copyrighted by Wolfgang Denk and +Licenses +======== + +U-Boot is Free Software. It is copyrighted by Wolfgang Denk and many others who contributed code (see the actual source code and the git commit messages for details). You can redistribute U-Boot and/or modify it under the terms of version 2 of the GNU General Public @@ -8,21 +11,21 @@ License as published by the Free Software Foundation. Most of it can also be distributed, at your option, under any later version of the GNU General Public License -- see individual files for exceptions. - NOTE! This license does *not* cover the so-called "standalone" -applications that use U-Boot services by means of the jump table -provided by U-Boot exactly for this purpose - this is merely -considered normal use of U-Boot, and does *not* fall under the -heading of "derived work" -- see file Licenses/Exceptions for -details. +.. note:: - Also note that the GPL and the other licenses are copyrighted by -the Free Software Foundation and other organizations, but the -instance of code that they refer to (the U-Boot source code) is -copyrighted by me and others who actually wrote it. --- Wolfgang Denk + This license does **not** cover the so-called "standalone" + applications that use U-Boot services by means of the jump table + provided by U-Boot exactly for this purpose - this is merely + considered normal use of U-Boot, and does **not** fall under the + heading of "derived work" -- see file Licenses/Exceptions for + details. + Also note that the GPL and the other licenses are copyrighted by + the Free Software Foundation and other organizations, but the + instance of code that they refer to (the U-Boot source code) is + copyrighted by the authors who actually wrote it. -Like many other projects, U-Boot has a tradition of including big +Like many other projects, U-Boot had a tradition of including big blocks of License headers in all files. This not only blows up the source code with mostly redundant information, but also makes it very difficult to generate License Clearing Reports. An additional problem @@ -31,20 +34,22 @@ slightly varying text blocks (full, abbreviated, different indentation, line wrapping and/or white space, with obsolete address information, ...) which makes automatic processing a nightmare. -To make this easier, such license headers in the source files will be +To make this easier, such license headers in the source files are replaced with a single line reference to Unique License Identifiers -as defined by the Linux Foundation's SPDX project [1]. +as defined by the Linux Foundation's `SPDX project <http://spdx.org/>`_. If a "SPDX-License-Identifier:" line references more than one Unique License Identifier, then this means that the respective file can be used under the terms of either of these licenses, i. e. with - SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +.. code-block:: text + + SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause -you can choose between GPL-2.0+ and BSD-3-Clause licensing. +you can choose between GPL-2.0-or-later and BSD-3-Clause licensing. -We use the SPDX Unique License Identifiers here; these are available -at [2]. +We use the SPDX Unique License Identifiers here. These are available +at `<http://spdx.org/licenses/>`_. License identifier syntax ------------------------- @@ -57,19 +62,40 @@ License identifier syntax '#!PATH_TO_INTERPRETER' in the first line. For those scripts the SPDX identifier goes into the second line. -| - 2. Style: The SPDX license identifier is added in form of a comment. The comment - style depends on the file type:: + style depends on the file type: + + .. list-table:: + :header-rows: 1 + + * - File type + - Comment line + * - C source (\*.c) + - :: - C source: // SPDX-License-Identifier: <SPDX License Expression> - C header: /* SPDX-License-Identifier: <SPDX License Expression> */ - ASM: /* SPDX-License-Identifier: <SPDX License Expression> */ - scripts: # SPDX-License-Identifier: <SPDX License Expression> - .rst: .. SPDX-License-Identifier: <SPDX License Expression> - .dts{i}: // SPDX-License-Identifier: <SPDX License Expression> + // SPDX-License-Identifier: <SPDX License Expression> + * - C header (\*.h) + - :: + + /* SPDX-License-Identifier: <SPDX License Expression> */ + * - Assembler (\*.S) + - :: + + /* SPDX-License-Identifier: <SPDX License Expression> */ + * - Scripts (\*.py, \*.sh) + - :: + + # SPDX-License-Identifier: <SPDX License Expression> + * - Restructured text (\*.rst) + - :: + + .. SPDX-License-Identifier: <SPDX License Expression> + * - Device-tree source (\*.dts, \*.dtsi) + - :: + + // SPDX-License-Identifier: <SPDX License Expression> If a specific tool cannot handle the standard comment style, then the appropriate comment mechanism which the tool accepts shall be used. This @@ -79,8 +105,6 @@ License identifier syntax there are still older assembler tools which cannot handle C++ style comments. -| - 3. Syntax: A <SPDX License Expression> is either an SPDX short form license @@ -91,21 +115,21 @@ License identifier syntax "(", ")" . License identifiers for licenses like [L]GPL with the 'or later' option - are constructed by using a "+" for indicating the 'or later' option.:: + are constructed by appending "-or-later":: - // SPDX-License-Identifier: GPL-2.0+ - // SPDX-License-Identifier: LGPL-2.1+ + // SPDX-License-Identifier: GPL-2.0-or-later + // SPDX-License-Identifier: LGPL-2.1-or-later WITH should be used when there is a modifier to a license needed. - For example, the linux kernel UAPI files use the expression:: + For example, the Linux kernel UAPI files use the expression:: // SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note - // SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note + // SPDX-License-Identifier: GPL-2.0-or-later WITH Linux-syscall-note - Other examples using WITH exceptions found in the linux kernel are:: + Other examples using WITH exceptions found in the Linux kernel are:: // SPDX-License-Identifier: GPL-2.0 WITH mif-exception - // SPDX-License-Identifier: GPL-2.0+ WITH GCC-exception-2.0 + // SPDX-License-Identifier: GPL-2.0-or-later WITH GCC-exception-2.0 Exceptions can only be used with particular License identifiers. The valid License identifiers are listed in the tags of the exception text @@ -120,7 +144,7 @@ License identifier syntax Examples from U-Boot for license expressions in dual licensed files:: // SPDX-License-Identifier: GPL-2.0 OR MIT - // SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause + // SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause AND should be used if the file has multiple licenses whose terms all apply to use the file. For example, if code is inherited from another @@ -132,24 +156,78 @@ License identifier syntax Another other example where both sets of license terms need to be adhered to is:: - // SPDX-License-Identifier: GPL-1.0+ AND LGPL-2.1+ - -[1] http://spdx.org/ -[2] http://spdx.org/licenses/ - -Full name SPDX Identifier OSI Approved File name URI -======================================================================================================================================= -bzip2 and libbzip2 License v1.0.6 bzip2-1.0.6 bzip2-1.0.6.txt https://spdx.org/licenses/bzip2-1.0.6.html -GNU General Public License v2.0 only GPL-2.0 Y gpl-2.0.txt http://www.gnu.org/licenses/gpl-2.0.txt -GNU General Public License v2.0 or later GPL-2.0+ Y gpl-2.0.txt http://www.gnu.org/licenses/gpl-2.0.txt -GNU Library General Public License v2 or later LGPL-2.0+ Y lgpl-2.0.txt http://www.gnu.org/licenses/old-licenses/lgpl-2.0.txt -GNU Lesser General Public License v2.1 or later LGPL-2.1+ Y lgpl-2.1.txt http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt -eCos license version 2.0 eCos-2.0 eCos-2.0.txt http://www.gnu.org/licenses/ecos-license.html -BSD 2-Clause License BSD-2-Clause Y bsd-2-clause.txt http://spdx.org/licenses/BSD-2-Clause -BSD 3-clause "New" or "Revised" License BSD-3-Clause Y bsd-3-clause.txt http://spdx.org/licenses/BSD-3-Clause#licenseText -IBM PIBS (PowerPC Initialization and IBM-pibs ibm-pibs.txt - Boot Software) license -ISC License ISC Y isc.txt https://spdx.org/licenses/ISC -MIT License MIT Y mit.txt https://spdx.org/licenses/MIT.html -SIL OPEN FONT LICENSE (OFL-1.1) OFL-1.1 Y OFL.txt https://spdx.org/licenses/OFL-1.1.html -X11 License X11 x11.txt https://spdx.org/licenses/X11.html + // SPDX-License-Identifier: GPL-1.0-or-later AND LGPL-2.1-or-later + +.. list-table:: + :header-rows: 1 + + * - Full name + - SPDX Identifier + - OSI Approved + - File name + - URI + * - bzip2 and libbzip2 License v1.0.6 + - bzip2-1.0.6 + - + - :download:`bzip2-1.0.6.txt` + - https://spdx.org/licenses/bzip2-1.0.6.html + * - GNU General Public License v2.0 only + - GPL-2.0-only + - yes + - :download:`gpl-2.0.txt` + - http://www.gnu.org/licenses/gpl-2.0.txt + * - GNU General Public License v2.0 or later + - GPL-2.0-or-later + - yes + - :download:`gpl-2.0.txt` + - http://www.gnu.org/licenses/gpl-2.0.txt + * - GNU Library General Public License v2 or later + - LGPL-2.0-or-later + - yes + - :download:`lgpl-2.0.txt` + - http://www.gnu.org/licenses/old-licenses/lgpl-2.0.txt + * - GNU Lesser General Public License v2.1 or later + - LGPL-2.1-or-later + - yes + - :download:`lgpl-2.1.txt` + - http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt + * - eCos license version 2.0 + - eCos-2.0 + - yes (non-reusable) + - eCos-2.0.txt` + - http://www.gnu.org/licenses/ecos-license.html + * - BSD 2-Clause License + - BSD-2-Clause + - yes + - :download:`bsd-2-clause.txt` + - http://spdx.org/licenses/BSD-2-Clause + * - BSD 3-clause "New" or "Revised" License + - BSD-3-Clause + - yes + - :download:`bsd-3-clause.txt` + - http://spdx.org/licenses/BSD-3-Clause#licenseText + * - IBM PIBS (PowerPC Initialization and Boot Software) license + - IBM-pibs + - + - :download:`ibm-pibs.txt` + - + * - ISC License + - ISC + - yes + - :download:`isc.txt` + - https://spdx.org/licenses/ISC + * - MIT License + - MIT + - yes + - :download:`mit.txt` + - https://spdx.org/licenses/MIT.html + * - SIL Open Font License (OFL) version 1.1 + - OFL-1.1 + - yes + - :download:`OFL.txt` + - https://spdx.org/licenses/OFL-1.1.html + * - X11 License + - X11 + - + - :download:`x11.txt` + - https://spdx.org/licenses/X11.html diff --git a/Licenses/isc.txt b/doc/licenses/isc.txt similarity index 100% rename from Licenses/isc.txt rename to doc/licenses/isc.txt diff --git a/Licenses/lgpl-2.0.txt b/doc/licenses/lgpl-2.0.txt similarity index 100% rename from Licenses/lgpl-2.0.txt rename to doc/licenses/lgpl-2.0.txt diff --git a/Licenses/lgpl-2.1.txt b/doc/licenses/lgpl-2.1.txt similarity index 100% rename from Licenses/lgpl-2.1.txt rename to doc/licenses/lgpl-2.1.txt diff --git a/Licenses/mit.txt b/doc/licenses/mit.txt similarity index 100% rename from Licenses/mit.txt rename to doc/licenses/mit.txt diff --git a/Licenses/r8a779x_usb3.txt b/doc/licenses/r8a779x_usb3.txt similarity index 100% rename from Licenses/r8a779x_usb3.txt rename to doc/licenses/r8a779x_usb3.txt diff --git a/Licenses/x11.txt b/doc/licenses/x11.txt similarity index 100% rename from Licenses/x11.txt rename to doc/licenses/x11.txt -- 2.47.1

2 1

[PATCH 1/2] cyclic: Fix rollover every 72 min on 32 bits platforms
by Patrice Chotard 14 Jan '25

14 Jan '25

On 32 bits platforms, timer_get_us() returns an unsigned long which is a 32 bits. timer_get_us() wraps around every 72 minutes (2 ^ 32 / 1000000 =~ 4295 sec =~ 72 min). So the test "if time_after_eq64(now, cyclic->next_call)" is no more true when cyclic->next_call becomes above 32 bits max value (4294967295). At this point after 72 min, no more cyclic function are executed included watchdog one. Instead of using timer_get_us(), use get_timer_us() which returns a uint64_t, this allows a rollover every 584942 years. Signed-off-by: Patrice Chotard <patrice.chotard(a)foss.st.com> --- common/cyclic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/cyclic.c b/common/cyclic.c index 196797fd61e..e3f03a19d55 100644 --- a/common/cyclic.c +++ b/common/cyclic.c @@ -61,7 +61,7 @@ static void cyclic_run(void) * Check if this cyclic function needs to get called, e.g. * do not call the cyclic func too often */ - now = timer_get_us(); + now = get_timer_us(0); if (time_after_eq64(now, cyclic->next_call)) { /* Call cyclic function and account it's cpu-time */ cyclic->next_call = now + cyclic->delay_us; -- 2.25.1

4 5

[PATCH 00/12] imx9: switch to bootstd for i.MX93/1 EVK/QSB and i.MX8M EVK
by Peng Fan (OSS) 14 Jan '25

14 Jan '25

Switch to bootstd for NXP i.MX9/8M boards with a bsp_bootcmd as fallback. Patch 12 not related to bootstd, it is just one addon patch to cleanup CI: https://dev.azure.com/pengfan/uboot-ci/_build/results?buildId=15&view=resul… Signed-off-by: Peng Fan <peng.fan(a)nxp.com> --- Peng Fan (12): imx: imx93_evk: switch to BOOTSTD imx: imx93_qsb: switch to BOOTSTD imx: imx91_evk: switch to BOOTSTD imx: imx8mp_evk: Enable dynamic settings to mmcdev and mmcroot imx: imx8mp_evk: Switch to BOOTSTD imx: imx8mn_evk: Enable dynamic settings to mmcdev and mmcroot imx: imx8mn_evk: Switch to BOOTSTD imx: imx8mm_evk: Enable dynamic settings to mmcdev and mmcroot imx: imx8mm_evk: Switch to BOOTSTD imx: imx8mq_evk: Enable dynamic settings to mmcdev and mmcroot imx: imx8mq_evk: Switch to BOOTSTD imx: imx93-11x11-evk: drop duplicated nodes arch/arm/dts/imx93-11x11-evk-u-boot.dtsi | 118 --------------------------- arch/arm/mach-imx/imx8m/Kconfig | 8 ++ arch/arm/mach-imx/imx9/Kconfig | 6 ++ board/freescale/common/Makefile | 2 +- board/freescale/imx8mm_evk/imx8mm_evk.c | 3 + board/freescale/imx8mm_evk/imx8mm_evk.env | 67 +++++++++++++++ board/freescale/imx8mn_evk/imx8mn_evk.c | 9 +- board/freescale/imx8mn_evk/imx8mn_evk.env | 67 +++++++++++++++ board/freescale/imx8mp_evk/imx8mp_evk.c | 5 ++ board/freescale/imx8mp_evk/imx8mp_evk.env | 57 +++++++++++++ board/freescale/imx8mq_evk/imx8mq_evk.c | 25 ++---- board/freescale/imx8mq_evk/imx8mq_evk.env | 60 ++++++++++++++ board/freescale/imx91_evk/imx91_evk.env | 29 ++++++- board/freescale/imx93_evk/imx93_evk.env | 88 ++++++++++++++++++++ board/freescale/imx93_qsb/imx93_qsb.env | 29 ++++++- configs/imx8mm_evk_defconfig | 4 +- configs/imx8mm_evk_fspi_defconfig | 4 +- configs/imx8mn_evk_defconfig | 3 +- configs/imx8mp_evk_defconfig | 3 +- configs/imx8mq_evk_defconfig | 4 +- configs/imx91_11x11_evk_defconfig | 2 +- configs/imx91_11x11_evk_inline_ecc_defconfig | 2 +- configs/imx93_11x11_evk_defconfig | 3 +- configs/imx93_9x9_qsb_defconfig | 2 +- configs/imx93_9x9_qsb_inline_ecc_defconfig | 2 +- drivers/gpio/adp5585_gpio.c | 2 +- include/configs/imx8mm_evk.h | 22 ----- include/configs/imx8mn_evk.h | 30 ------- include/configs/imx8mp_evk.h | 21 ----- include/configs/imx8mq_evk.h | 22 ----- include/configs/imx93_evk.h | 105 ------------------------ 31 files changed, 448 insertions(+), 356 deletions(-) --- base-commit: a3d3d869b6f5860660718d05ee9b4d040d938e0f change-id: 20241231-imx-bootstd-abbf2e9e0d75 Best regards, -- Peng Fan <peng.fan(a)nxp.com>

7 25

[PATCH v3 0/1] net: designware: Add bitbang feature for designware driver
by Michael Chang 14 Jan '25

14 Jan '25

Changes for v3: - Support multiple buses for multiple Ethernet interfaces. Changes for v2: - add bitbang delay dts read - modify printf to debug Michael Chang (1): net: designware: Add bitbang feature for designware driver arch/arm/dts/nuvoton-npcm845-evb.dts | 1 + drivers/net/designware.c | 111 +++++++++++++++++++++++++++ drivers/net/designware.h | 6 +- 3 files changed, 117 insertions(+), 1 deletion(-) -- 2.34.1

1 0

[PATCH] armv8: mmu: don't switch to emergency tlb when adding a dynamic mapping
by Caleb Connolly 14 Jan '25

14 Jan '25

This seems to cause crashes on a bunch of Qualcomm platforms. It's safer to just update the live table and flush it. Signed-off-by: Caleb Connolly <caleb.connolly(a)linaro.org> --- arch/arm/cpu/armv8/cache_v8.c | 11 ++--------- arch/arm/include/asm/system.h | 3 +-- drivers/soc/qcom/cmd-db.c | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c index e6be6359c5d9..43051d156122 100644 --- a/arch/arm/cpu/armv8/cache_v8.c +++ b/arch/arm/cpu/armv8/cache_v8.c @@ -338,9 +338,9 @@ static void map_range(u64 virt, u64 phys, u64 size, int level, size -= next_size; } } -void mmu_map_region(phys_addr_t addr, u64 size, bool emergency) +void mmu_map_region(phys_addr_t addr, u64 size) { u64 va_bits; int level = 0; u64 attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_INNER_SHARE; @@ -350,19 +350,12 @@ void mmu_map_region(phys_addr_t addr, u64 size, bool emergency) get_tcr(NULL, &va_bits); if (va_bits < 39) level = 1; - if (emergency) - map_range(addr, addr, size, level, - (u64 *)gd->arch.tlb_emerg, attrs); - - /* Switch pagetables while we update the primary one */ - __asm_switch_ttbr(gd->arch.tlb_emerg); - map_range(addr, addr, size, level, (u64 *)gd->arch.tlb_addr, attrs); - __asm_switch_ttbr(gd->arch.tlb_addr); + flush_dcache_range(gd->arch.tlb_addr, gd->arch.tlb_size); } static void add_map(struct mm_region *map) { diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h index 52f6c9b934d7..475ca97c5c82 100644 --- a/arch/arm/include/asm/system.h +++ b/arch/arm/include/asm/system.h @@ -283,11 +283,10 @@ void flush_l3_cache(void); * Will be mapped MT_NORMAL & PTE_BLOCK_INNER_SHARE. * * @start: Start address of the region * @size: Size of the region - * @emerg: Also map the region in the emergency table */ -void mmu_map_region(phys_addr_t start, u64 size, bool emerg); +void mmu_map_region(phys_addr_t start, u64 size); void mmu_change_region_attr(phys_addr_t start, size_t size, u64 attrs); /* * smc_call() - issue a secure monitor call diff --git a/drivers/soc/qcom/cmd-db.c b/drivers/soc/qcom/cmd-db.c index 67be18e89f4d..4c8bd9abda23 100644 --- a/drivers/soc/qcom/cmd-db.c +++ b/drivers/soc/qcom/cmd-db.c @@ -202,9 +202,9 @@ static int cmd_db_bind(struct udevice *dev) return -ENOENT; } /* On SM8550/SM8650 and newer SoCs cmd-db might not be mapped */ - mmu_map_region((phys_addr_t)base, (phys_size_t)size, false); + mmu_map_region((phys_addr_t)base, (phys_size_t)size); cmd_db_header = base; if (!cmd_db_magic_matches(cmd_db_header)) { log_err("%s: Invalid Command DB Magic\n", __func__); -- 2.47.0

5 8

[U-Boot][PATCH 0/2] Improve fpga cmd usage information
by Ibai Erkiaga 14 Jan '25

14 Jan '25

Current usage information is not read friendly specially when all the options are selected. This series fix some of the issues in the info, from one side aligment and overlapping issues and from the other the excess of verbosity on the loads command. Ibai Erkiaga (2): fpga: fix alignment on fpga cmd usage info fpga: improve loads usage information cmd/fpga.c | 45 ++++++++++++++++++--------------------------- 1 file changed, 18 insertions(+), 27 deletions(-) -- 2.42.0.325.g3a06386e31

4 7

[PATCH v2] riscv: spacemit: k1: probe dram size during boot phase.
by Huan Zhou 14 Jan '25

14 Jan '25

--- This patch introduce improvement for get dram size on bananapi BPI-F3, retrieving the dram size dynamically. Have tested on bananapi Licheepi LPI3A 8G[1]. Links: [1] https://gist.github.com/per1cycle/e4eab66ebb6f83fe5118e823367fce28 . Changes in v2: - Fix bracker and return type in map_format_size() function. - Add test log in the cover letter.. - Link to v1: https://lore.kernel.org/r/20250108-get-dram-size-v1-1-4bae32ecf756@per1cycl… Signed-off-by: Huan Zhou <me(a)per1cycle.org> Tested-by: Marcel Ziswiler <marcel(a)ziswiler.com> # BPI-F3 16G --- arch/riscv/cpu/k1/dram.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/arch/riscv/cpu/k1/dram.c b/arch/riscv/cpu/k1/dram.c index c477c15cbfb19f0e3a0ee72985b602f5bda352d7..4140440255fa1b3dbae521c58c6809445499a463 100644 --- a/arch/riscv/cpu/k1/dram.c +++ b/arch/riscv/cpu/k1/dram.c @@ -4,17 +4,53 @@ */ #include <asm/global_data.h> +#include <asm/io.h> #include <config.h> +#include <bitfield.h> #include <fdt_support.h> #include <linux/sizes.h> +#define DDR_BASE 0xC0000000 DECLARE_GLOBAL_DATA_PTR; +static inline phys_size_t map_format_size(u32 val) +{ + u32 tmp; + + if (!(val & 0x1)) + return 0; + + tmp = bitfield_extract(val, 16, 5); + switch (tmp) { + case 0xd: + return 512; + case 0xe: + return 1024; + case 0xf: + return 2048; + case 0x10: + return 4096; + case 0x11: + return 8192; + default: + pr_info("Invalid DRAM density %x\n", val); + return 0; + } +} + +phys_size_t ddr_get_density(void) +{ + phys_size_t cs0_size = map_format_size(readl((void *)DDR_BASE + 0x200)); + phys_size_t cs1_size = map_format_size(readl((void *)DDR_BASE + 0x208)); + phys_size_t ddr_size = cs0_size + cs1_size; + + return ddr_size; +} + int dram_init(void) { gd->ram_base = CFG_SYS_SDRAM_BASE; - /* TODO get ram size from ddr controller */ - gd->ram_size = SZ_4G; + gd->ram_size = ddr_get_density() * SZ_1M; return 0; } --- base-commit: 19fc0b7f7d907119a13e9c207991899f0817f8fc change-id: 20250108-get-dram-size-65cf59a15201 Best regards, -- Huan Zhou <me(a)per1cycle.org>

2 3

[U-Boot][PATCH] zynqmp_gqspi: update to log_debug
by Ibai Erkiaga 14 Jan '25

14 Jan '25

Update recent parallel memory support code to move to log_debug instead of debug as per logging in U-Boot documentation Signed-off-by: Ibai Erkiaga <ibai.erkiaga-elorza(a)amd.com> --- drivers/spi/zynqmp_gqspi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c index 4251bf28cd3..2a095d0c58e 100644 --- a/drivers/spi/zynqmp_gqspi.c +++ b/drivers/spi/zynqmp_gqspi.c @@ -255,7 +255,7 @@ static u32 zynqmp_qspi_bus_select(struct zynqmp_qspi_priv *priv) GQSPI_GFIFO_CS_LOWER | GQSPI_GFIFO_CS_UPPER; else - debug("Wrong Bus selection:0x%x\n", priv->bus); + log_debug("Wrong Bus selection:0x%x\n", priv->bus); } else { if (priv->u_page) gqspi_fifo_reg = GQSPI_GFIFO_LOW_BUS | -- 2.42.0.325.g3a06386e31

2 1

Re: [PATCH] configs: zynqmp: Add usb_pgood_delay for SOM boards
by Michal Simek 14 Jan '25

14 Jan '25

On 1/7/25 13:29, Prasad Kummari wrote: > Add usb_pgood_delay to ensure proper detection of USB devices. > Increase the USB power good delay on the SOM boards, as this > is required for certain USB sticks otherwise, they may not > be detected. > > Signed-off-by: Prasad Kummari <prasad.kummari(a)amd.com> > --- > board/xilinx/zynqmp/zynqmp_kria.env | 1 + > include/configs/xilinx_zynqmp.h | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/board/xilinx/zynqmp/zynqmp_kria.env b/board/xilinx/zynqmp/zynqmp_kria.env > index ff3a0924de..c0a22fbf67 100644 > --- a/board/xilinx/zynqmp/zynqmp_kria.env > +++ b/board/xilinx/zynqmp/zynqmp_kria.env > @@ -43,6 +43,7 @@ script_size_f=0x80000 > scriptaddr=0x20000000 > usb_boot=usb start; if usb dev ${devnum}; then devtype=usb; run scan_dev_for_boot_part; fi > preboot=setenv boot_targets; setenv modeboot; run board_setup > +usb_pgood_delay=1000 > > # SOM specific boot methods > usb_boot_devices='usb0 usb1 usb2 usb3 usb4' > diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h > index bb0db7c5ca..13941ba358 100644 > --- a/include/configs/xilinx_zynqmp.h > +++ b/include/configs/xilinx_zynqmp.h > @@ -179,6 +179,7 @@ > #ifndef CFG_EXTRA_ENV_SETTINGS > #define CFG_EXTRA_ENV_SETTINGS \ > ENV_MEM_LAYOUT_SETTINGS \ > + "usb_pgood_delay=1000\0" \ > BOOTENV > #endif > The patch looks good but it didn't land in u-boot mailing list and lore. Can you please send it again? Thanks, Michal

1 0

[PATCH] arm64: versal: RO multi_boot register in non JTAG bootmode
by Michal Simek 14 Jan '25

14 Jan '25

The main reason for this change is that upstream QEMU has no multiboot register implemented that's why access to it fails which ends up in CI failure for our target. That's why in JTAG bootmode returns 0 which is correct behaviour because multiboot register is not used in this mode and value should be ignored and as a side effect it is also fixing CI/Qemu issue. Also move versal_get_bootmode() to avoid function declaration. Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- board/xilinx/versal/board.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c index d05220f96ffd..cff810e02ad8 100644 --- a/board/xilinx/versal/board.c +++ b/board/xilinx/versal/board.c @@ -36,8 +36,29 @@ static xilinx_desc versalpl = { }; #endif +static u8 versal_get_bootmode(void) +{ + u8 bootmode; + u32 reg = 0; + + reg = readl(&crp_base->boot_mode_usr); + + if (reg >> BOOT_MODE_ALT_SHIFT) + reg >>= BOOT_MODE_ALT_SHIFT; + + bootmode = reg & BOOT_MODES_MASK; + + return bootmode; +} + static u32 versal_multi_boot(void) { + u8 bootmode = versal_get_bootmode(); + + /* Mostly workaround for QEMU CI pipeline */ + if (bootmode == JTAG_MODE) + return 0; + return readl(0xF1110004); } @@ -120,21 +141,6 @@ unsigned long do_go_exec(ulong (*entry)(int, char * const []), int argc, return ret; } -static u8 versal_get_bootmode(void) -{ - u8 bootmode; - u32 reg = 0; - - reg = readl(&crp_base->boot_mode_usr); - - if (reg >> BOOT_MODE_ALT_SHIFT) - reg >>= BOOT_MODE_ALT_SHIFT; - - bootmode = reg & BOOT_MODES_MASK; - - return bootmode; -} - static int boot_targets_setup(void) { u8 bootmode; -- 2.43.0

1 1