summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-01-11makefile: add multi_dtb_fit depNeal Frager
With certain gcc compilers, the u-boot.itb is built immediately after dtb generation. If CONFIG_MULTI_DTB_FIT is used, it is possible that the fit-dtb.blob is not finished in time. This patch adds a necessary dependency to guarantee that the fit-dtb.blob is built before attempting to build the u-boot.itb. Signed-off-by: Neal Frager <[email protected]> Reviewed-by: Simon Glass <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Michal Simek <[email protected]>
2023-01-11arm64: zynqmp: remove Avnet UltraZed-EV Starter KitLuca Ceresoli
Nobody seems interested and able to keep this board supported, and xilinx_zynqmp_virt_defconfig is supposed to be enough for any zynqmp board. See the discussion at: https://lore.kernel.org/u-boot/CAPnjgZ3hHbyiFf=_Lp-Wz_XOWBkV-3vK4Q3xp=7bcERw-spNpA@mail.gmail.com/T/#m76d726f1ab3f7074c8105c9a2af2110ac7d18708 Signed-off-by: Luca Ceresoli <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Michal Simek <[email protected]>
2023-01-10Merge branch '2023-01-10-platform-updates'Tom Rini
- Platform updates for TI, nuvoton pinctrl, starqltechn/sdm845 fixes, and assorted platform CONFIG_BUILD_TARGET corrections
2023-01-10ARM: omap3: evm: Name this directory omap3evmAndrew Davis
Before this was named just evm, which doesn't match the naming of the other TI board file directory and makes it look like a common directory for evms. Name this omap3evm. Signed-off-by: Andrew Davis <[email protected]> Reviewed-by: Derald Woods <[email protected]>
2023-01-10powerpc/mpc85xx: Unset CONFIG_SPL_TARGET="u-boot-with-spl.bin"Pali Rohár
CONFIG_SPL_TARGET should specify additional SPL make target. But u-boot-with-spl.bin is final U-Boot binary, not SPL binary in some custom format. Moreover u-boot-with-spl.bin is already set in CONFIG_BUILD_TARGET, so make will build it by default. Signed-off-by: Pali Rohár <[email protected]>
2023-01-10powerpc/mpc85xx: Set default CONFIG_BUILD_TARGETPali Rohár
Final U-Boot binary for mpc85xx boards which use SPL and are not PBL-based based is u-boot-with-spl.bin. PBL is not used only on boards with e500v1 and e500v2 cores. Apparently CONFIG_E500 is set not only for e500 cores, but also for all other mpc85xx cores e500mc, e5500 and e5600. So do not use CONFIG_E500 and instead filter new cores with PBL based bootrom. Signed-off-by: Pali Rohár <[email protected]>
2023-01-10arm: mvebu: Fix default CONFIG_BUILD_TARGETPali Rohár
u-boot-with-spl.kwb is built only for SPL enabled 32-bit armada boards. u-boot.kwb is built for 32-bit armada and kirkwood boards but only for non-SPL targets. So replace CONFIG_ARCH_MVEBU by CONFIG_ARMADA_32BIT (it implies CONFIG_ARCH_MVEBU) for u-boot-with-spl.kwb. And add additional CONFIG_ARMADA_32BIT && !CONFIG_SPL for u-boot.kwb. Signed-off-by: Pali Rohár <[email protected]>
2023-01-10SoC: sdm845: find and save KASLR to env variablesDzmitry Sankouski
KASLR address is needed to boot fully functional Android. KASLR is set by primary bootloader, and since u-boot is used as a secondary bootloader(replacing kernel) on sdm845 platform, KASLR may be found by comparing memory chunks at relocaddr over supposed KASLR range. Signed-off-by: Dzmitry Sankouski <[email protected]> Reviewed-by: Ramon Fried <[email protected]>
2023-01-10board: starqltechn: enable serial consoleDzmitry Sankouski
It was temporary disabled due to problem with boot. Issue was fixed in commit f5ed6c9ccf3e ("uart: sdm845: Fix debug UART pinmux") Signed-off-by: Dzmitry Sankouski <[email protected]>
2023-01-10configs: am62a: use kernel fitImage when using secure bootflowBryan Brattlof
In order to maintain the chain of trust, each stage of the boot process will first authenticate each binary it loads before continuing. To extend this to the kernal and its dtbs we can package the kernal and its dtbs into another fitImage for Uboot to authenticate and extend the chain of trust all the way to the kernel. When 'boot_fit' is set, indicating we're using the secure bootflow, look for and authenticate the kernel's fitImage. Signed-off-by: Judith Mendez <[email protected]> Signed-off-by: Bryan Brattlof <[email protected]>
2023-01-10configs: am62a: convert bootcmd to distro_bootcmdBryan Brattlof
We're currently using CONFIG_BOOTCOMMAND to run custom boot scripts to jump into linux. While this works, let's begin the transition to more distribution friendly jumps to linux by enabling distro_bootcmd. Convert the custom bootcmd to a distro_bootcmd Signed-off-by: Judith Mendez <[email protected]> Signed-off-by: Bryan Brattlof <[email protected]>
2023-01-10arm: mach-k3: copy bootindex to OCRAM for main domain SPLBryan Brattlof
Texas Instruments has begun enabling security settings on the SoCs it produces to instruct ROM and TIFS to begin protecting the Security Management Subsystem (SMS) from other binaries we load into the chip by default. One way ROM and TIFS do this is by enabling firewalls to protect the OCSRAM and HSM RAM regions they're using during bootup. The HSM RAM the wakeup SPL is in is firewalled by TIFS to protect itself from the main domain applications. This means the 'bootindex' value in HSM RAM, left by ROM to indicate if we're using the primary or secondary boot-method, must be moved to OCSRAM (that TIFS has open for us) before we make the jump to the main domain so the main domain's bootloaders can keep access to this information. Signed-off-by: Bryan Brattlof <[email protected]>
2023-01-10configs: am62a: move stack and heap to HSM RAMBryan Brattlof
Texas Instruments has begun enabling security setting on the SoCs they produce to instruct ROM and TIFS to begin protecting the Security Management Subsystem (SMS) from other binaries we load into the chip by default. One way ROM does this is by enabling firewalls to protect the OCSRAM region it's using during bootup. Only after TIFS has started (and had time to disable the OCSRAM firewall region) will we have write access to the region. This means we will need to move the stack & heap from OCSRAM to HSM RAM and reduce the size of BSS and the SPL to allow it to fit properly. Signed-off-by: Bryan Brattlof <[email protected]>
2023-01-10configs: restrict am62ax wakup SPL sizeBryan Brattlof
In its current form, the am62a's wakeup SPL is fairly small, however this will not remain as more boot modes are eventually added. To protect us from overflowing our ~256k of HSM SRAM, add limits and check during the wakeup SPL build. Signed-off-by: Bryan Brattlof <[email protected]>
2023-01-10configs: Enable distroboot on am625Martyn Welch
TI boards use a custom (though faily common to TI boards) mechanism for booting Linux. We would like to use the "distroboot" approach. Enable distroboot as a further option to use for booting on am625 should the existing options fail. Signed-off-by: Martyn Welch <[email protected]>
2023-01-10arm64:mach-k3 am625_init: Correct boot mode detectionMartyn Welch
The boot mode detection assumes that BOOT_DEVICE_MMC2 should always result in MMCSD_MODE_FS, but MMCSD_MODE_RAW is also a valid option for this port. The current logic also avoids looking at the bootmode pin strapping, which should be the primary means of determining whether a device is being booted in MMCSD_MODE_EMMCBOOT mode. Switch around the logic to check the boot mode to determine whether the eMMC boot mode is expected or MMC/SD boot mode. From there we can look at the boot mode config if in MMC/SD boot mode to determine whether to attempt RAW or FS based booting. This change allows U-Boot to also be successfully booted from RAW offsets in addition to from a filesystem. Signed-off-by: Martyn Welch <[email protected]>
2023-01-10configs: am62x_evm_a53: Enable ethernetSjoerd Simons
Enable ethernet support for u-boot on am62x evm Signed-off-by: Sjoerd Simons <[email protected]>
2023-01-10arm: dts: k3-am625-sk: Enable first ethernet portSjoerd Simons
The K3 am625 sk EVM has two ethernet ports; Enable the first one for usage in u-boot. Signed-off-by: Sjoerd Simons <[email protected]>
2023-01-10configs: am62x_evm_*: Run savedefconfigSjoerd Simons
Clean configuration for am62x_evm using savedefconfig Signed-off-by: Sjoerd Simons <[email protected]> Tested-by: Dhruva Gole <[email protected]>
2023-01-10configs: am62x_evm_*: Correct SPI configuration optionSjoerd Simons
In f422c4bec the configuration option to support s28hs512t SPI flashes was changed from CONFIG_SPI_FLASH_S28HS512T to CONFIG_SPI_FLASH_S28HX_T to support the wider family. Follow this change in the AM62x EVM configurations. Signed-off-by: Sjoerd Simons <[email protected]> Reviewed-by: Dhruva Gole <[email protected]>
2023-01-10pinctrl: nuvoton: add NPCM7xx/NPCM8xx reset type detectJim Liu
add reset type detect and persist setting. Signed-off-by: Jim Liu <[email protected]>
2023-01-10Merge branch '2023-01-10-env-mmc-improvements-and-corrections'Tom Rini
To quote the author: Update in U-Boot env mmc backend with several cosmetic changes or corrections and 2 new features: 1/ CONFIG_ENV_MMC_USE_DT = no more use CONFIG_ENV_OFFSET in the mmc ENV backend when this config is activated. Requested by the STM32MP STMicroelectronics boards which activate several ENV_IS_IN_XXX; the value of CONFIG_ENV_OFFSET is invalid for SD-Card / eMMC boot; this offset should only used in SPIFlash backend (sf.c) for SPI-NOR boot. If this offset is used on mmc backend, when partition name in GPT is not aligned with U-Boot DT: "u-boot,mmc-env-partition", the behavior is difficult to debug: a partition is corrupted on 'env save' command. 2/ selects the GPT env partition by the "u-boot-env" type GUID introduced by the commit c0364ce1c695 ("doc/README.gpt: define partition type GUID for U-Boot environment") This feature can also avoid issue when 'u-boot-env' partition name change in GPT partitioning but not in the U-Boot DT with "u-boot,mmc-env-partition"
2023-01-10env: mmc: cosmetic: remove unused macro STR(X)Patrick Delaunay
Remove the unused macro STR(X) since the commit 2b2f727500dc ("env: mmc: allow support of mmc_get_env_dev with OF_CONTROL") Signed-off-by: Patrick Delaunay <[email protected]> Reviewed-by: Patrice Chotard <[email protected]>
2023-01-10env: mmc: add debug message when mmc-env-partition is not foundPatrick Delaunay
Add a debug message to indicate a potential issue when "u-boot,mmc-env-partition" is present in config node of device tree but this partition name is not found in the mmc device. Signed-off-by: Patrick Delaunay <[email protected]> Reviewed-by: Patrice Chotard <[email protected]>
2023-01-10env: mmc: select GPT env partition by type guidPatrick Delaunay
Since commit c0364ce1c695 ("doc/README.gpt: define partition type GUID for U-Boot environment"), a specific type GUID can be used to indicate the U-Boot environment partition on the device with GPT partition table. This patch uses this type GUID to found the env partition as fallback when the partition name property "u-boot,mmc-env-partition" is not present in config node or if the indicated partition name is not found. The mmc_offset_try_partition() function is reused, it selects the first partition with the correct type GUID when the parameter 'str' is NULL. Signed-off-by: Patrick Delaunay <[email protected]> Reviewed-by: Patrice Chotard <[email protected]>
2023-01-10configs: stm32mp: activate CONFIG_ENV_MMC_USE_DTPatrick Delaunay
Activate by default CONFIG_ENV_MMC_USE_DT as "u-boot,mmc-env-partition" should be always use in STMicroelectronics boards device tree to locate the environment for mmc backend. The 2 defines: CONFIG_ENV_OFFSET=0x280000 CONFIG_ENV_OFFSET_REDUND=0x2C0000 are only valid for spi-nor and not for SD-Card or eMMC. Signed-off-by: Patrick Delaunay <[email protected]> Reviewed-by: Patrice Chotard <[email protected]>
2023-01-10env: mmc: add CONFIG_ENV_MMC_USE_DTPatrick Delaunay
Add a new config CONFIG_ENV_MMC_USE_DT to force configuration of the U-Boot environment offset with device tree config node. This patch avoids issues when several CONFIG_ENV_IS_IN_XXX are activated, the defconfig file uses the same value for CONFIG_ENV_OFFSET or CONFIG_ENV_OFFSET_REDUND for the several ENV backends (SPI_FLASH, EEPROM NAND, SATA, MMC). After this patch a bad offset value is not possible when the selected partition in device tree is not found. Signed-off-by: Patrick Delaunay <[email protected]> Reviewed-by: Patrice Chotard <[email protected]>
2023-01-10env: mcc: fix compilation error with ENV_IS_EMBEDDEDPatrick Delaunay
When ENV_IS_EMBEDDED is enabled, ret is not defined but is used as a return value in env_mmc_load(). This patch correct this issue and simplify the existing code, test only one time #if defined(ENV_IS_EMBEDDED) and not in the function. Signed-off-by: Patrick Delaunay <[email protected]> Reviewed-by: Patrice Chotard <[email protected]>
2023-01-10env: mcc: Drop unnecessary #ifdefsPatrick Delaunay
This file has a lot of conditional code and much of it is unnecessary. Clean this up to reduce the number of build combinations. This patch replaces the test on CONFIG_ENV_OFFSET_REDUND for the more coherent CONFIG_SYS_REDUNDAND_ENVIRONMENT. This patch also corrects a compilation issue in init_mmc_for_env() when CONFIG_SYS_MMC_ENV_PART is not activated, env_mmc_orig_hwpart is not defined. Signed-off-by: Patrick Delaunay <[email protected]> Reviewed-by: Patrice Chotard <[email protected]>
2023-01-10env: mmc: introduced ENV_MMC_OFFSETPatrick Delaunay
Introduce ENV_MMC_OFFSET defines. It is a preliminary step to the next patches to simplify the code. Signed-off-by: Patrick Delaunay <[email protected]> Reviewed-by: Patrice Chotard <[email protected]>
2023-01-10doc/usage: cmd: documentation for meson/sm commandAlexey Romanov
Added docs for Meson Security Monitor command. Signed-off-by: Alexey Romanov <[email protected]> Reviewed-by: Mattijs Korpershoek <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Neil Armstrong <[email protected]>
2023-01-10arm/mach-meson: move smc commands in cmd/mesonAlexey Romanov
It is incorrect to keep commands in the arch/ folder. Signed-off-by: Alexey Romanov <[email protected]> Reviewed-by: Mattijs Korpershoek <[email protected]> Reviewed-by: Neil Armstrong <[email protected]> Link: https://lore.kernel.org/r/[email protected] [narmstrong: moved after cmd/sound in index.rst] Signed-off-by: Neil Armstrong <[email protected]>
2023-01-10asm/arch-meson: add missing meson_sm_write_efuse signatureAlexey Romanov
This function can be used by other modules. Also add comments. Signed-off-by: Alexey Romanov <[email protected]> Reviewed-by: Neil Armstrong <[email protected]> Reviewed-by: Mattijs Korpershoek <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Neil Armstrong <[email protected]>
2023-01-10board: amlogic: jethub j100: add rescue boot from microSDViacheslav Bocharov
The new JetHub D1+ has a microSD slot. Add rescue boot from microSD Signed-off-by: Viacheslav Bocharov <[email protected]> Reviewed-by: Neil Armstrong <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Neil Armstrong <[email protected]>
2023-01-10xilinx: versal: enable gigadeviceVictor Lim
enabling gigadevice in the related files Signed-off-by: Victor Lim <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Michal Simek <[email protected]>
2023-01-10arm64: zynqmp: enable gigadeviceVictor Lim
enabling gigadevice in the related files Signed-off-by: Victor Lim <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Michal Simek <[email protected]>
2023-01-10configs: zynq: enable gigadeviceVictor Lim
enabling gigadevice in the related files Signed-off-by: Victor Lim <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Michal Simek <[email protected]>
2023-01-10mtd: spi-nor-ids: add gigadevice part #Victor Lim
adding gigadevice part numbers Signed-off-by: Victor Lim <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Michal Simek <[email protected]>
2023-01-10arm64: zynqmp: Remove unused snps,refclk_fladj propertyMichal Simek
The commit c55ac51a550c ("usb: dwc3: Program GFLADJ") hopefully fixed issues around fladj logic. This DT property was used in Xilinx stack only that's why remove because it is not needed anymore. Signed-off-by: Michal Simek <[email protected]> Link: https://lore.kernel.org/r/9bdbd1156b19e28cdebeca29149268b0579a8b6a.1670855257.git.michal.simek@amd.com
2023-01-10arm64: zynqmp: Enable TI phy reset via GPIOHarini Katakam
Add DT property to support reset of TI PHY connected to GEM. This is present in RevA DT but needs to be extended RevB/1.0/1.1 versions which are built on top. Fixes: 2b1db7b18c97 ("arm64: zynqmp: Wire GEM reset gpio") Signed-off-by: Harini Katakam <[email protected]> Signed-off-by: Michal Simek <[email protected]> Link: https://lore.kernel.org/r/7b093616ddea269043cbbb1e3806644d5a4b23be.1670854455.git.michal.simek@amd.com
2023-01-10arm64: zynqmp: Describe TI phy as ethernet phy ID on ZCU102 RevB & upHarini Katakam
TI phy requires a reset before PHY address detection to make sure correct strapping via MIO is detected. Facilitate the same using ethernet-phy-id compatible string. GPIO reset entry will be added in a separate commit. This support is present in RevA but needs to be extended to RevB/1.0/1.1 versions which are built on top. Fixes: 13622c7a9dfa ("arm64: zynqmp: Describe TI phy as ethernet-phy-id") Signed-off-by: Harini Katakam <[email protected]> Signed-off-by: Michal Simek <[email protected]> Link: https://lore.kernel.org/r/6d500a83a787316353d4b26c75d1b51d29e3730e.1670854455.git.michal.simek@amd.com
2023-01-10arm64: zynqmp: Remove unused USB DT propertiesMichal Simek
xlnx,usb-polarity, xlnx,usb-reset-mode and snps,mask_phy_reset are not documented in dt binding and also there is no code associated with them that's why remove them. Signed-off-by: Michal Simek <[email protected]> Link: https://lore.kernel.org/r/369139fafa1745252ef687e31aebf6bcc2080a32.1670853972.git.michal.simek@amd.com
2023-01-10net: zynq_gem: Add support for new compatible str with xlnx prefixMichal Simek
cdns prefix was deprecated and replaced by xlnx one. Acked-by: Krzysztof Kozlowski <[email protected]> Signed-off-by: Michal Simek <[email protected]> Link: https://lore.kernel.org/r/7d1312d741349451b36558baa3e9132247303992.1670599167.git.michal.simek@amd.com
2023-01-10arm64: zynqmp: Remove id from usb node nameMichal Simek
There is no reason to have number in usb node name. This is also sync up patch with upstream kernel. Signed-off-by: Michal Simek <[email protected]> Link: https://lore.kernel.org/r/7b13db34031af88a5738d2ec2e05d2498ea8c869.1670590595.git.michal.simek@amd.com
2023-01-10arm64: zynqmp: Align gpio-key node names with dtschemaMichal Simek
The node names should be generic and DT schema expects certain pattern (e.g. with key/button/switch). It is based on kernel commit (228e8a88b1915a2b467c83d8d0976605f1272fae). Signed-off-by: Michal Simek <[email protected]> Link: https://lore.kernel.org/r/ae23999097553acb21dfca9288a913bb8b24587a.1670590595.git.michal.simek@amd.com
2023-01-10arm64: zynqmp: Fix AMS device tree nodeMichal Simek
Aligned node description with the Linux kernel. Node has been added by kernel commit (271c1fa01c2307cf74f4656390d6299991119c3e). Signed-off-by: Robert Hancock <[email protected]> Signed-off-by: Michal Simek <[email protected]> Signed-off-by: Michal Simek <[email protected]> Link: https://lore.kernel.org/r/74188b64cf615100345d058e026cb0d2de0e089b.1670590595.git.michal.simek@amd.com
2023-01-10arm64: zynqmp: Added GEM reset definitionsMichal Simek
The Cadence GEM/MACB driver now utilizes the platform-level reset on the ZynqMP platform. Add reset definitions to the ZynqMP platform device tree to allow this to be used. Linux upstream commit (e461bd6f43f4e568f7436a8b6bc21c4ce6914c36). Signed-off-by: Robert Hancock <[email protected]> Signed-off-by: Michal Simek <[email protected]> Link: https://lore.kernel.org/r/14e3637735dbc626659e96d142f04a63398362f8.1670590595.git.michal.simek@amd.com
2023-01-10arm64: zynqmp: Sync #dma-cells property locationMichal Simek
Sync property location with Linux kernel done by Linux commit (1ff2d58e60c8093e9be935b1f191341c0cda957a). Signed-off-by: Michal Simek <[email protected]> Link: https://lore.kernel.org/r/e09ad90ea610a81528ef5ecbc931bc9791b1c653.1670590595.git.michal.simek@amd.com
2023-01-09ns16650: Correct CONFIG_SYS_NS16550_MEM32 platformsTom Rini
There are currently no platform that are both CONFIG_SYS_NS16550_MEM32 and not (per how the logic was prior to being broken in 0478dac62a9a ("kbuild: Remove uncmd_spl logic")) enabled in CONFIG_DM_SERIAL. We drop this line out now so that platforms which do use CONFIG_SYS_NS16550_MEM32 and depending on stage may or may not have DM_SERIAL set. Fixes: 0478dac62a9a ("kbuild: Remove uncmd_spl logic") Reported-by: Quentin Schulz <[email protected]> Signed-off-by: Tom Rini <[email protected]> Tested-by: Quentin Schulz <[email protected]> #on Ringneck PX30, Puma RK3399
2023-01-09Merge branch 'next'Tom Rini
Signed-off-by: Tom Rini <[email protected]>