aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2022-03-30Merge tag 'clk-2022.04-next' of ↵WIP/30Mar2022-nextTom Rini25-676/+127
https://source.denx.de/u-boot/custodians/u-boot-clk into next Clock patches for u-boot/next This is mostly cleanups/consolidations. clk_free is made to return void, and the CCF wrappers present in almost every CCF clock are consolidated. I would particularly like to have the latter upstream, since there are at least two series adding support for new CCF drivers (imx8mq and imxrt1170) which can benefit from these commits. I had to fix up the last commit since I missed an include for at91. CI: https://source.denx.de/u-boot/custodians/u-boot-clk/-/pipelines/11521
2022-03-30clk: Use generic CCF ops where possibleSean Anderson8-591/+22
This converts most CCF drivers to use generic ops. imx6q is the only outlier, where we retain the existing functionality by moving the check to request(). Signed-off-by: Sean Anderson <seanga2@gmail.com> Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> Link: https://lore.kernel.org/r/20220320203446.740178-2-seanga2@gmail.com [ fixed missing include for at91 ] Signed-off-by: Sean Anderson <seanga2@gmail.com>
2022-03-30clk: ccf: Add some helper functions for clock opsSean Anderson2-0/+73
Most CCF drivers follow a common pattern where their clock ops defer the actual operation to the backing CCF clock. Add some generic implementations of these functions to reduce duplication of code. Signed-off-by: Sean Anderson <seanga2@gmail.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> Link: https://lore.kernel.org/r/20220320203446.740178-1-seanga2@gmail.com
2022-03-30clk: Consolidate some clock functionsSean Anderson1-20/+2
These functions are exactly the same as their "nodev" varients, except they accept a device and not an ofnode. Rewrite them to just call the other function. Signed-off-by: Sean Anderson <seanga2@gmail.com> Link: https://lore.kernel.org/r/20220227190113.1617498-1-seanga2@gmail.com
2022-03-30clk: Make clk_free return voidSean Anderson3-16/+11
Most callers of this function do not check the return value, and it is unclear what action they should take if it fails. If a function is freeing multiple clocks, it should not stop just because the first one failed. Since the callbacks can no longer fail, just convert the return type to void. Signed-off-by: Sean Anderson <seanga2@gmail.com> Link: https://lore.kernel.org/r/20220115222504.617013-8-seanga2@gmail.com
2022-03-30spi: dw: Don't check clk_freeSean Anderson1-1/+1
This function always succeeds, so don't check its return value. Signed-off-by: Sean Anderson <seanga2@gmail.com> Link: https://lore.kernel.org/r/20220115222504.617013-7-seanga2@gmail.com
2022-03-30spi: bcm63xx: Don't check clk_freeSean Anderson2-9/+3
This function always succeeds, so don't check its return value. Signed-off-by: Sean Anderson <seanga2@gmail.com> Link: https://lore.kernel.org/r/20220115222504.617013-6-seanga2@gmail.com
2022-03-30phy: bcm63xx: Don't check clk_freeSean Anderson3-12/+4
This function always succeeds, so don't check its return value. Signed-off-by: Sean Anderson <seanga2@gmail.com> Link: https://lore.kernel.org/r/20220115222504.617013-5-seanga2@gmail.com
2022-03-30net: bcm63xx: Don't check clk_freeSean Anderson2-10/+2
This function always succeeds, so don't check its return value. Signed-off-by: Sean Anderson <seanga2@gmail.com> Link: https://lore.kernel.org/r/20220115222504.617013-4-seanga2@gmail.com
2022-03-30dma: bcm6348: Don't check clk_freeSean Anderson1-5/+1
This function always succeeds, so don't check its return value. Signed-off-by: Sean Anderson <seanga2@gmail.com> Link: https://lore.kernel.org/r/20220115222504.617013-3-seanga2@gmail.com
2022-03-30clk: Make rfree return voidSean Anderson3-12/+9
When freeing a clock there is not much we can do if there is an error, and most callers do not actually check the return value. Even e.g. checking to make sure that clk->id is valid should have been done in request() in the first place (unless someone is messing with the driver behind our back). Just return void and don't bother returning an error. Signed-off-by: Sean Anderson <seanga2@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org> Link: https://lore.kernel.org/r/20220115222504.617013-2-seanga2@gmail.com
2022-03-28Merge tag 'next-20220328' of ↵WIP/28Mar2022Tom Rini98-6669/+29
https://source.denx.de/u-boot/custodians/u-boot-video into next - drop old CFB code - drop CONFIG_LCD_BMP_RLE8
2022-03-28video: Drop CONFIG_LCD_BMP_RLE8Simon Glass2-146/+0
This is not defined by any board. Even sandbox doesn't actually use it since it has migrated to DM_VIDEO. Drop this option. Remove the dead code also, for completeness, even though the whole lcd.c file will be dropped soon. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Anatolij Gustschin <agust@denx.de>
2022-03-28video: Drop formike driverSimon Glass3-515/+0
This is not used. Drop it. Signed-off-by: Simon Glass <sjg@chromium.org>
2022-03-28video: Convert CONFIG_VIDEO_BCM2835 to KconfigSimon Glass12-2/+17
This converts the following to Kconfig: CONFIG_VIDEO_BCM2835 This is the final ad-hoc CONFIG_VIDEO_... to convert. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Matthias Brugger <mbrugger@suse.com>
2022-03-28video: mxs: Drop old video codeSimon Glass1-89/+0
This is no-longer used and is the last reference to video_hw_init(). Drop it. Signed-off-by: Simon Glass <sjg@chromium.org>
2022-03-28video: Drop FSL DIU driverSimon Glass12-791/+0
This does not use driver model and is more than two years past the migration date. Drop it. It can be added back later if needed. Signed-off-by: Simon Glass <sjg@chromium.org>
2022-03-28video: fsl: colibri_vf: Drop FSL DCU driverSimon Glass23-1197/+0
This does not use driver model and is more than two years past the migration date. Drop it. It can be added back later if needed. Signed-off-by: Simon Glass <sjg@chromium.org>
2022-03-28video: Drop da8xx-fbSimon Glass4-1164/+0
This is not used in U-Boot anymore. Drop it. Signed-off-by: Simon Glass <sjg@chromium.org>
2022-03-28video: Clean up the uclass headerSimon Glass1-83/+1
Drop the unnecessary cruft from this header and update the title. Signed-off-by: Simon Glass <sjg@chromium.org>
2022-03-28video: Drop references to CONFIG_VIDEO et alSimon Glass17-125/+11
Drop the Kconfigs which are not used and all references to them. In particular, this drops CONFIG_VIDEO to avoid confusion and allow us to eventually rename CONFIG_DM_VIDEO to CONFIG_VIDEO. Also drop the prototype for video_get_info_str() which is no-longer used. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Jason Liu <jason.hui.liu@nxp.com>
2022-03-28video: Drop CONFIG_VIDEO_BMP_LOGOSimon Glass29-43/+0
This option is not implemented anymore. Drop it. Signed-off-by: Simon Glass <sjg@chromium.org>
2022-03-28video: Drop video_fb headerSimon Glass14-104/+0
This is not used now. Drop it. Signed-off-by: Simon Glass <sjg@chromium.org>
2022-03-28video: nexell: Drop unused and invalid codeSimon Glass2-13/+5
Unfortunately this driver uses the old video structure to store things. This is not supported with driver model. Drop the old code and comment out the other pieces, so the maintainer can take a look. Signed-off-by: Simon Glass <sjg@chromium.org>
2022-03-28video: siemens: Drop unused video codeSimon Glass5-449/+0
Drop this old code which is not built anymore, as it depends on CONFIG_VIDEO which has been removed. Signed-off-by: Simon Glass <sjg@chromium.org>
2022-03-28video: Drop cfg_consoleSimon Glass8-1953/+0
The non-driver model video support was removed two years ago. Drop this driver, which is only used by nokia_rx51. Signed-off-by: Simon Glass <sjg@chromium.org>
2022-03-28Merge tag 'v2022.04-rc5' into nextTom Rini146-558/+2480
Prepare v2022.04-rc5
2022-03-28Prepare v2022.04-rc5v2022.04-rc5Tom Rini1-1/+1
Signed-off-by: Tom Rini <trini@konsulko.com>
2022-03-28configs: Resync with savedefconfigTom Rini21-106/+63
Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini <trini@konsulko.com>
2022-03-28Merge branch '2022-03-28-critical-fixes'Tom Rini9-36/+82
- A zstd, two Apple M1 and an MXS NAND critical bugfix - Clean up another file that wasn't being removed and update some external documentation links.
2022-03-28mtd: gpmi: fix the bch setting backward compatible issueWIP/2022-03-28-critical-fixesHan Xu3-13/+62
Previous u-boot code changed the default bch setting behavior and caused backward compatible issue. This fix choose the legacy bch geometry back again as the default option. If the minimum ecc strength that NAND chips required need to be chosen, it can be enabled by either adding DT flag "fsl,use-minimum-ecc" or CONFIG_NAND_MXS_USE_MINIMUM_ECC in configs. The unused flag "fsl,legacy-bch-geometry" get removed. Fixes: 51cdf83eea (mtd: gpmi: provide the option to use legacy bch geometry) Fixes: 616f03daba (mtd: gpmi: change the BCH layout setting for large oob NAND) Tested-by: Tim Harvey <tharvey@gateworks.com> Tested-by: Sean Nyekjaer <sean@geanix.com> Signed-off-by: Han Xu <han.xu@nxp.com> Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
2022-03-28boot: image: fixup zstd decompression buffer initialization typoJérôme Carretero1-1/+1
The code was mistakenly initializing the input buffer twice. Tested to be working on BeagleBone by adjusting CONFIG_SYS_BOOTM_LEN to 64MiB (probably works with less) and preparing uImage with: cat arch/arm/boot/Image \ | zstd --ultra -22 --zstd=windowLog=22 \ > linux.bin.zst mkimage -A arm -T kernel uImage -C zstd -d linux.bin.zst \ -a 0x80008000 -e 0x80008000 Without the windowLog restriction, bootm fails with a zstd decompression error 7 (window too large), which I haven't troubleshooted. There should be a bit more documentation on the feature... Reviewed-by: Simon Glass <sjg@chromium.org> Fixes: 458b30af66c image: Update image_decomp() to avoid ifdefs
2022-03-28Fix URLs to old freescale git reposPali Rohár2-2/+2
Freescale git repos are now on source.codeaurora.org. Signed-off-by: Pali Rohár <pali@kernel.org>
2022-03-28Makefile: add drivers/video/u_boot_logo.S to cleanHeinrich Schuchardt1-1/+2
make sandbox_defconfig make mrproper make tests fails with ../drivers/video/u_boot_logo.S: Assembler messages: ../drivers/video/u_boot_logo.S:5: Error: file not found: drivers/video/u_boot_logo.bmp We have to delete the generated file. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2022-03-28arm: apple: Fix mem layoutMark Kettenis1-18/+14
The current approach for setting the environment variables that describe the memory layout runs the risk of overlapping with reserved memory regions. Use the lmb code to derive the addresses for these variables instead. Signed-off-by: Mark Kettenis <kettenis@openbsd.org> Reviewed-by: Simon Glass <sjg@chromium.org>
2022-03-28arm: apple: Increase RTKit timeoutHector Martin1-1/+1
The firmware on larger NVMe drives needs more than 100ms to come up. Change the timeout to 1s. Signed-off-by: Hector Martin <marcan@marcan.st> Signed-off-by: Mark Kettenis <kettenis@openbsd.org> Reviewed-by: Simon Glass <sjg@chromium.org>
2022-03-27Merge tag 'efi-2022-04-rc5-2' of ↵WIP/27Mar2022Tom Rini7-17/+233
https://source.denx.de/u-boot/custodians/u-boot-efi Pull request for efi-2022-04-rc5-2 Documentation: * man-page for the wdt command UEFI: * Unit test for boot manager
2022-03-26cmd: efidebug: simplify do_efi_boot_add()Heinrich Schuchardt1-3/+2
When calling efi_dp_from_name() we are not interested in the device part. Just pass NULL as an argument. Suggested-by: AKASHI Takahiro <takahiro.akashi@linaro.org> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2022-03-26test: test UEFI boot managerHeinrich Schuchardt2-0/+74
Provide a unit test for * efidebug boot add * efidebug boot order * bootefi bootmgr * initrd via EFI_LOAD_FILE2_PROTOCOL Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2022-03-26efi_loader: initrddump: drain input before promptHeinrich Schuchardt1-4/+10
Up to now the initrddump.efi application has drained the input after showing the prompt. This works for humans but leads to problems when automating testing. If the input is drained, this should be done before showing the prompt. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Acked-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
2022-03-26efi_loader: nocolor command line attr for initrddump.efiHeinrich Schuchardt1-9/+68
initrddump.efi uses colored output and clear the screen. This is not helpful for integration into Python tests. Allow specifying 'nocolor' in the load option data to suppress color output and clearing the screen. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2022-03-26efi_loader: typo devie-pathHeinrich Schuchardt1-1/+1
%s/devie-path/device-path/ Reported-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2022-03-26doc: man-page for the wdt commandHeinrich Schuchardt2-0/+78
Describe the wdt command. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2022-03-25Merge https://source.denx.de/u-boot/custodians/u-boot-sunxiTom Rini16-15/+17
- Fix A20 GBit Ethernet operation - Update board .dts files to provide correct RGMII PHY mode
2022-03-26sunxi: dts: Update RGMII phy-mode propertiesAndre Przywara14-14/+14
Commit f11513d99787 ("net: phy: realtek: Add tx/rx delay config for 8211e") made the Realtek PHY driver honour the phy-mode DT property, to set up the proper delay scheme for the RX and TX lines. A similar change in the kernel revealed that those properties were mostly wrong. The kernel DTs got updated over the last few months, but we were missing out on the U-Boot version. Just sync in the phy-mode properties from the mainline kernel, v5.17-rc7, to avoid the breaking DT sync that late in the cycle. This fixes Ethernet operation on the affected boards. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Samuel Holland <samuel@sholland.org>
2022-03-26sunxi: Fix old GMAC pinmux setupAndre Przywara2-1/+3
Commit 5bc4cd05d7d4 ("sunxi: move non-essential code out of s_init()") moved the call to eth_init_board() from s_init() into board_init_f(). This means it's now only called from the SPL, which makes sense for most of the other moved low-level functions. However the GMAC pinmux and clock setup in eth_init_board() was not happy about that, so it broke the sun7i GMAC. Since Ethernet is of no use in the SPL anyway, just move the call into board_init(), which is only run in U-Boot proper. This fixes Ethernet operation for the A20 SoCs, which broke in v2022.04-rc1, with the above mentioned commit. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com> Tested-by: Petr Štetiar <ynezz@true.cz> [a20-olinuxino-lime2]
2022-03-25Merge branch '2022-03-25-assorted-updates' into nextTom Rini29-149/+737
- Assorted PCI cleanups - Allow building with -Og - ast2600 pwm support - PFUZE100 bootcount driver
2022-03-25bootcount: Add pmic pfuze100 bootcount driverPhilip Oberfichtner3-0/+169
Use the MEMA - MEMD registers on the PFUZE100 as bootcount registers. Based on work from Heiko Schocher <hs@denx.de>. Signed-off-by: Philip Oberfichtner <pro@denx.de>
2022-03-25power: pfuze100: Add MEMx register definitionsPhilip Oberfichtner1-0/+5
Add missing MEMA - MEMD register definitions for PFUZE100. Based on work from Heiko Schocher <hs@denx.de>. Signed-off-by: Philip Oberfichtner <pro@denx.de>
2022-03-25disk: Add an option for partitions in SPLSimon Glass3-6/+22
In some cases we do not want to enable partition support in SPL. Add an option to allow this. Signed-off-by: Simon Glass <sjg@chromium.org>