summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-08-05watchdog: mtk_wdt: Cosmetic cleanup of latest changesStefan Roese
This patch cleans up some coding style related issues in the mtk_wtd driver to make this driver comply again with the U-Boot coding style standards. The only minimal functional change is that the timeout parameter is now passed in (u64) instead of (unsigned int) from mtk_wdt_start() to mtk_wdt_set_timeout(), preserving the original value. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Shannon Barber <sbarber@dataspeedinc.com> Cc: Ryder Lee <ryder.lee@mediatek.com> Cc: Matthias Brugger <matthias.bgg@gmail.com> Cc: Frank Wunderlich <frank-w@public-files.de> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
2019-08-05watchdog: bcm2835_wdt: Remove unused BCM283x watchdog driver and its referencesStefan Roese
The BCM2835/2836 watchdog is not used in mainline U-Boot at all. This patch removes the driver and its references (CONFIG_BCM2835_WDT) completely. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Paolo Pisati <p.pisati@gmail.com>
2019-08-04Merge tag 'efi-2019-10-rc2' of ↵Tom Rini
https://gitlab.denx.de/u-boot/custodians/u-boot-efi Pull request for UEFI sub-system for v2019.10-rc2 With this pull request a workaround for GRUB on 32bit ARM is re-enabled and made customizable. Without the patch booting on ARM 32bit with GRUB prior to version 2.04 or with a cache which is not managed via CP15 fails. Further work will be needed to achieve a UEFI compliant cache handling. According to the UEFI spec all caches except those that cannot be managed via CP15 should be enabled. An implementation of the ConvertPointer() runtime service is provided. efi_crt0 is always rebuild to avoid having to call 'make mrproper' when switching architectures.
2019-08-02Merge https://gitlab.denx.de/u-boot/custodians/u-boot-clkTom Rini
- Port more CCF code to work with i.MX8 devices.
2019-08-02gitlab-ci: Add qemu-riscv64 testingTom Rini
Mirror the qemu-riscv64 testing we do on Travis. Update to a newer Docker image that contains riscv64-softmmu for QEMU. Signed-off-by: Tom Rini <trini@konsulko.com>
2019-08-02gitlab-ci: Remove unused TOOLCHAIN environment variableTom Rini
As part of copying the logic from Travis to GitLab I kept the TOOLCHAIN variable. However we don't use that now as the Docker container already has all toolchains so we don't need to do any downloading. Remove this variable. Signed-off-by: Tom Rini <trini@konsulko.com>
2019-08-02travis.yml: run Python tests on qemu-riscv64_defconfigHeinrich Schuchardt
Run the Python tests on the RISC-V architecture too. https://github.com/swarren/uboot-test-hooks has already been updated. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
2019-08-02Merge branch '2019-08-02-autoboot-cleanup'Tom Rini
- Merge Simon Glass's series to cleanup the autoboot code
2019-08-02autoboot: Adjust the implementation in autoboot_command()Simon Glass
Avoid use of #ifdef and keep the common condion in a variable. This makes the code easier to read. Signed-off-by: Simon Glass <sjg@chromium.org>
2019-08-02autoboot: Move a few more options from #ifdef to if()Simon Glass
Adjust some of the code which can be trivially moved to use IS_ENABLED() instead of #ifdef. Signed-off-by: Simon Glass <sjg@chromium.org>
2019-08-02autoboot: Add comments for menu_show()Simon Glass
Add comments for this function. Also remove the #ifdef around it so that it can be called from 'if (IS_ENABLED(...))'. Signed-off-by: Simon Glass <sjg@chromium.org>
2019-08-02Convert CONFIG_AUTOBOOT_MENU_SHOW to KconfigSimon Glass
This converts the following to Kconfig: CONFIG_AUTOBOOT_MENU_SHOW Signed-off-by: Simon Glass <sjg@chromium.org>
2019-08-02autoboot: Rename CONFIG_MENU_SHOW to include AUTOBOOTSimon Glass
Rename this option to CONFIG_AUTOBOOT_MENU_SHOW this it relates to the autoboot functionality. Signed-off-by: Simon Glass <sjg@chromium.org>
2019-08-02autoboot: Tidy up use of menukeySimon Glass
Move the variable to the top of the file and adjust the code which uses it to use if() rather than #ifdef, to make it easier to read. Signed-off-by: Simon Glass <sjg@chromium.org>
2019-08-02snow: Define CONFIG_AUTOBOOT_MENUKEYSimon Glass
This option is not used by any boards. To avoid needing to remove it as dead code, add it to 'snow'. Signed-off-by: Simon Glass <sjg@chromium.org>
2019-08-02autoboot: Rename CONFIG_MENUKEY to CONFIG_AUTOBOOT_MENUKEYSimon Glass
Since this is part of the autoboot functionality, it makes sense to name it with an AUTOBOOT prefix. No mainline boards use it so this should be safe, and downstream boards will need to adjust. Since this option is just an integer value, it really needs another option to control whether the feature is enabled or not. Add a new CONFIG_USE_AUTOBOOT_MENUKEY for that. This fits better with how things are done with Kconfig, avoiding the need to use a specific value to disable the feature. Signed-off-by: Simon Glass <sjg@chromium.org>
2019-08-02autoboot: Drop unused CONFIG_MENUPROMPTSimon Glass
This is not defined by any board. We could use CONFIG_AUTOBOOT_PROMPT instead perhaps, but this depends on CONFIG_AUTOBOOT_KEYED which is not used for the single-key case. So let's just remove CONFIG_MENUPROMPT. Signed-off-by: Simon Glass <sjg@chromium.org>
2019-08-02autoboot: Drop #ifdef CONFIG_AUTOBOOT_KEYEDSimon Glass
At present we have two functions named __autoboot() which do different things. This is confusing. Fix it by using if() instead of #ifdef for selecting the functions, and renaming them to meaningful names. Signed-off-by: Simon Glass <sjg@chromium.org>
2019-08-02autoboot: Use if() for CONFIG_SILENT_CONSOLESimon Glass
Avoid an #ifdef in this function, to improve readability. Signed-off-by: Simon Glass <sjg@chromium.org>
2019-08-02autoboot: Improve docs for CONFIG_AUTOBOOT_ENCRYPTIONSimon Glass
This option is not documented properly at present. Fix it. Signed-off-by: Simon Glass <sjg@chromium.org>
2019-08-02autoboot: Drop #ifdef for CONFIG_AUTOBOOT_ENCRYPTIONSimon Glass
Use if() instead for this option, renaming the two different passwd_abort() functions to indicate their purpose. Signed-off-by: Simon Glass <sjg@chromium.org>
2019-08-02autoboot: Use CONFIG_AUTOBOOT_STOP_STR_SHA256 indirectlySimon Glass
This CONFIG option is only present if CONFIG_AUTOBOOT_ENCRYPTION is enabled so it cannot be used in code without that #ifdef. But we want to reduce the use of #ifdef in this file and in particular to avoid having two different functions both named passwd_abort() but which do different things. In preparation for this, create an intermediate value which is set to an empty string if there is no value for CONFIG_AUTOBOOT_STOP_STR_SHA256. Signed-off-by: Simon Glass <sjg@chromium.org>
2019-08-02Convert CONFIG_USE_PREBOOT and CONFIG_PREBOOT to KconfigSimon Glass
This converts the following to Kconfig: CONFIG_USE_PREBOOT CONFIG_PREBOOT Both are together in one commit, since otherwise the former causes kconfig to define the latter, which gives duplicate symbol errors. Includes a manual fixup for CONFIG_PREBOOT in ids8313_defconfig since the backslash lands in the wrong place. Similarly with socfpga_vining_fpga. Signed-off-by: Simon Glass <sjg@chromium.org>
2019-08-02Add CONFIG_USE_PREBOOT to boards that use CONFIG_PREBOOTSimon Glass
In order to use CONFIG_PREBOOT with Kconfig, CONFIG_USE_PREBOOT must be defined for each board. To prepare for conversion to Kconfig, add this. Signed-off-by: Simon Glass <sjg@chromium.org>
2019-08-02Convert CONFIG_SHOW_BOOT_PROGRESS to KconfigSimon Glass
This converts the following to Kconfig: CONFIG_SHOW_BOOT_PROGRESS Signed-off-by: Simon Glass <sjg@chromium.org>
2019-08-02main: Use conditional run_preboot_environment_command()Simon Glass
The function name indicates that it does something, but its entire operation is actually condition on a CONFIG. Move the condition outside the function so this is clearer, and use if() instead of #ifdef, like the reset of the file. Signed-off-by: Simon Glass <sjg@chromium.org>
2019-07-31Merge tag 'u-boot-amlogic-20190731' of ↵Tom Rini
https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic - sync Amlogic G12A DT with linux 5.3-rc1 - add support for 4GiB DRAM memory - add support for Amlogic G12B based Odroid-N2 - small duplicate logic fix for gxbb clock driver
2019-07-31Merge branch '2019-07-31-ti-imports'Tom Rini
- Various DaVinci fixes - Migrate am335x_boneblack_vboot to use more DM drivers - Keystone updates
2019-07-31Revert "ARM: davinci: da850: Manual pinmux only when PINCTRL not available"Adam Ford
This reverts commit 877ab2423bc257045a06bc23d4b9440b82bda6fb. The above patch was designed to shrink code by only pin-muxing items needed for SPL in SPL and relying on driver model or SPL to mux other items. Unfortunately, da850evm_direct_nor doesn't use SPL so items that were only muxed during SPL are not muxed causing the board to no longer boot. Signed-off-by: Adam Ford <aford173@gmail.com>
2019-07-31nand: davinci: avoid out of bounds array accessHeinrich Schuchardt
The array bounds have to be checked before accessing the array element. Identified by cppcheck. Fixes: 67ac6ffaeefb ("mtd: nand: davinci: add opportunity to write keystone U-boot image") Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
2019-07-31ARM: da850-evm: Remove references to CONFIG_DA850_AM18X_EVMAdam Ford
With the removal of da850_am18xxevm, there is at least one whitelisted CONFIG option that can be deleted. This patch removes CONFIG_DA850_AM18X_EVM since it's not required any more Signed-off-by: Adam Ford <aford173@gmail.com>
2019-07-31ARM: dts: da850-evm: Fix MDIO pinmuxAdam Ford
In attempts to speed up SPL and reduce size, the MDIO pin muxing was inadvertently affected. Since the ethernet driver will setup the pin muxing when ethernet is loaded, this patch will also pinmux the MDIO pins at the same time. Once an DM compatible MDIO driver is available, this can be removed. Fixes: 877ab2423bc2 ("ARM: davinci: da850: Manual pinmux only when PINCTRL not available") Signed-off-by: Adam Ford <aford173@gmail.com>
2019-07-31configs: am335x_boneblack_vboot_defconfig: Add DM for SPI and Flash devicesSuniel Mahesh
This patch adds SPI and SPI_FLASH DM support for verified boot on TI AM335 chipsets. The following compile warning is removed: ===================== WARNING ====================== This board does not use CONFIG_DM_SPI_FLASH. Please update the board to use CONFIG_SPI_FLASH before the v2019.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/MIGRATION.txt for more info. ==================================================== Built and tested on AM335x device (BeagleboneBlack). Signed-off-by: Suniel Mahesh <sunil.m@techveda.org>
2019-07-31configs: am335x_boneblack_vboot_defconfig: Fix regression by enabling BLK ↵Suniel Mahesh
and DM support, disable in SPL This patch adds BLK and DM support for verified boot on TI AM335x chipsets. The following compile warnings are removed: ===================== WARNING ====================== This board does not use CONFIG_DM_MMC. Please update the board to use CONFIG_DM_MMC before the v2019.04 release. Failure to update by the deadline may result in board removal. See doc/driver-model/MIGRATION.txt for more info. ==================================================== ===================== WARNING ====================== This board does not use CONFIG_DM_USB. Please update the board to use CONFIG_DM_USB before the v2019.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/MIGRATION.txt for more info. ==================================================== BLK and DM_MMC are enabled by default in SPL as well, which is making the build to break with an overflow(spl image doesn't fit into SRAM because of size constraints). LD spl/drivers/built-in.o LD spl/u-boot-spl arm-linux-ld.bfd: u-boot-spl section .u_boot_list will not fit in region .sram arm-linux-ld.bfd: region .sram overflowed by 116 bytes make[1]: *** [spl/u-boot-spl] Error 1 make: *** [spl/u-boot-spl] Error 2 For the above reason BLK and DM_MMC is disabled in SPL. Built and tested on AM335x device (BeagleboneBlack). Signed-off-by: Suniel Mahesh <sunil.m@techveda.org>
2019-07-31configs: j721e_evm_a72: Disable K3_SYSTEM_CONTROLLERSuman Anna
The K3 System Controller driver is used for loading and starting the System Firmware, and is used only on R5 SPL. It need not be enabled and built for the A72 U-Boot and SPL, so disable it from the j721e_evm_a72 defconfig. While at this, also remove the unneeded CONFIG_SPL_REMOTEPROC and CONFIG_CMD_REMOTEPROC as no remoteprocs are now loaded from A72 SPL. Signed-off-by: Suman Anna <s-anna@ti.com>
2019-07-31configs: am65x_evm_a53: Disable K3_SYSTEM_CONTROLLERSuman Anna
The K3 System Controller driver is used for loading and starting the System Firmware, and is used only on R5 SPL. It need not be enabled and built for the A53 U-Boot and SPL, so disable it from both the GP and HS AM65x A53 defconfigs. While at this, also remove the unneeded CONFIG_SPL_REMOTEPROC and CONFIG_CMD_REMOTEPROC as no remoteprocs are now loaded from A53 SPL. Signed-off-by: Suman Anna <s-anna@ti.com> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
2019-07-31arm: dts: k3-am654-base-board: Fix cpsw_nuss power-domains propertySuman Anna
The commit 355be915ed08 ("arm: dts: k3-am654: Update power-domains property for each node") has updated the power-domain cells value and updated power-domains property in various existing dts nodes but missed updating the cpsw_nuss node. This results in the following build warning, fix this. arch/arm/dts/k3-am654-base-board.dtb: Warning (power_domains_property): /interconnect@100000/interconnect@28380000/cpsw_nuss@046000000:power-domains: property size (8) too small for cell size 2 arch/arm/dts/k3-am654-r5-base-board.dtb: Warning (power_domains_property): /interconnect@100000/interconnect@28380000/cpsw_nuss@046000000:power-domains: property size (8) too small for cell size 2 Fixes: 355be915ed08 ("arm: dts: k3-am654: Update power-domains property for each node") Signed-off-by: Suman Anna <s-anna@ti.com> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
2019-07-31ARM: da850-evm: Replace CMD_SF with CMD_MTDAdam Ford
This patch enables MTD and CMD_MTD and it works with SPI NOR, so the older CMD_SF can be removed. Signed-off-by: Adam Ford <aford173@gmail.com>
2019-07-31ARM: da850evm: Split MTDPARTS into SPL and u-bootAdam Ford
The MTDPARTS currently lists just u-boot.ais as 512k in size. This works when loading the ais file via serial port, but if one wanted to update just the u-boot portion, it's not really possible. This patch splits the MTDPARTS into a 32k SPL partiion and a 480k u-boot partition which allows u-boot.img to be burned to the u-boot partition. The remaining partitions are left with the same sizes and offsets to not break backwards compatibility. Signed-off-by: Adam Ford <aford173@gmail.com>
2019-07-31configs: am57xx_evm_defconfig: Enable 'dtimg' commandSam Protsenko
We are going to implement DTBO partition for BeagleBoard X15 further. To support this, 'dtimg' command must be enabled. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
2019-07-31configs: am57xx_evm_defconfig: Enable 'bcb' commandSam Protsenko
It is essential to have an access to BCB area of 'misc' partition on Android devices [1]. For BeagleBoard X15 the 'bcb' command will be further used for reboot reason implementation and booting to recovery. It can be also used for debugging reasons, like checking RescueParty messages in BCB area. [1] doc/android/bcb.txt Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
2019-07-31omap: Correct the fastboot product varSam Protsenko
"fastboot flashall" expects "fastboot getvar product" value to be one of values provided in android-info.txt file (in AOSP), from "require board=" list. Before this patch, "am57xx" is returned for all AM57xx based boards, as it's set in $board env var from SYS_BOARD in board/ti/am57xx/Kconfig file, which is used for default implementation of "fastboot getvar product". In order to fix that inconsistency, let's do next: 1. In U-Boot: override fastboot.product, reusing the value from $board_name 2. In AOSP: provide values for all AM57xx boards we can use to device/ti/beagle_x15/board-info.txt file This way requirements check in "fastboot flashall" will work as expected, verifying that user tries to flash images to the board which those images were built for. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> Acked-by: Andrew F. Davis <afd@ti.com>
2019-07-31env: ti: boot: Handle reboot reason from BCBSam Protsenko
In case of Android boot, reboot reason can be written into BCB (usually it's an area in 'misc' partition). U-Boot then can obtain that reboot reason from BCB and handle it accordingly to achieve correct Android boot flow, like it was suggested in [1]: - if it's empty: perform normal Android boot from eMMC - if it contains "bootonce-bootloader": get into fastboot mode - if it contains "boot-recovery": perform recovery boot The latter is not implemented yet, as it depends on some features that are not implemented on TI platforms yet (in AOSP and in U-Boot). [1] https://marc.info/?l=u-boot&m=152508418909737&w=2 Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
2019-07-31Merge tag 'mmc-7-31' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmcTom Rini
A new mmc/sd block test case Bug fixes for sdhci and mv_sdhci
2019-07-31clk: meson: remove duplicate logicHeinrich Schuchardt
First thing we check in meson_clk_set_rate_by_id() is current_rate == rate. There is not need to check it again. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Acked-by: Neil Armstrong <narmstrong@baylibre.com> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
2019-07-31board: amlogic: add support for Odroid-N2Neil Armstrong
ODROID-N2 is a single board computer manufactured by Hardkernel Co. Ltd with the following specifications: - Amlogic S922X ARM Cortex-A53 dual-core + Cortex-A73 quad-core SoC - 4GB DDR4 SDRAM - Gigabit Ethernet - HDMI 2.1 4K/60Hz display - 40-pin GPIO header - 4 x USB 3.0 Host, 1 x USB OTG - eMMC, microSD - Infrared receiver The board directory is W400, the name of the Amlogic Reference Design of Amlogic G12B with Gigabit boards, which will be used for similar boards. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Tested-by: Mark Kettenis <kettenis@openbsd.org>
2019-07-31ARM: meson-g12a: Handle 4GiB DRAM sizeNeil Armstrong
When configured with 4GiB DRAM size, only 3.8GiB is available, the I/O beeing mapped in the last 256MiB of the first 4GiB physical memory/ First fixup the mm_region to handle the first 3.8GiB as memory and the last 256MiB as I/O. Then limit the real memory reported by the firmware to the available physical space, 3.8GiB aligned with the mm_region memory zone size. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Tested-by: Mark Kettenis <kettenis@openbsd.org>
2019-07-31ARM: dts: add support for Odroid-N2Neil Armstrong
Import HardKernel Odroid-N2 DT from Linux 5.3-rc1, commit 5f9e832c1370 ("Linus 5.3-rc1") based on an Amlogic G12B S922X SoC. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Tested-by: Mark Kettenis <kettenis@openbsd.org>
2019-07-31ARM: dts: Sync Amlogic G12A with Linux 5.3-rc1Neil Armstrong
Sync the Amlogic Meson G12A DT and Bindings file with the Linux 5.3-rc1 from the commit 5f9e832c1370 ("Linus 5.3-rc1"). Also remove the meson-g12a-u-boot.dtsi and meson-g12a-u200-u-boot.dtsi, now conflicting with the main DT content. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Tested-by: Mark Kettenis <kettenis@openbsd.org>
2019-07-31mmc: relocate code commentBaruch Siach
The comment about init op being NULL used to be next to the NULL check code. Commit 8ca51e51c182 ("dm: mmc: Add a way to use driver model for MMC operations") separated the comment from the code. Put them back together. Fixes: 8ca51e51c182 ("dm: mmc: Add a way to use driver model for MMC operations") Signed-off-by: Baruch Siach <baruch@tkos.co.il> Reviewed-by: Peng Fan <peng.fan@nxp.com>
generated by cgit (git 2.34.1) at 2024-12-28 22:00:17 +0000