summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-01-06Merge branch '2023-01-06-further-regression-fixes'Tom Rini
- Bring in a number of important regression fixes for among others, uniphier, PXE booting, socrates, imx7d-pico, rockchip video and rzg2_beacon as well as making the python version warning fix more portable.
2023-01-06arm: rmobile: rzg2_beacon: Enable alternative Ethernet PHYAdam Ford
Due to the part shortage, the AR8031 PHY was replaced with a Micrel KSZ9131. Enabling both config options keeps backward compatibility with either platform, and both appear to be auto-detected. Signed-off-by: Adam Ford <aford173@gmail.com> Reviewed-by: Marek Vasut <marek.vasut+renesas@gmail.com>
2023-01-06arm: dts: rz-g2-beacon-u-boot: Fix QSPI RegressionAdam Ford
The QSPI is accessed via the RPC-IF, but the compatible flags previously used a different name. This compatibel name was changed which broke the ability to access the QSPI. Fix this by removing the custom naming reference. Fixes: 68083b897b57 ("renesas: Fix RPC-IF compatible values") Signed-off-by: Adam Ford <aford173@gmail.com> Reviewed-by: Marek Vasut <marek.vasut+renesas@gmail.com>
2023-01-06pylibfdt: Fix disable version normalizationPhilippe Schenker
On Arch Linux based systems python setuptools does not contain "setuptools.extern" hence it is failing with the following error-message: " ModuleNotFoundError: No module named 'setuptools.extern' " According to a eschwartz `setuptools.extern` is not a public API and shall not be assumed to be present in the setuptools package. He mentions that the setuptools project anyway wants to drop this. [1] Use the correct solution introduced by python setuptools developers to disable normalization. [2] [1] https://bbs.archlinux.org/viewtopic.php?id=259608 [2] https://github.com/pypa/setuptools/pull/2026 Fixes: 440098c42e73 ("pylibfdt: Fix version normalization warning") Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> Reviewed-by: Marek Vasut <marex@denx.de> Reviewed-by: Simon Glass <sjg@chromium.org>
2023-01-06cmd: pxe_utils: Limit fdtcontroladdr usage to non-fitImageMarek Vasut
Commit d5ba6188dfb ("cmd: pxe_utils: Check fdtcontroladdr in label_boot") forces '$fdtcontroladdr' DT address as a third parameter of bootm command even if the PXE transfer pulls in a fitImage which contains configuration node with its own DT that is preferrable to be passed to Linux. Limit the $fdtcontroladdr fallback utilization to non-fitImages, since it is highly likely a fitImage would come with its own DT, while single-file images do need a separate DT. Fixes: d5ba6188dfb ("cmd: pxe_utils: Check fdtcontroladdr in label_boot") Signed-off-by: Marek Vasut <marex@denx.de> Reviewed-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> Tested-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Peter Hoyes <peter.hoyes@arm.com> Tested-by: Peter Hoyes <peter.hoyes@arm.com> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
2023-01-06Revert "Revert "cmd: pxe_utils: Check fdtcontroladdr in label_boot""Marek Vasut
This reverts commit ed6251187afabf811a5fd49a44ebd61c53c7b378. Superseded by "cmd: pxe_utils: Limit fdtcontroladdr usage to non-fitImage" which is less heavy-handed approach and retains part of the original behavior for non-fitImage. Signed-off-by: Marek Vasut <marex@denx.de> Acked-by: Neil Armstrong <neil.armstrong@linaro.org>
2023-01-06rockchip: Fix the broken Video out for rk3288 boardsJagan Teki
Video out on RK3288 boards has been broken since from few releases due to the adding of reset support on vop but missed enabling DM_RESET on associated boards. This patch fixes those RK3288 boards. Cc: Simon Glass <sjg@chromium.org> Cc: Lin Huang <hl@rock-chips.com> Cc: Jernej Skrabec <jernej.skrabec@gmail.com> Cc: Michael Trimarchi <michael@amarulasolutions.com> Cc: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org> Fixes: <9749d2ea29e1> ("rockchip: video: vop: Add reset support") Reported-by: Manoj Sai <abbaraju.manojsai@amarulasolutions.com> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2023-01-06i2c: uniphier-f: correct error recoveryDai Okamura
The uniphier i2c block can recognize some handshake errors. But driver handles all error detections as no error if no timeout. So this makes unrecoverable state. This replaces the return values with the right ones to tell the i2c framework the errors: - EDEADLK for arbitration lost error - ENODATA for no answer error Signed-off-by: Dai Okamura <okamura.dai@socionext.com> Acked-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> Reviewed-by: Heiko Schocher <hs@denx.de>
2023-01-06imx7d-pico: Fix the name of the u-boot.dtsi fileFabio Estevam
Since commit 2f96d4dd95f8 ("imx7s/d: synchronise device trees with linux") the imx7d-pico board no longer boots. The reason is that prior to the above commit there was an explicit inclusion of arch/arm/dts/imx7d-pico-u-boot.dtsi inside imx7d-pico.dtsi. After the syncing with the Linux upstream dtsi, this u-boot.dtsi inclusion is gone and the board fails to boot. U-Boot uses the imx7d-pico-pi.dtb file, so rename the u-boot.dtsi to imx7d-pico-pi-u-boot.dtsi which gets included automatically by U-Boot standard make logic and makes the board boot again. Signed-off-by: Fabio Estevam <festevam@denx.de>
2023-01-06powerpc/mpc85xx: socrates: Re-enable building u-boot-socrates.binPali Rohár
U-Boot build system builds final U-Boot binary for socrates board in custom file u-boot-socrates.bin (instead of standard u-boot.bin). Output target file u-boot-socrates.bin is generated by binman as defined in board binman config file arch/powerpc/dts/socrates-u-boot.dtsi. But binman was disabled in commit 5af42eafd7e1 ("Makefile: Reduce usage of custom mpc85xx u-boot.bin target") for all mpc85xx boards which do not use standard powerpc binman config file arch/powerpc/dts/u-boot.dtsi and boards which do not require binman at all. The only such mpc85xx board is socrates. So since that commit, U-Boot does not final binary for socrates board anymore. Fix this issue by re-enabling binman for socrates board. And build process starts again producing u-boot-socrates.bin binary. Note that build process for this socrates board always produce u-boot.bin binary which is broken and not usable for socrates board. Long term solution should be to disable building broken binary u-boot.bin and then renaming u-boot-socrates.bin to u-boot.bin, or switching to use common powerpc binman config file arch/powerpc/dts/socrates-u-boot.dtsi (if it is possible). Fixes: 5af42eafd7e1 ("Makefile: Reduce usage of custom mpc85xx u-boot.bin target") Signed-off-by: Pali Rohár <pali@kernel.org> Tested-by: Heiko Schocher <hs@denx.de>
2023-01-06arm: stm32mp: Fix board_get_usable_ram_top() againMarek Vasut
Do not access gd->ram_size and assume this is actual valid RAM size. Since commit 777aaaa706b ("common/memsize.c: Fix get_effective_memsize() to check for overflow") the RAM size may be less than gd->ram_size , call get_effective_memsize() to get the limited value instead. The aforementioned commit makes STM32MP15xx boards with 1 GiB of DRAM at 0xc0000000 hang on boot, which is a grave defect. Signed-off-by: Marek Vasut <marex@denx.de> Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
2023-01-05Merge tag 'dm-next-5jan23' of ↵Tom Rini
https://source.denx.de/u-boot/custodians/u-boot-dm into next patman enhancements and fixes
2023-01-05patman: add '--get-maintainer-script' argumentMaxim Cournoyer
This makes it possible to configure a project to use some other location or script than the default scripts/get_maintainer.pl one used in the U-Boot and Linux projects. It can be configured via a .patman configuration file and accepts arguments, as documented. Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
2023-01-05patman: additionally honor a local .patman config fileMaxim Cournoyer
This enables versioning a project specific patman configuration file. It also makes it possible to declare the project name, which is not a useful thing to do in $HOME/.patman. A new test is added, along updated documentation. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2023-01-05patman: fail early in Setup when provided config file does not existMaxim Cournoyer
Rationale: if the user explicitly provide this argument, they probably intend for it to be used. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2023-01-05patman: set the default config_fname argument value to NoneMaxim Cournoyer
This better matches Python conventions, allowing to easily test whether the optional argument is provided. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2023-01-05patman: import gitutil module where it is neededMaxim Cournoyer
Instead of propagating it from the module entry point (main script). Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2023-01-05patman: replace deprecated SafeConfigParser with ConfigParserMaxim Cournoyer
The SafeConfigParser class has been renamed in Python 3.2 to ConfigParser, and the old alias has been deprecated since. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2023-01-05patman: fix pep8 warnings in settings moduleMaxim Cournoyer
Remove extraneous imports, variables and comply to PEP 8 maximum line width, among other PEP 8 changes suggested by Pyflake. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2023-01-05patman: document default 'send' commandMaxim Cournoyer
Document that this command is the default and what it's intended for. Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
2023-01-05patman: document how to run test suite via pytestMaxim Cournoyer
Pytest offers useful features such as selecting tests by means of a regular expression, or running the pdb debugger upon encountering a test failure. Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
2023-01-05patman: hide the 'test' command unless test data is availableMaxim Cournoyer
Some tests would fail when the test data is not available, so it doesn't make much sense to expose the action when patman is running outside of the u-boot git checkout. Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
2023-01-05patman: add pytest configuration fileMaxim Cournoyer
With this change, a user can run the patman test suite using Pytest the same as when using 'patman test': $ cd tools/patman && pytest [...] 44 passed, 8 warnings in 8.87s $ ./patman test Ran 44 tests in 8.460s Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
2023-01-05patman: rename main script to __main__.pyMaxim Cournoyer
This allows running the package as a Python module, like e.g.: $ python -m patman It also prevents Pytest from attempting to parse main.py, which would cause errors. Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com> Fix up main.py in __init__.py: Signed-off-by: Simon Glass <sjg@chromium.org>
2023-01-05patman: invoke the checkpatch.pl script with '--u-boot' and '--strict'Maxim Cournoyer
This resolves 10 out of 11 test failures seen when running './patman test' from the 'tools/patman' subdirectory. This was caused by the .checkpatch.conf configuration file at the root of the project not being picked up. Make the test suite of patman independent from it by always invoking the checkpatch.pl script with the minimally required arguments for the test suite to pass. Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
2023-01-05patman: locate test data files via __file__ and pathlibMaxim Cournoyer
Previously it would rely on the executing script location, which could break for example when running the tests via 'pytest'. Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
2023-01-05patman: cosmetic: Fix PEP 8 warnings for the gitutil module.Maxim Cournoyer
This patch fixes all the PEP 8 warnings reported by Pyflake for the gitutil module. Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
2023-01-05patman: locate README.rst via importlibMaxim Cournoyer
Rationale: this is more robust than assumptions about the file hierarchy layout of the installation of patman, for example on non file-hierarchy standard (FHS) systems such as Guix System or Nix OS. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2023-01-05patman: fix installation of README.rst data fileMaxim Cournoyer
This fixes a regression introduced in commit 74df491051d6 ("buildman: Convert documentation to rST"). Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2023-01-05patman: remove extraneous importsMaxim Cournoyer
* tools/patman/main.py: Remove extraneous imports and fix indentation. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2023-01-05test:dm:fix typoYuepeng Xing
Fix typos in the 'test/dm' directory. Signed-off-by: Yuepeng Xing <xingyuepeng@eswincomputing.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2023-01-05patman: Switch to setuptoolsSean Anderson
distutils is about to meet its demise [1]. Switch to setuptools. [1] https://peps.python.org/pep-0632/ Signed-off-by: Sean Anderson <seanga2@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2023-01-05reset: at91: Add reset driver for basic assert/deassert operationsSergiu Moga
Add support for at91 reset controller's basic assert/deassert operations. Since this driver conflicts with the SYSRESET driver because they both bind to the same RSTC node, implement a custom bind hook that would manually bind the sysreset driver, if enabled, to the same RSTC DT node. Furthermore, delete the no longer needed compatibles from the SYSRESET driver and rename it to make sure than any possible conflicts are avoided. Signed-off-by: Sergiu Moga <sergiu.moga@microchip.com> Tested-by: Mihai Sain <mihai.sain@microchip.com> Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
2023-01-05ARM: at91: add sama7 SFR definitionsCristian Birsan
Special Function Registers(SFR) definitions for SAMA7 product family. Signed-off-by: Cristian Birsan <cristian.birsan@microchip.com> Signed-off-by: Sergiu Moga <sergiu.moga@microchip.com>
2023-01-05ARM: dts: sama5d27_wlsom1_ek: Add pinctrl nodes for USB DT nodesSergiu Moga
Add the pinctrl nodes required by the USB related DT nodes. Signed-off-by: Sergiu Moga <sergiu.moga@microchip.com>
2023-01-05ARM: dts: sama5d2_icp: Add pinctrl nodes for USB related DT nodesSergiu Moga
Add the pinctrl subnodes required by the USB related DT nodes. Signed-off-by: Sergiu Moga <sergiu.moga@microchip.com>
2023-01-05ARM: dts: sama7g5ek: Add pinctrl, gpio and phy properties for USBSergiu Moga
Add the required pinctrl, gpio and phy properties required by the USB DT nodes of the sama7g5ek boards. Since these have not yet been defined in upstream Linux, place them in the U-Boot specific DT file. Signed-off-by: Sergiu Moga <sergiu.moga@microchip.com>
2023-01-05ARM: dts: sama7g5: Add USB and UTMI DT nodesSergiu Moga
Define the USB and UTMI DT nodes for the sama7g5 SoC's. Since these have not yet been defined in upstream Linux, place them in the U-Boot specific DT file. Signed-off-by: Sergiu Moga <sergiu.moga@microchip.com> Reviewed-by: Marek Vasut <marex@denx.de>
2023-01-05dt-bindings: clk: at91: Define additional UTMI related clocksSergiu Moga
Add definitions for an additional main UTMI clock as well as its respective subclocks. Signed-off-by: Sergiu Moga <sergiu.moga@microchip.com>
2023-01-05dt-bindings: reset: add sama7g5 definitionsSergiu Moga
Upstream linux commit 5994f58977e0. Add reset bindings for SAMA7G5. At the moment only USB PHYs are included. The three reset USB phy's have their ID's mapped from 4 to 6. There are no USB phy's with ID's numbered from 0 to 3. Signed-off-by: Sergiu Moga <sergiu.moga@microchip.com>
2023-01-05ARM: dts: sam9x60ek: Add pinctrl and gpio properties for USBSergiu Moga
Add the required pinctrl and gpio properties required by the USB DT nodes of the sam9x60ek boards. Signed-off-by: Sergiu Moga <sergiu.moga@microchip.com>
2023-01-05ARM: dts: sam9x60_curiosity: Add pinctrl and gpio properties for USBSergiu Moga
Add the required pinctrl and gpio properties needed by the USB DT nodes of the sam9x60_curiosity boards. Signed-off-by: Sergiu Moga <sergiu.moga@microchip.com>
2023-01-05ARM: dts: sam9x60: Add OHCI and EHCI DT nodesSergiu Moga
Add the OHCI and EHCI DT nodes for the sam9x60 SoC's. Signed-off-by: Sergiu Moga <sergiu.moga@microchip.com> Reviewed-by: Marek Vasut <marex@denx.de>
2023-01-04Merge tag 'efi-2023-01-rc5-3' of ↵Tom Rini
https://source.denx.de/u-boot/custodians/u-boot-efi Pull request for efi-2023-01-rc5-3 Documentation: * Describe building documentation UEFI: * Add .data section to aarch64 EFI binaries and correct section flags * Correct sorting of capsules when updating * Populate console handles in system table Other: * Fix description of eth_env_[gs]et_enetaddr() return value * Avoid endless loop in sound play command
2023-01-04efi_loader: populate console handles in system tableHeinrich Schuchardt
The fields ConsoleInHandle, ConsoleOutHandle, ConsoleErrHandle must point to the handles with the respective console protocols. Failure to do so leads to an error in the EFI Shell: No SimpleTextInputEx was found. CTRL-based features are not usable. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
2023-01-04efi_loader: adjust sorting of capsulesHeinrich Schuchardt
Up to now we only compared the first letter of the capsule name to sort them alphabetically. Properly sort by the Unicode alphabet. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2023-01-04test: unit test for u16_strcasecmp()Heinrich Schuchardt
Provide a unit test for u16_strcasecmp(). Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2023-01-04lib: add function u16_strcasecmp()Heinrich Schuchardt
Provide a function for comparing UTF-16 strings in a case insensitive manner. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2023-01-04efi_loader: fix building aarch64 EFI binariesHeinrich Schuchardt
While our EFI binaries execute without problems on EDK II they crash on a Lenovo X13s. Let our binaries look more like what EDK II produces: * move all writable data to a .data section * align sections to 4 KiB boundaries (matching EFI page size) * remove IMAGE_SCN_LNK_NRELOC_OVFL from .reloc section flags Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
2023-01-04efi_loader: defines for PE-COFF section flagsHeinrich Schuchardt
Provide constants for the section flags used by binaries. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>