AgeCommit message (Collapse)AuthorFilesLines
2020-03-28ODROID-COMMON: add to run TravisCI for ODROID-C2/XU4travis/odroidxu3-108travis/odroidc2-108u-boot_v2020.01Dongjin Kim2-515/+51
Change-Id: I9e9024fd32459a44cdbfc990260ab3140054534f Signed-off-by: Dongjin Kim <>
2020-03-28ODROID-C2: add buid package <fip_crate/amlbootsig> with bootstrap firmwareDongjin Kim29-0/+2024
Change-Id: I4fd350871c0a55d6bb4faf5df059617673fcd50d Signed-off-by: Dongjin Kim <>
2020-03-28ODROID-XU4: fix to build only for ODROIDDongjin Kim6-0/+107
Change-Id: I652337824d250d0dd04a92ee0b1d22abdfad2d08 Signed-off-by: Dongjin Kim <>
2020-03-28ODROID-XU3: add 'CONFIG_OF_LIBFDT_OVERLAY' and 'CONFIG_CMD_INI'Dongjin Kim2-0/+7
Change-Id: I09c9031be4c5257c415f54575e23a6dade179abb Signed-off-by: Dongjin Kim <>
2020-03-28ODROID-XU4: fix boot order by boot select switchDongjin Kim1-0/+6
Change-Id: I1485adb2a1d3ef495a46ef24ab0a5da14de465d4 Signed-off-by: Dongjin Kim <>
2020-03-28ODROID-XU4: fix up reading board revision by ADCDongjin Kim1-2/+2
Change-Id: I07f68576ad64640871467382d34de7e6b96541ec Signed-off-by: Dongjin Kim <>
2020-01-06Prepare v2020.01Tom Rini1-1/+1
Signed-off-by: Tom Rini <>
2020-01-04Revert "mmc: davinci: drop struct davinci_mmc_plat"Tom Rini1-5/+11
Adam Ford reports that this change breaks booting on da850-evm and Bartosz Golaszewski agrees that with the impending release we should revert the change for now. With that noted: This reverts commit 21a4d80a710c79053ac1deaa65ff9b69e6c031d4. Cc: Bartosz Golaszewski <> Tested-by: Adam Ford <> Signed-off-by: Tom Rini <>
2020-01-03Merge branch '2020-01-03-master-imports'Tom Rini7-4/+34
- Fixes for host tools with musl C library - Two fixes for TI K3 platforms
2020-01-03arm: mach-k3: Enable WA for R5F deadlockLokesh Vutla4-0/+28
On K3 devices there are 2 conditions where R5F can deadlock: 1.When software is performing series of store operations to cacheable write back/write allocate memory region and later on software execute barrier operation (DSB or DMB). R5F may hang at the barrier instruction. 2.When software is performing a mix of load and store operations within a tight loop and store operations are all writing to cacheable write back/write allocates memory regions, R5F may hang at one of the load instruction. To avoid the above two conditions disable linefill optimization inside Cortex R5F which will make R5F to only issue up to 2 cache line fills at any point of time. Signed-off-by: Lokesh Vutla <>
2020-01-03arm: dts: k3-j721e: ddr: Update to 0.2 version of DDR config toolLokesh Vutla1-3/+3
Update the ddr settings to use the DDR reg config tool rev 0.2.0. This reduces the aging count(in DDRSS_CTL_274_DATA reg) to 15 in-order to avoid DSS underflow errors. Signed-off-by: Lokesh Vutla <> Signed-off-by: Kevin Scholz <>
2020-01-03include/u-boot/crc.h: pull 'uint' definition on musl targetsSergei Trofimovich1-0/+2
The build failure was originally reported on arm64-musl target at Here is the amd64-musl variant: ``` $ LANG=C make CROSS_COMPILE=x86_64-gentoo-linux-musl- tools-only_defconfig -j$(nproc) $ LANG=C make CROSS_COMPILE=x86_64-gentoo-linux-musl- tools-all -j$(nproc) ... include/u-boot/crc.h:37:44: error: unknown type name 'uint'; did you mean 'int'? 37 | void crc16_ccitt_wd_buf(const uint8_t *in, uint len, | ^~~~ | int ``` Note: 'uint' is not defined there. On glibc 'uint' comes from <sys/types.h> and happens to work on most .c files. The change imports 'uint' declaration from '<compiler.h>'. Bug: Signed-off-by: Sergei Trofimovich <>
2020-01-03include: fix 'ulong' definition on musl targetsSergei Trofimovich1-1/+1
The build failure was originally reported on arm64-musl target at Here is the amd64-musl variant: ``` $ LANG=C make CROSS_COMPILE=x86_64-gentoo-linux-musl- tools-only_defconfig -j$(nproc) $ LANG=C make CROSS_COMPILE=x86_64-gentoo-linux-musl- tools-all -j$(nproc) ... In file included from tools/env/../../env/flags.c:7, from tools/env/env_flags.c:1: include/env.h:159:1: error: unknown type name 'ulong'; did you mean 'long'? 159 | ulong env_get_ulong(const char *name, int base, ulong default_val); | ^~~~~ | long ``` Note: 'ulong' is not defined there. On glibc 'ulong' comes from <sys/types.h>: ```c /* Old compatibility names for C types. */ typedef unsigned long int ulong; ``` On musl it comes from <sys/types.h> as well but from under different guards: ```c typedef unsigned long u_long, ulong; ``` The change inlines 'ulong' define similar to 'uint' define. Bug: Signed-off-by: Sergei Trofimovich <>
2020-01-03Merge tag 'fixes-v2020.01' of ↵Tom Rini6-275/+257 - fix missing graphics output on some x86 boards - avoid using #ifdef in video code - add .gitignore for video font *.S files
2020-01-02video: add wrappers for ttf type files to .gitignoreDario Binacchi1-0/+1
The scripts/Makefile.lib generates an assembler file (*.S) to wrap the font data for each file of type ttf defined in Kconfig. Signed-off-by: Dario Binacchi <>
2020-01-02Merge tag 'u-boot-rockchip-20191231' of ↵Tom Rini20-132/+897 - Fix latest mainline kernel for rk3308 - Update rk3288-evb config to suport OP-TEE - Fix for firefly-px30 DEBUG_UART channel and make it standalone - Script make_fit_atf add python3 support - Fix rk3328 timer with correct COUNTER_FREQUENCY - Fix rk3328 ATF support with enable spl-fifo-mode
2020-01-02Merge branch '2020-01-02-master-imports'Tom Rini6-28/+31
- Assorted fixes - Other minor changes
2020-01-02test: Fix the boardspec for the SPL handoff testSimon Glass1-1/+1
This test currently does not run because it specifies the sandbox board instead of sandbox_spl. Fix it. Signed-off-by: Simon Glass <>
2020-01-02mailmap: Update mail address for Igor OpaniukIgor Opaniuk1-0/+1
My address at Linaro doesn't exist anymore, so people keep getting mail delivery error responses. Map this address to the actual one. Signed-off-by: Igor Opaniuk <> Reviewed-by: Oleksandr Suvorov <>
2020-01-02test_env: don't strip() printenv resultsStephen Warren1-1/+1
get_env() was originally written to strip() the output of printenv to isolate the test from any whitespace changes in printenv's output. However, this throws away any whitespace in the variable value, which can cause issues when test code expects to see that whitespace. In fact, printenv never adds any whitespace at all, so there's no need to strip. The strip causes a practical problem for test_env_echo_exists() if state_test_env.get_existent_var() happens to choose a U-Boot variable that contains trailing whitespace. This is true for variable boot_targets. With Python 2, get_existent_var() never returned boot_targets so this issue never caused a practical problem. With Python 3, get_existent_var does sometimes return boot_targets, no doubt due to Python 3's different dict hash key order implementation, about 0.5-2% of the time, so this test appears intermittent. With the strip removed, this intermittency is solved, since the test passes for all possible U-Boot variables. Signed-off-by: Stephen Warren <>
2020-01-02arch/arm/Kconfig: typo/grammar/punctuation fixesRobert P. J. Day1-26/+26
Various (mostly minor) spelling, grammar and punctuation tweaks for arch/arm/Kconfig. Signed-off-by: Robert P. J. Day <>
2020-01-02.gitignore: ignore files generated by asn1 compilerDario Binacchi1-0/+1
As described in doc/README.asn1 document the tools/asn1_compiler is used to "generate bytecode as a C file (*.asn1.[ch]) from *.asn1 file". Signed-off-by: Dario Binacchi <>
2020-01-02tools: .gitignore: add asn1_compilerDario Binacchi1-0/+1
Add the tool to the ignore list to prevent being marked as unversioned. Signed-off-by: Dario Binacchi <> Reviewed-by: Bin Meng <>
2020-01-02video: Avoid using #ifdef in video-uclass.cSimon Glass1-28/+26
This code does not really need to use #ifdef. We can use if() instead and gain build coverage without impacting code size. Change the #ifdefs to use IS_ENABLED(), etc., instead. Signed-off-by: Simon Glass <>
2020-01-02video: Avoid using #ifdef in vidconsole-uclass.cSimon Glass1-12/+10
This code does not really need to use #ifdef. We can use if() instead and gain build coverage without impacting code size. Change the #ifdefs to use CONFIG_IS_ENABLED() instead. Signed-off-by: Simon Glass <>
2020-01-02video: Avoid using #ifdef in console_rotate.cSimon Glass1-167/+158
This code does not really need to use #ifdef. We can use if() instead and gain build coverage without impacting code size. Change the #ifdefs to use IS_ENABLED() instead. Signed-off-by: Simon Glass <>
2020-01-02video: Avoid using #ifdef in video blitting codeSimon Glass1-64/+61
This code does not really need to use #ifdef. We can use if() instead and gain build coverage without impacting code size. Change the #ifdefs to use IS_ENABLED() instead. Signed-off-by: Simon Glass <>
2020-01-02video: x86: Enable 32-bit graphics by defaultSimon Glass1-4/+1
Most x86 boards that use video make use of 32bpp graphics. Enable this by default. This fixes missing graphics output on some x86 boards. Also remove the unnecessary 'default n' while we are here. Signed-off-by: Simon Glass <>
2019-12-31rockchip: evb-rk3328: Enable support ATF in SPLKever Yang1-1/+5
Enable the ATF in SPL and adjust the SPL STACK/HEAD at the same time to support ATF entry at 0x40000. Signed-off-by: Kever Yang <>
2019-12-31rockchip: rk3328: enable spl-fifo-mode for emmc and sdmmcKever Yang1-0/+6
Since mmc to sram can't do dma, add patch to prevent aborts transfering TF-A parts. Signed-off-by: Kever Yang <>
2019-12-31rockchip: rk3328: add COUNTER_FREQUENCY definitionKever Yang1-0/+1
The arch timer needs COUNTER_FREQUENCY to get correct counter, add it to make the timer works correct. Signed-off-by: Kever Yang <>
2019-12-28Merge tag 'u-boot-imx-20191228' of ↵Tom Rini17-210/+280 Fixes for 2020.01 ----------------- - Fixes for Nitrogen6x - Fix corruption for mx51evk - colibri i.MX6: fix broken ESDHC conversion - mx6sxsabresd: fix broken mmcdev - imx6q_logic: cleanup boot sequence - update ATF for imx8mq_evk - pfuze: fix pmic_get() Travis CI:
2019-12-28Merge Rini6-7/+177
- Orange Pi Zero Plus 2 support - sunxi psci, prcm fixes
2019-12-28Merge Rini3-2/+19
- rk spi transfer limit fix - Gigadevice, gd25q128 support - spi-nor-core warnings
2019-12-28omap3_beagle: Change NAND ECC scheme back to OMAP_ECC_HAM1_CODE_HWPatrik Dahlström1-1/+1
The omap3_beagle NAND ECC scheme was changed in 4b37928d357 for unknown reasons, leading to uncorrectible ecc errors. This commit changes it back to what it was before. Signed-off-by: Patrik Dahlström <>
2019-12-27rtc: rx8010js: add compatible stringRobert Beckett1-0/+1
Add compatible string used by Linux. Allows for simpler syncing of device trees. Signed-off-by: Robert Beckett <>
2019-12-27rtc: s35392a: add compatible stringsRobert Beckett1-0/+2
Add compatible strings used by Linux. Allows for simpler syncing of device trees. Signed-off-by: Robert Beckett <>
2019-12-27rtc: rx8010sj: fix DM initializationRobert Beckett1-1/+1
pass the udevice by reference instead of double ref Signed-off-by: Robert Beckett <>
2019-12-27ARM: imx6q_logic: Cleanup boot sequence checkAdam Ford1-18/+38
The board_boot_order() function currenly assumes that the boot source is MMC/eMMC, but this isn't true for the NAND devices. This patch cleans up board_boot_order() to check for NAND, SD, ESD, MMC or EMMC. Anything beyond these are not supported, so it will default back to the serial downloader if any of those devices are not available. Fixes: 9fb50c68daa6 ("ARM: imx6q_logic: Fix MMC2 booting") Signed-off-by: Adam Ford <>
2019-12-27ARM: i.MX6: TARGET_NITROGEN6X: add 'select MX6QDL'Troy Kisky1-0/+1
This fixes commit <91435cd40d30> "ARM: i.MX6: exclude the ARM errata from i.MX6 UP system" for nitrogen6x. The above commit removed the errata for the board since MX6Q/MXDL/MX6S is selected via CONFIG_SYS_EXTRA_OPTIONS This restores the errata configs. Signed-off-by: Troy Kisky <> Reviewed-by: Fabio Estevam <>
2019-12-27nitrogen6x: prepare for CONFIG_MX6QDLTroy Kisky1-176/+194
The next patch adds CONFIG_MX6QDL so that errata will be enabled again. Signed-off-by: Troy Kisky <>
2019-12-27spi: rk: Limit transfers to (64K - 1) bytesJagan Teki1-2/+8
The Rockchip SPI controller's length register only supports 16-bits, yielding a maximum length of 64KiB (the CTRLR1 register holds "length - 1"). Trying to transfer more than that (e.g., with a large SPI flash read) will cause the driver to hang. Now, it seems that while theoretically we should be able to program CTRLR1 with 0xffff, and get a 64KiB transfer, but that also seems to cause the core to choke, so stick with a maximum of 64K - 1 bytes -- i.e., 0xffff. Note, that the size is further divided into 'minus 1' while writing into CTRLR1. This change fixed two different read issues, 1. sf read failure when with > 0x10000 2. Boot from SPI flash failed during spi_flash_read call in common/spl/spl_spi.c Observed and Tested in - Rockpro64 with Gigadevice flash - ROC-RK3399-PC with Winbond flash Signed-off-by: Jagan Teki <> Reviewed-by: Kever Yang <>
2019-12-27mtd: spi-nor-core: Fix static checker warningsVignesh Raghavendra1-0/+6
Static checker warns 'ret' variable may be used uninitialized in spi_nor_erase() and spi_nor_write() in case of zero length requests. Fix these warnings by checking for zero length requests and returning early. Reported-by: Dan Murphy <> Signed-off-by: Vignesh Raghavendra <>
2019-12-27tools/imximage: share DCD information via KconfigJorge Ramirez-Ortiz2-2/+17
IMX based platforms can have the DCD table located on different addresses due to differences in their memory maps (ie iMX7ULP). This information is required by the user to sign the images for secure boot so continue making it accessible via mkimage. Signed-off-by: Jorge Ramirez-Ortiz <> Reviewed-by: Fabio Estevam <> Signed-off-by: Stefano Babic <>
2019-12-27imx8mq_evk: Update the required ATF branchFabio Estevam1-1/+1
Following the README instructions leads to a non-booting U-Boot: U-Boot SPL 2020.01-rc3-00070-g9a0cbae22a (Nov 25 2019 - 13:08:24 -0300) PMIC: PFUZE100 ID=0x10 DDRINFO: start DRAM init DDRINFO:ddrphy calibration done DDRINFO: ddrmix config done Normal Boot Trying to boot from MMC2 (It hangs here) Use the "imx_4.19.35_1.0.0" ATF branch instead, which fixes such problem and allow the boot to complete again. Suggested-by: Adam Ford <> Signed-off-by: Fabio Estevam <> Acked-by: Peng Fan <>
2019-12-27imx8m_evk: Remove unneeded earlycon stringFabio Estevam3-3/+3
Passing earlycon string in the command line may be useful during bring up, but not after such phase. Remove the earlycon string to align with the other i.MX SoCs command lines. Signed-off-by: Fabio Estevam <>
2019-12-27imx8m: ddr_init: Move ddr_init() messages to debug levelFabio Estevam1-3/+3
Currently inside ddr_init() there is a mix of printf() and debug() level messages. Since this type of information is useful for debug purposes, convert all of them to debug level for consistency. Signed-off-by: Fabio Estevam <> Reviewed-by: Peng Fan <>
2019-12-27mx51evk: Fix U-Boot corruption after saving the environmentFabio Estevam2-1/+14
U-Boot binary has grown in such a way that it goes beyond the reserved area for the environment variables. Running "saveenv" followed by a "reset" causes U-Boot to hang because of this overlap. Fix this problem by increasing the CONFIG_ENV_OFFSET size. Also, in order to prevent this same problem to happen in the future, use CONFIG_BOARD_SIZE_LIMIT, which will detect the overlap in build-time. CONFIG_BOARD_SIZE_LIMIT does not accept math expressions, so declare CONFIG_ENV_OFFSET with its direct value instead. Signed-off-by: Fabio Estevam <>
2019-12-27mx6sxsabresd: Adjust the mmcdev after DM conversionFabio Estevam1-2/+2
After the DM conversion the boot SD card is now device 3. Adjust it so that we can boot the kernel again. While at it avoid a hardcoded mmc dev inside the finduuid script. Signed-off-by: Fabio Estevam <>
2019-12-27pfuze: Fix the pmic_get() parameter in the DM caseFabio Estevam1-1/+1
Currently the following hang is observed when booting a imx6sx-sdb board: U-Boot 2020.01-rc5-00004-g643366bcd5 (Dec 19 2019 - 14:56:23 -0300) CPU: Freescale i.MX6SX rev1.0 996 MHz (running at 792 MHz) CPU: Extended Commercial temperature grade (-20C to 105C) at 32C Reset cause: POR Model: Freescale i.MX6 SoloX SDB RevB Board Board: MX6SX SABRE SDB revA DRAM: 1 GiB initcall sequence bffd8514 failed at call 87804cc0 (err=-19) ### ERROR ### Please RESET the board ### When pmic_get() is used with DM the first parameter must be the complete node name plus the unit address. Fix the pmic_get() parameter to fix the boot regression. Tested on a imx6sx-sdb and imx6q-sabresd boards. Signed-off-by: Fabio Estevam <> Reviewed-by: Igor Opaniuk <>