aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge patch series "Allow showing the memory map"Tom Rini2024-10-2517-42/+347
|\ | | | | | | | | | | | | | | | | | | Simon Glass <sjg@chromium.org> says: This little series adds a new 'memmap' command, intended to show the layout of memory within U-Boot and how much memory is available for loading images. Link: https://lore.kernel.org/r/20241021081934.289473-1-sjg@chromium.org
| * meminfo: Show the lmb recordsSimon Glass2024-10-252-2/+30
| | | | | | | | | | | | Add the lmb records onto the end of the memory map. Signed-off-by: Simon Glass <sjg@chromium.org>
| * lmb: Export the lmb data structureSimon Glass2024-10-251-1/+1
| | | | | | | | | | | | | | | | Provide a way to access this data structure so that the meminfo command can use it. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
| * cmd: Update the meminfo command to show the memory mapSimon Glass2024-10-256-2/+230
| | | | | | | | | | | | | | | | | | | | U-Boot has a fairly rigid memory map which is normally not visible unless debugging is enabled in board_f.c Update the 'meminfo' command to show it. This command does not cover arch-specific pieces but gives a good overview of where things are. Signed-off-by: Simon Glass <sjg@chromium.org>
| * cmd: Move meminfo command into its own fileSimon Glass2024-10-254-19/+28
| | | | | | | | | | | | | | | | | | In preparation for expanding this command, move it into a separate file. Rename the function to remove the extra underscore. Update the number of arguments to 1, since 3 is incorrect. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
| * bootstage: Allow counting memory without stringsSimon Glass2024-10-253-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | The bootstage array includes pointers to strings but not the strings themselves. The strings are added when stashing, but including them in the size calculation gives an inflated view of the amount of space used by the array. Update this function so it can return the amount of memory used by the bootstage structures themselves, without the strings which they point to. Signed-off-by: Simon Glass <sjg@chromium.org>
| * global_data: Add some more accessorsSimon Glass2024-10-251-0/+30
| | | | | | | | | | | | | | Add accessors for bloblist, bootstage, trace and video to avoid needing more #ifdefs in the C code. Signed-off-by: Simon Glass <sjg@chromium.org>
| * common: Tidy up how malloc() is initedSimon Glass2024-10-254-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The call to malloc() is a bit strange. The naming of the arguments suggests that an address is passed, but in fact it is a pointer, at least in the board_init_r() function and SPL equivalent. Update it to work as described. Add a function comment as well. Note that this does adjustment does not extend into the malloc() implementation itself, apart from changing mem_malloc_init(), since there are lots of casts and pointers and integers are used interchangeably. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
| * common: Fix up malloc() comment in reserve_noncached()Simon Glass2024-10-251-3/+3
| | | | | | | | | | | | | | The function name has changed, so update it. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
* | Merge tag 'xilinx-for-v2025.01-rc1-v2' of ↵Tom Rini2024-10-2533-45/+551
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://source.denx.de/u-boot/custodians/u-boot-microblaze AMD/Xilinx changes for v2025.01-rc1 v2 .mailmap: - Switch Padmarao's email to AMD one zynq_spi: - Make update_stripe static xilinx: - Update DT description for EMMCs zynqmp: - Update logic around RPUs and tcm handling - Update bootmenu selection for Kria - Add description for SC vm-p-b1369 - Fix comment about file location in zynqmp-p-a2197-00-revA.dts versal: - Fix logic around USB boot versal2: - Disable useless features for Mini configurations versal-net: - Get rid of current-speed DT property from mini configuration microblaze: - Fix scriptaddr location # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQQbPNTMvXmYlBPRwx7KSWXLKUoMIQUCZxuweAAKCRDKSWXLKUoM # IY1iAKCH/GKJHEXFfLvr0OGuO6c1SX9+ZQCfTjRAHrL186X6LUgjOpmtmsrVK1c= # =4gY0 # -----END PGP SIGNATURE----- # gpg: Signature made Fri 25 Oct 2024 08:51:36 AM CST # gpg: using DSA key 1B3CD4CCBD79989413D1C31ECA4965CB294A0C21 # gpg: Good signature from "Michal Simek <monstr@monstr.eu>" [full] # gpg: aka "Michal Simek (Xilinx) <michals@xilinx.com>" [full] # gpg: aka "Michal Simek (Xilinx) <michal.simek@xilinx.com>" [full] # gpg: aka "Michal Simek (AMD) <michal.simek@amd.com>" [unknown]
| * | .mailmap: update e-mail address for Padmarao BegariPadmarao Begari2024-10-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Update e-mail address. Signed-off-by: Padmarao Begari <padmarao.begari@amd.com> Link: https://lore.kernel.org/r/20241023085127.3450680-1-padmarao.begari@amd.com Signed-off-by: Michal Simek <michal.simek@amd.com>
| * | spi: zynq_qspi: Add missing prototype for update_stripeVenkatesh Yadav Abbarapu2024-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing prototype to fix the sparse warning, warning: no previous prototype for 'update_stripe' [-Wmissing-prototypes]. Signed-off-by: Venkatesh Yadav Abbarapu <venkatesh.abbarapu@amd.com> Link: https://lore.kernel.org/r/20241016044402.18052-1-venkatesh.abbarapu@amd.com Signed-off-by: Michal Simek <michal.simek@amd.com>
| * | amd: Disable LMB, BOOTM, MTD and EFI loader for mini configurationsMichal Simek2024-10-253-1/+9
| | | | | | | | | | | | | | | | | | | | | Mini configurations don't need these features that's why disable them. Signed-off-by: Michal Simek <michal.simek@amd.com> Link: https://lore.kernel.org/r/6a263cf5f6b7c7f8e0bfc11649887f2760385d0e.1728286203.git.michal.simek@amd.com
| * | arm64: zynqmp: fix tcm initialization for mini u-bootPadmarao Begari2024-10-252-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the issue introduced by commit fed064477c2c ("arm64: zynqmp: Print an error for split to lock mode switch"). The mini u-boot is hanging, because of the tcm is not initialized. The mini u-boot is using the tcm to reserve the mmu table and currently it is not initialized, so allowing u-boot to initialize the tcm. Signed-off-by: Padmarao Begari <padmarao.begari@amd.com> Link: https://lore.kernel.org/r/20241011113435.1966604-1-padmarao.begari@amd.com Signed-off-by: Michal Simek <michal.simek@amd.com>
| * | arm64: xilinx: Fix file location described in zynqmp-p-a2197-00-revA.dtsMichal Simek2024-10-251-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pointers to incorrect file name described in DT. Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202409250603.7achimjs-lkp@intel.com/ Signed-off-by: Michal Simek <michal.simek@amd.com> Link: https://lore.kernel.org/r/6e6017ad613d452d16ce0f7fba8a6ce32b174413.1727247725.git.michal.simek@amd.com
| * | arm64: versal-net: Remove current-speed from miniMichal Simek2024-10-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | U-Boot code is not reading this variable that's why remove it from DT. PL011 code is automatically using CONFIG_BAUDRATE instead. Signed-off-by: Michal Simek <michal.simek@amd.com> Link: https://lore.kernel.org/r/3de28cc8bbf9571d24673a60809c2075fe2f44c3.1727247837.git.michal.simek@amd.com
| * | arm64: zynqmp: Add description for SC on vm-p-m1369 boardMichal Simek2024-10-252-0/+402
| | | | | | | | | | | | | | | | | | | | | Board is very similar to vn-p-b2197 with subset of functinality. Signed-off-by: Michal Simek <michal.simek@amd.com> Link: https://lore.kernel.org/r/fbc6d56c4aaa33113e35a53520320f4050ed141e.1727247815.git.michal.simek@amd.com
| * | xilinx: Add cap-mmc-hw-reset and no-sd, no-sdio property to eMMCPaul Alvin2024-10-2518-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "cap-mmc-hw-reset" property to the eMMC DT node to perform the eMMC device hardware reset. Also, add "no-sd", "no-sdio" properties to eMMC DT node to skip unwanted sd, sdio related commands during initialization for eMMC device as this may lead to unnecessary register dump. Signed-off-by: Paul Alvin <alvin.paulp@amd.com> Signed-off-by: Michal Simek <michal.simek@amd.com> Link: https://lore.kernel.org/r/b31554816a3378365143e9f5c266f6386af0a438.1727247785.git.michal.simek@amd.com
| * | xilinx: zynqmp: Remove conditional check for bootmenu_default variableJohn Vicky Vykuntapu2024-10-251-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per bootmenu support added default boot options to CC on AMD CCs and default to SOM on others. However, if no secondary boot device is enabled in the design,it should be the default boot option for SOM when combined with AMD CCs because it only contains SOM peripherals. To address this issue, The conditional check for the bootmenu_default variable was removed, and it has always been set to SOM as the default boot option. In this way, users can choose preferred boot options from the bootmenu based on the boot devices configured in the design for AMD CCs. Fixes: 61bf0fa8663d ("xilinx: zynqmp: Add bootmenu support") Signed-off-by: John Vicky Vykuntapu <johnvicky.vykuntapu@amd.com> Signed-off-by: Michal Simek <michal.simek@amd.com> Link: https://lore.kernel.org/r/0e30b44ce3b478fdec21edad8d896f4d438ce331.1727867715.git.michal.simek@amd.com
| * | xilinx: common: fix script address for MicroblazePadmarao Begari2024-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the issue introduced by commit 067e0294806e ("board: xilinx: Remove conditional check for Microblaze"). The scriptaddr should be physical location not really offset from start of DDR. When U-Boot is not found boot.scr script address in device tree, then it is assigned based on script address and ram base address for Microblaze and i.e exceeding DDR memory. To fix this, the script address is assigned initially with offset instead of address. Later it is added with ram base address and gets the physical address. Signed-off-by: Padmarao Begari <padmarao.begari@amd.com> Link: https://lore.kernel.org/r/20241001082537.830286-1-padmarao.begari@amd.com Signed-off-by: Michal Simek <michal.simek@amd.com>
| * | arm64: versal: Wire USB0 in distro bootMichal Simek2024-10-251-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | For unknown reason USB host hasn't been described for distro boot that's why wire it now. Signed-off-by: Michal Simek <michal.simek@amd.com> Link: https://lore.kernel.org/r/9715605c232ce38a36a200204c14208b9d76cd83.1727694230.git.michal.simek@amd.com
| * | arm64: versal: Remove description for USB1Michal Simek2024-10-251-2/+2
| | | | | | | | | | | | | | | | | | | | | There is only one USB controller that's why remove description for USB1. Signed-off-by: Michal Simek <michal.simek@amd.com> Link: https://lore.kernel.org/r/f148161ee489d19d708df1b4fa7477821e06bb55.1727694230.git.michal.simek@amd.com
| * | arm64: zynqmp: Fix tcminit mode value based on argvPadmarao Begari2024-10-251-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RPU pytest introduced by commit e894c10c040b ("test/py: zynqmp_rpu: Add test for loading RPU apps") expects 3rd parameter as string not a number that's why extend command to actually handle both. The issue with existing code is that when any non number string is passed hextoul returns 0. For backward compatibility zynqmp tcminit 0/1 can be still used but it is recommended to use strings instead. Signed-off-by: Padmarao Begari <padmarao.begari@amd.com> Link: https://lore.kernel.org/r/20240930043814.530181-3-padmarao.begari@amd.com Signed-off-by: Michal Simek <michal.simek@amd.com>
| * | arm64: zynqmp: Print an error for split to lock mode switchPadmarao Begari2024-10-253-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The zynqmp tcminit crashes the U-Boot when switching from r5-mode "split" to "lockstep" instead it should throw an error. When cpu is enabled, the check_tcm_mode() function checks if the previous mode is "split", switch mode is "lockstep" then it returns the error code and the initialize_tcm() function is not updating the global control register of the RPU instead it prints the error message. When cpu is disabled, the check_tcm_mode() function returns the success code for switch split to lockstep mode. Signed-off-by: Padmarao Begari <padmarao.begari@amd.com> Link: https://lore.kernel.org/r/20240930043814.530181-2-padmarao.begari@amd.com Signed-off-by: Michal Simek <michal.simek@amd.com>
* | | Merge tag 'u-boot-dfu-20241025' of ↵Tom Rini2024-10-2524-241/+372
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://source.denx.de/u-boot/custodians/u-boot-dfu CI: https://source.denx.de/u-boot/custodians/u-boot-dfu/-/pipelines/22962 Dfu: - Rely on device tree for spi speed/mode on spi flash Android Image: - Fix booting on platforms having > 4GiB of memory - Decompress boot image to kernel_addr_r when compression is enabled - Honor CONFIG_SYS_LOAD_ADDR when mkbootimg uses default address Bcb: - Rework bcb command to use U_BOOT_LONGHELP - Move ab_select cmd to bcb cmd - Implement ab_dump command in bcb - bcb: Write '_<slot>' instead of '<slot>' to misc partition
| * | image: android: handle ramdisk default addressNeil Armstrong2024-10-241-8/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The two tools that create android boot images, mkbootimg and the fastboot client, set the kernel address by default to 0x11008000. U-boot always honors this field, and will try to copy the ramdisk to whatever value is set in the header, which won't be mapped to the actual RAM on most platforms, resulting in the kernel obviously not booting. All the targets in U-Boot right now will download the android boot image to CONFIG_SYS_LOAD_ADDR, which means that it will already have been downloaded to some location that is suitable to use the ramdisk in-place for header version 0 to 2. For header version 3 and later, the ramdisk can't be used in-place to use ramdisk_addr_r in this case. Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> Tested-by: Guillaume La Roque <glaroque@baylibre.com> Link: https://lore.kernel.org/r/20241017-topic-fastboot-fixes-mkbootimg-v2-3-c3927102d931@linaro.org Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
| * | image: android: do not boot XIP when kernel is compressedNeil Armstrong2024-10-241-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to boot an android boot image with a compressed kernel, if the kernel is used in-place because it was created with mkbootimg, the space will be too small to properly uncompress. Take in account the compressed state, and if compressed use the kernel_addr_r which should be big enough. Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> Tested-by: Guillaume La Roque <glaroque@baylibre.com> Link: https://lore.kernel.org/r/20241017-topic-fastboot-fixes-mkbootimg-v2-2-c3927102d931@linaro.org Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
| * | image: android: use ulong for kernel addressNeil Armstrong2024-10-242-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When booting with platforms having > 4GiB of memory, the kernel physical address can be more than 32bits. Use ulong like all the other addresses, and fix the print to show the > 32bits address numbers. Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> Tested-by: Guillaume La Roque <glaroque@baylibre.com> Link: https://lore.kernel.org/r/20241017-topic-fastboot-fixes-mkbootimg-v2-1-c3927102d931@linaro.org Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
| * | common: android_ab: fix slot suffix for abc blockDmitry Rokosov2024-10-241-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To align with the official Android BCB (Bootloader Control Block) specifications, it's important to note that the slot_suffix should start with an underscore symbol. For a comprehensive understanding of the expected slot_suffix format in userspace, please refer to the provided reference [1]. Links: [1] - https://source.android.com/docs/core/architecture/bootloader/updating#slots Based-on: https://android-review.googlesource.com/c/platform/external/u-boot/+/1446439 Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> Reviewed-by: Simon Glass <sjg@chromium.org> Tested-by: Guillaume La Roque <glaroque@baylibre.com> Signed-off-by: Dmitry Rokosov <ddrokosov@salutedevices.com> Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> # vim3_android Link: https://lore.kernel.org/r/20241017-android_ab_master-v5-6-43bfcc096d95@salutedevices.com Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
| * | cmd: bcb: introduce 'ab_dump' command to print BCB block contentDmitry Rokosov2024-10-244-0/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's really helpful to have the ability to dump BCB block for debugging A/B logic on the board supported this partition schema. Command 'bcb ab_dump' prints all fields of bootloader_control struct including slot_metadata for all presented slots. Output example: ===== > board# bcb ab_dump ubi 0#misc > Read 512 bytes from volume misc to 000000000bf07580 > Read 512 bytes from volume misc to 000000000bf42f40 > Bootloader Control: [misc] > Active Slot: _a > Magic Number: 0x42414342 > Version: 1 > Number of Slots: 2 > Recovery Tries Remaining: 0 > CRC: 0x2c8b50bc (Valid) > > Slot[0] Metadata: > - Priority: 15 > - Tries Remaining: 0 > - Successful Boot: 1 > - Verity Corrupted: 0 > > Slot[1] Metadata: > - Priority: 14 > - Tries Remaining: 7 > - Successful Boot: 0 > - Verity Corrupted: 0 ==== The ab_dump command allows you to display ABC data directly on the U-Boot console. During an A/B test execution, this test verifies the accuracy of each field within the ABC data. Signed-off-by: Dmitry Rokosov <ddrokosov@salutedevices.com> Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> # vim3_android Link: https://lore.kernel.org/r/20241017-android_ab_master-v5-5-43bfcc096d95@salutedevices.com Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
| * | cmd: bcb: change strcmp() usage style in the do_bcb_ab_select()Dmitry Rokosov2024-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the entire cmd/bcb.c file, the return value of strcmp() is not directly compared to 0. Therefore, it would be better to maintain this style in the new do_bcb_ab_select() function as well. Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> Reviewed-by: Simon Glass <sjg@chromium.org> Tested-by: Guillaume La Roque <glaroque@baylibre.com> Signed-off-by: Dmitry Rokosov <ddrokosov@salutedevices.com> Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> # vim3_android Link: https://lore.kernel.org/r/20241017-android_ab_master-v5-4-43bfcc096d95@salutedevices.com Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
| * | treewide: bcb: move ab_select command to bcb subcommandsDmitry Rokosov2024-10-2418-104/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To enhance code organization, it is beneficial to consolidate all A/B BCB management routines into a single super-command. The 'bcb' command is an excellent candidate for this purpose. This patch integrates the separate 'ab_select' command into the 'bcb' group as the 'ab_select' subcommand, maintaining the same parameter list for consistency. Signed-off-by: Dmitry Rokosov <ddrokosov@salutedevices.com> Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> # vim3_android Link: https://lore.kernel.org/r/20241017-android_ab_master-v5-3-43bfcc096d95@salutedevices.com Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
| * | cmd: bcb: rework the command to U_BOOT_LONGHELP approachDmitry Rokosov2024-10-241-108/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U_BOOT_LONGHELP and U_BOOT_CMD_WITH_SUBCMDS offer numerous advantages, including: - common argument restrictions checking - automatic subcommand matching - improved usage and help handling By utilizing the U_BOOT_LONGHELP approach, we can reduce the amount of command management code and describe commands more succinctly. Signed-off-by: Dmitry Rokosov <ddrokosov@salutedevices.com> Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> # vim3_android Link: https://lore.kernel.org/r/20241017-android_ab_master-v5-2-43bfcc096d95@salutedevices.com Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
| * | include/android_ab: move ab_select_slot() documentation to @ notationDmitry Rokosov2024-10-242-22/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are new function documentation requirements in U-Boot, so apply these changes for android_ab. Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> Reviewed-by: Simon Glass <sjg@chromium.org> Tested-by: Guillaume La Roque <glaroque@baylibre.com> Signed-off-by: Dmitry Rokosov <ddrokosov@salutedevices.com> Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> # vim3_android Link: https://lore.kernel.org/r/20241017-android_ab_master-v5-1-43bfcc096d95@salutedevices.com Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
| * | dfu: sf: rely on DT for spi speed and modeNeil Armstrong2024-10-241-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align with cmd_sf, and try to rely on DT for spi speed and mode, and still fallback on spi_flash_probe() if it fails. With the current scheme, spi_flash_probe() will be called with CONFIG_SF_DEFAULT_SPEED and CONFIG_SF_DEFAULT_MODE with are set to 0 by default on DT platforms using DM_SPI_FLASH. Like cmd_sf, keep the option to specify the speed and mode from the dfu_alt_mode string, but rely on DT properties if not specified. Using CONFIG_SF_DEFAULT_SPEED and CONFIG_SF_DEFAULT_MODE makes the SPIFC controller on Amlogic Meson G12B & SM1 hardware fail and is unable to recover until a system reboot. Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> Link: https://lore.kernel.org/r/20241001-uboot-topic-dfu-sf-dt-v2-2-67f7acfa3ff5@linaro.org Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
| * | spi: add DM_SPI_FLASH compatibility inline functionsNeil Armstrong2024-10-241-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To smoothly handle the transition from the legacy SPI FLASH API to the driver model API, add the DM functions as dummy inline functions. Today, client code uses #if/#else conditionals, but it's better to use if(IS_ENABLED()) to make sure all code builds fine and avoid configuration hell, leaving the compiler remove the dead code. An example is cmd/sf, which could make use of those dummy functions to drop the conditional compilation. Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> Link: https://lore.kernel.org/r/20241001-uboot-topic-dfu-sf-dt-v2-1-67f7acfa3ff5@linaro.org [mkorpershoek: removed duplicate "the" from commit msg] Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
* | | Mark a few functions static inlineAndy Shevchenko2024-10-241-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function prototypes that are defined in the header most likely has to be marked as static inline. This helps avoiding the compiler warnings: include/mux.h:120:14: warning: no previous prototype for ‘mux_control_states’ [-Wmissing-prototypes] include/mux.h:125:18: warning: no previous prototype for ‘mux_control_select’ [-Wmissing-prototypes] include/mux.h:133:5: warning: no previous prototype for ‘mux_control_deselect’ [-Wmissing-prototypes] include/mux.h:138:21: warning: no previous prototype for ‘mux_control_get’ [-Wmissing-prototypes] include/mux.h:143:6: warning: no previous prototype for ‘mux_control_put’ [-Wmissing-prototypes] include/mux.h:147:21: warning: no previous prototype for ‘devm_mux_control_get’ [-Wmissing-prototypes] include/mux.h:153:5: warning: no previous prototype for ‘dm_mux_init’ [-Wmissing-prototype ] Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
* | | cmd: nvedit: Mark a few functions staticAndy Shevchenko2024-10-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some functions are not used anywhere except the same file where they are defined. Mark them static. This helps avoiding the compiler warnings: cmd/nvedit.c:201:5: warning: no previous prototype for ‘do_env_ask’ [-Wmissing-prototypes] cmd/nvedit.c:315:5: warning: no previous prototype for ‘do_env_callback’ [-Wmissing-prototypes] cmd/nvedit.c:384:5: warning: no previous prototype for ‘do_env_flags’ [-Wmissing-prototype ] Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | | block: make blk_create_device() staticHeinrich Schuchardt2024-10-242-20/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are no users of the blk_create_device() function outside the uclass. Let's make it static. This will ensure that new block drivers will use blk_create_devicef(). Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> Reviewed-by: Simon Glass <sjg@chromium.org>
* | | rockchip: block: simplify rkmtd driverHeinrich Schuchardt2024-10-241-19/+2
| | | | | | | | | | | | | | | | | | | | | | | | By using blk_create_devicef() instead of blk_create_devicef() the driver can be simplified and brought into line with other block device drivers. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Tested-by: Johan Jonker <jbx6244@gmail.com>
* | | arm: dts: k3-j722s-r5-evm: Add LPDDR4 4000 MT/s configsVaishnav Achath2024-10-242-2/+2799
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add the latest 4000 MT/s DDR config generated by Jacinto7_DDRSS_RegConfigTool Rev 0.11 for J722S , make it the default config and update A53 default clock to 1.4 GHz matching the default speed grade (K). Signed-off-by: Vaishnav Achath <vaishnav.a@ti.com>
* | | boot: Introduce BOOTSTD_MENU to control bootflow menu buildMarek Vasut2024-10-243-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bootflow_menu.c code depends on e.g. scene_txt_set_font(), which is only built when CONFIG_EXPO is enabled. Introduce new Kconfig symbol BOOTSTD_MENU which depends on EXPO to prevent triggering errors like these in case e.g. CONFIG_VIDEO=n : " boot/bootflow_menu.c:158:(.text+0x8851): undefined reference to `scene_txt_set_font' " Make the symbol depend on BOOTSTD_FULL as well to get rid of the Makefile dependency workaround. Since BOOTSTD_FULL is not available in SPL, do not define SPL variant of BOOTSTD_MENU. Fix up bootflow test accordingly. Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org> Reviewed-by: Simon Glass <sjg@chromium.org>
* | | mcp230xx_gpio.c: Add a missing include file.Philip Balister2024-10-241-0/+1
| | | | | | | | | | | | | | | | | | * Fixes a warning about implicit declaration of udelay. Signed-off-by: Philip Balister <philip@balister.org>
* | | Merge https://source.denx.de/u-boot/custodians/u-boot-spiTom Rini2024-10-242-0/+36
|\ \ \ | |/ / |/| | | | | CI: https://source.denx.de/u-boot/custodians/u-boot-spi/-/pipelines/22949
| * | mtd: spi-nor: Add mt35xu01gbba octal mode SPI NOR flashHan Xu2024-10-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add SPI NOR flash id for mt35xu01gbba which supports 4 bytes address with octal mode read. Signed-off-by: Han Xu <han.xu@nxp.com> Signed-off-by: Alice Guo <alice.guo@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
| * | mtd: spi-nor-ids: Add Puya Semiconductor chips descriptionDmitry Dunaev2024-10-242-0/+35
|/ / | | | | | | | | | | | | | | | | | | Added support for the Puya Semiconductor chips. The datasheet can be found here: https://www.puyasemi.com/h_xilie715.html Signed-off-by: Dmitry Dunaev <dunaev@tecon.ru> Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
* | Merge https://source.denx.de/u-boot/custodians/u-boot-watchdogWIP/23Oct2024Tom Rini2024-10-2321-47/+225
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | CI: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=378&view=results * watchdog: gpio_wdt: add support for stoppable devices (Rasmus) * watchdog: Add DaVinci's watchdog support (Bastien) * cyclic: disentangling cyclic API from schedule() (Rasmus) * watchdog: introduce separate SPL symbol for WDT_GPIO (Rasmus)
| * | watchdog: introduce separate SPL symbol for WDT_GPIORasmus Villemoes2024-10-232-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, enabling WDT_GPIO on a board which uses SPL, but does not have SPL_WDT, SPL_DM_GPIO or SPL_OF_CONTROL enabled, breaks the build. Make it possible to use the WDT_GPIO driver on such boards by introducing a separate symbol controlling whether the driver is built for SPL. Make it default to WDT_GPIO such that boards that already have it enabled and all the SPL prerequisites satisfied will continue to have it in SPL. Signed-off-by: Rasmus Villemoes <ravi@prevas.dk> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Stefan Roese <sr@denx.de>
| * | global_data.h: remove unnecesary include of cyclic.hRasmus Villemoes2024-10-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nothing in cyclic.h is needed to define struct global_data, so do not include that header. If any .c file relies on getting cyclic.h through asm/global_data.h, it needs to include it itself. Signed-off-by: Rasmus Villemoes <ravi@prevas.dk> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Stefan Roese <sr@denx.de>
| * | boot: cedit: include u-boot/schedule.hRasmus Villemoes2024-10-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This TU currently relies on getting a declaration of schedule() through some nested include. Include the proper header directly. Signed-off-by: Rasmus Villemoes <ravi@prevas.dk> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Stefan Roese <sr@denx.de>