January 2020 - U-Boot

[PATCH] tools: ftdgrep: correct the find regions loop in do_fdtgrep
by Patrick Delaunay 13 Jan '20

13 Jan '20

Update the loop executed in do_fdtgrep to find all the regions and add a test for count > max_region only when the second passes is executed. This patch solve an issue if the number of region found (count) is greater then the default value (max_region = count = 100): the second pass is never executed, because the loop stops after the first pass (i = 0, count > 100, max_regions = 100) with error -1 and the error message "Internal error with fdtgrep_find_region". I also update the error message. Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- tools/fdtgrep.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c index 8f44f599c1..bcf06b871d 100644 --- a/tools/fdtgrep.c +++ b/tools/fdtgrep.c @@ -823,8 +823,10 @@ static int do_fdtgrep(struct display_info *disp, const char *filename) } if (count <= max_regions) break; + } + if (count > max_regions) { free(region); - fprintf(stderr, "Internal error with fdtgrep_find_region)(\n"); + fprintf(stderr, "Internal error with fdtgrep_find_region()\n"); return -1; } -- 2.17.1

3 2

[PATCH 1/2] fdtgrep: fix typos in error output
by Anatolij Gustschin 12 Jan '20

12 Jan '20

Fix function name and parenthesis. Signed-off-by: Anatolij Gustschin <agust(a)denx.de> --- tools/fdtgrep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c index 8f44f599c1..052d419692 100644 --- a/tools/fdtgrep.c +++ b/tools/fdtgrep.c @@ -824,7 +824,7 @@ static int do_fdtgrep(struct display_info *disp, const char *filename) if (count <= max_regions) break; free(region); - fprintf(stderr, "Internal error with fdtgrep_find_region)(\n"); + fprintf(stderr, "Internal error with fdtgrep_find_regions()\n"); return -1; } -- 2.17.1

3 5

[PATCH 1/2] dts: add property removal option CONFIG_OF_REMOVE_PROPS
by Anatolij Gustschin 12 Jan '20

12 Jan '20

This can be used for device tree size reduction similar as CONFIG_OF_SPL_REMOVE_PROPS option. For tbs2910 board this shrinks the image size: all -2304.0 bss -16.0 text -2288.0 Signed-off-by: Anatolij Gustschin <agust(a)denx.de> --- dts/Kconfig | 8 ++++++++ scripts/Makefile.lib | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dts/Kconfig b/dts/Kconfig index 64c98dd723..49224bee93 100644 --- a/dts/Kconfig +++ b/dts/Kconfig @@ -311,6 +311,14 @@ config OF_SPL_REMOVE_PROPS can be discarded. This option defines the list of properties to discard. +config OF_REMOVE_PROPS + string "List of device tree properties to drop" + depends on OF_CONTROL + default "interrupt-parent interrupts" if PINCTRL + help + Some properties are not used by U-Boot and can be discarded. + This option defines the list of properties to discard. + config SPL_OF_PLATDATA bool "Generate platform data for use in SPL" depends on SPL_OF_CONTROL diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 4ea898a421..3b124369ad 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -235,7 +235,8 @@ $(obj)/%.tab.h: $(src)/%.y FORCE # =========================================================================== quiet_cmd_shipped = SHIPPED $@ -cmd_shipped = cat $< > $@ +cmd_shipped = cat $< | $(objtree)/tools/fdtgrep -r -O dtb - -o $@ \ + $(addprefix -P ,$(subst $\",,$(CONFIG_OF_REMOVE_PROPS))) $(obj)/%: $(src)/%_shipped $(call cmd,shipped) -- 2.17.1

4 9

[PATCH 1/2] configs: omap3/35_logic and omap3/35_logic_somlv: Reduce SPL size
by Adam Ford 12 Jan '20

12 Jan '20

Currently the DM37 and OMAP35 boards do not boot due to SPL bring too large. SPL doesn't need GPIO, I2C nor MMC sector access since it uses a FAT file system. This patch unifies all these boards to remove these unused features from their defconfigs Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/configs/omap35_logic_defconfig b/configs/omap35_logic_defconfig index c7b67f0ffe..aabb438e1a 100644 --- a/configs/omap35_logic_defconfig +++ b/configs/omap35_logic_defconfig @@ -21,7 +21,9 @@ CONFIG_DEFAULT_FDT_FILE="logicpd-torpedo-35xx-devkit.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SEPARATE_BSS=y +# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set # CONFIG_SPL_FS_EXT4 is not set +# CONFIG_SPL_I2C_SUPPORT is not set CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_SYS_PROMPT="OMAP Logic # " diff --git a/configs/omap35_logic_somlv_defconfig b/configs/omap35_logic_somlv_defconfig index 9773464d04..51c5d449e0 100644 --- a/configs/omap35_logic_somlv_defconfig +++ b/configs/omap35_logic_somlv_defconfig @@ -20,7 +20,9 @@ CONFIG_DEFAULT_FDT_FILE="logicpd-som-lv-35xx-devkit.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SEPARATE_BSS=y +# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set # CONFIG_SPL_FS_EXT4 is not set +# CONFIG_SPL_I2C_SUPPORT is not set CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_OS_BOOT=y # CONFIG_SPL_POWER_SUPPORT is not set diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index f336c3809c..15925fb7db 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -20,7 +20,9 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SEPARATE_BSS=y +# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set # CONFIG_SPL_FS_EXT4 is not set +# CONFIG_SPL_I2C_SUPPORT is not set CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_SYS_PROMPT="OMAP Logic # " diff --git a/configs/omap3_logic_somlv_defconfig b/configs/omap3_logic_somlv_defconfig index 163bb18375..ea8fc37f12 100644 --- a/configs/omap3_logic_somlv_defconfig +++ b/configs/omap3_logic_somlv_defconfig @@ -21,7 +21,9 @@ CONFIG_DEFAULT_FDT_FILE="logicpd-som-lv-37xx-devkit.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SEPARATE_BSS=y +# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set # CONFIG_SPL_FS_EXT4 is not set +# CONFIG_SPL_I2C_SUPPORT is not set CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_OS_BOOT=y # CONFIG_SPL_POWER_SUPPORT is not set -- 2.20.1

1 1

[PATCH] travis: Switch to QEMU v4.2.0 globally
by Tom Rini 11 Jan '20

11 Jan '20

Given our tests in GitLab / Azure we can use QEMU v4.2.0 for all platforms now. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5da046ca7ed5..3991eb7716fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,7 +66,7 @@ env: - BUILD_DIR=build - HOSTCC="cc" - HOSTCXX="c++" - - QEMU_VERSION="v3.1.0" + - QEMU_VERSION="v4.2.0" before_script: # install toolchains based on TOOLCHAIN} variable @@ -410,14 +410,12 @@ matrix: - TEST_PY_BD="evb-ast2500" TEST_PY_ID="--id qemu" QEMU_TARGET="arm-softmmu" - QEMU_VERSION="506179e42112be77bfd071f050b15762d3b2cd43" BUILDMAN="^evb-ast2500$" - name: "test/py vexpress_ca15_tc2" env: - TEST_PY_BD="vexpress_ca15_tc2" TEST_PY_ID="--id qemu" QEMU_TARGET="arm-softmmu" - QEMU_VERSION="v3.0.0" BUILDMAN="^vexpress_ca15_tc2$" - name: "test/py vexpress_ca9x4" env: -- 2.17.1

1 1

[PATCH 1/2] mmc: add additional quirk for APP_CMD retry
by Joel Johnson 11 Jan '20

11 Jan '20

It was observed (on ClearFog Base) that sending MMC APP_CMD returned an error on the first attempt. The issue appears to be timing related since even inserting a puts() short debug entry before the execution added sufficient delay to receive success on first attempt. Follow the existing quirks pattern to retry if initial issuance failed so as to not introduce any delay unless needed. Signed-off-by: Joel Johnson <mrjoel(a)lixil.net> --- drivers/mmc/mmc.c | 17 ++++++++++++++++- include/mmc.h | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index f683b52ead..d43983d4a6 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1444,6 +1444,20 @@ static int sd_read_ssr(struct mmc *mmc) cmd.cmdarg = mmc->rca << 16; err = mmc_send_cmd(mmc, &cmd, NULL); +#ifdef CONFIG_MMC_QUIRKS + if (err && (mmc->quirks & MMC_QUIRK_RETRY_APP_CMD)) { + int retries = 4; + /* + * It has been seen that APP_CMD may fail on the first + * attempt, let's try a few more times + */ + do { + err = mmc_send_cmd(mmc, &cmd, NULL); + if (!err) + break; + } while (retries--); + } +#endif if (err) return err; @@ -2755,7 +2769,8 @@ int mmc_get_op_cond(struct mmc *mmc) #ifdef CONFIG_MMC_QUIRKS mmc->quirks = MMC_QUIRK_RETRY_SET_BLOCKLEN | - MMC_QUIRK_RETRY_SEND_CID; + MMC_QUIRK_RETRY_SEND_CID | + MMC_QUIRK_RETRY_APP_CMD; #endif err = mmc_power_cycle(mmc); diff --git a/include/mmc.h b/include/mmc.h index 1a9efe4c38..b5cb514f57 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -331,6 +331,7 @@ static inline bool mmc_is_tuning_cmd(uint cmdidx) #define MMC_QUIRK_RETRY_SEND_CID BIT(0) #define MMC_QUIRK_RETRY_SET_BLOCKLEN BIT(1) +#define MMC_QUIRK_RETRY_APP_CMD BIT(2) enum mmc_voltage { MMC_SIGNAL_VOLTAGE_000 = 0, -- 2.20.1

1 1

[PATCHv3 0/3] Odroid n2 using eMMC would fail to boot up
by Anand Moon 11 Jan '20

11 Jan '20

Here are some small changes to fix booting of Odroid N2 using eMMC. Fixed the clk tunnig during mmc initialization. Build and tested on top of below patches [0] https://patchwork.ozlabs.org/patch/1213648/ [1] https://patchwork.ozlabs.org/patch/1213650/ Tested on below eMMC module on Odroid N2 and C2 new orange - eMMC AJNB4R 14.6 GiB MMC 5.1 old back - eMMC CGND3R 58.2 GiB MMC 5.0 Prevoius changes: Fixed the clk tuning as per mainline kernel [3]v1 https://patchwork.ozlabs.org/cover/1201206/ [4]v2 https://patchwork.ozlabs.org/cover/1215217/ -Anand Anand Moon (3): mmc: meson-gx: Fix clk phase tuning for MMC configs: meson64: enable GIC support for G12A/G12B board: amlogic: select PWRSEQ for all amlogic platform arch/arm/include/asm/arch-meson/sd_emmc.h | 14 ++++++-------- arch/arm/mach-meson/Kconfig | 1 + drivers/mmc/meson_gx_mmc.c | 9 +++++---- include/configs/meson64.h | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) -- 2.24.1

4 8

[PATCH 1/1] efi_selftest: enable CONFIG_CMD_POWEROFF
by Heinrich Schuchardt 11 Jan '20

11 Jan '20

For automating testing we should be able to power off the test system. The implementation of EFI_RESET_SHUTDOWN requires the do_poweroff() function which is only available if CONFIG_CMD_POWEROFF=y. Enable CONFIG_CMD_POWEROFF if PSCI reset is available. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_selftest/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/efi_selftest/Kconfig b/lib/efi_selftest/Kconfig index d20f5899af..478140330b 100644 --- a/lib/efi_selftest/Kconfig +++ b/lib/efi_selftest/Kconfig @@ -3,6 +3,7 @@ config CMD_BOOTEFI_SELFTEST depends on CMD_BOOTEFI imply FAT imply FAT_WRITE + imply CMD_POWEROFF if PSCI_RESET || SYSRESET_PSCI help This adds a UEFI test application to U-Boot that can be executed via the 'bootefi selftest' command. It provides extended tests of -- 2.24.1

1 0

[RFC PATCH] rockchip: boot_mode: find the saradc device name
by Hugh Cole-Baker 11 Jan '20

11 Jan '20

adc_channel_single_shot() requires the full device name e.g. "saradc@ff100000", which differs between Rockchip SoC's, but they all share the prefix "saradc"; find the ADC device with this name prefix and use its full name. Signed-off-by: Hugh Cole-Baker <sigmaris(a)gmail.com> --- I'd noticed a "rockchip_dnl_key_pressed: adc_channel_single_shot fail!" message every time I booted up my RockPro64 board and wrote this to fix it; I could think of a few different ways to indicate the correct device to use, e.g. an alias in the u-boot dts for each SoC pointing to the saradc device. But this seemed like a straightforward approach that matches the original intention of this code. arch/arm/mach-rockchip/boot_mode.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c index 08f80bd91a..7598fe4c43 100644 --- a/arch/arm/mach-rockchip/boot_mode.c +++ b/arch/arm/mach-rockchip/boot_mode.c @@ -7,6 +7,8 @@ #include <adc.h> #include <asm/io.h> #include <asm/arch-rockchip/boot_mode.h> +#include <dm/device.h> +#include <dm/uclass.h> #if (CONFIG_ROCKCHIP_BOOT_MODE_REG == 0) @@ -35,8 +37,26 @@ void set_back_to_bootrom_dnl_flag(void) __weak int rockchip_dnl_key_pressed(void) { unsigned int val; + struct udevice *dev; + struct uclass *uc; + int ret; - if (adc_channel_single_shot("saradc", 1, &val)) { + ret = uclass_get(UCLASS_ADC, &uc); + if (ret) + return false; + + ret = -ENODEV; + uclass_foreach_dev(dev, uc) { + if (!strncmp(dev->name, "saradc", 6)) { + ret = adc_channel_single_shot(dev->name, 1, &val); + break; + } + } + + if (ret == -ENODEV) { + pr_warn("%s: no saradc device found\n", __func__); + return false; + } else if (ret) { pr_err("%s: adc_channel_single_shot fail!\n", __func__); return false; } -- 2.17.2 (Apple Git-113)

1 0

[Patch v3 0/7] Transition of fsl qspi driver to spi-mem framework
by Kuldeep Singh 11 Jan '20

11 Jan '20

This entire patch series migrate freescale qspi driver to spi-mem framework. v3 version of series includes correction of copyright in qspi driver and also move SPI_FLASH_SPANSION from header to defconfigs in same patch. v2 version of series includes changes in qspi driver to have 1k size instead of complete flash size so as to make driver independent of flash size. This also makes it align with linux version of driver. Also added support for imx platforms to set TDH bits correctly. There are other minor changes in commit messages. Dependency on patches[1][2]. These patches are required to resolve booting crash observed in LS1012ARDB. One crash was related to pfe driver as it was accessing flash memory directly and other was based on environment. [1] https://patchwork.ozlabs.org/patch/1207610/ [2] https://patchwork.ozlabs.org/patch/1208299/ Patch 1 adds new qspi driver incorporating spi-mem framework and also removal of old driver which was based on spi-nor. The driver is a ported version of linux qspi driver. Initial port was done by Frieder. Now, no more direct memory access to spi-nor memory is possible i.e accessing flash memory using absolute address is not possible. Patch 2 removes unused qspi config options. Patch 3 moves FSL_QSPI to defconfig instead of defining it in header files. Patch 4 removes unused num-cs property from imx platforms. Patch 5 enables SPI_FLASH_SPANSION in ls1012a defconfig as FSL_QSPI is already enabled. Patch 6 enables SPI_FLASH_SPANSION in defconfigs of LS1046a boards instead of defining in header files. Patch 7 updates the device-tree properties treewide for layerscape boards by aligning with linux device-tree properties. Frieder Schrempf (1): imx: imx6sx: Remove unused 'num-cs' property Kuldeep Singh (6): spi: Transform the FSL QuadSPI driver to use the SPI MEM API treewide: Remove unused FSL QSPI config options configs: ls1043a: Move CONFIG_FSL_QSPI to defconfig configs: ls1012a: Enable CONFIG_SPI_FLASH_SPANSION configs: ls1046a: Move SPI_FLASH_SPANSION to defconfig treewide: Update fsl qspi node dt properties as per spi-mem driver arch/arm/dts/fsl-ls1012a-2g5rdb.dts | 5 +- arch/arm/dts/fsl-ls1012a-frdm.dtsi | 5 +- arch/arm/dts/fsl-ls1012a-qds.dtsi | 5 +- arch/arm/dts/fsl-ls1012a-rdb.dtsi | 5 +- arch/arm/dts/fsl-ls1012a.dtsi | 4 +- arch/arm/dts/fsl-ls1043a-qds.dtsi | 5 +- arch/arm/dts/fsl-ls1043a.dtsi | 6 +- arch/arm/dts/fsl-ls1046a-frwy.dts | 5 +- arch/arm/dts/fsl-ls1046a-qds.dtsi | 5 +- arch/arm/dts/fsl-ls1046a-rdb.dts | 5 +- arch/arm/dts/fsl-ls1046a.dtsi | 4 +- arch/arm/dts/fsl-ls1088a-qds.dts | 5 +- arch/arm/dts/fsl-ls1088a-rdb.dts | 5 +- arch/arm/dts/fsl-ls1088a.dtsi | 2 +- arch/arm/dts/fsl-ls2080a-qds.dts | 5 +- arch/arm/dts/fsl-ls2080a.dtsi | 4 +- arch/arm/dts/fsl-ls2088a-rdb-qspi.dts | 5 +- arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi | 2 - arch/arm/dts/imx6sx-sdb-u-boot.dtsi | 2 - arch/arm/dts/ls1021a-twr.dtsi | 5 +- arch/arm/dts/ls1021a.dtsi | 6 +- .../include/asm/arch-fsl-layerscape/config.h | 1 - arch/arm/include/asm/arch-ls102xa/config.h | 1 - configs/ls1012a2g5rdb_qspi_defconfig | 1 + configs/ls1012a2g5rdb_tfa_defconfig | 1 + configs/ls1012afrdm_qspi_defconfig | 1 + configs/ls1012afrdm_tfa_defconfig | 1 + configs/ls1012aqds_qspi_defconfig | 1 + configs/ls1012aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1012aqds_tfa_defconfig | 1 + configs/ls1012ardb_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1012ardb_qspi_defconfig | 1 + configs/ls1012ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1012ardb_tfa_defconfig | 1 + configs/ls1043aqds_qspi_defconfig | 1 + configs/ls1043aqds_sdcard_qspi_defconfig | 1 + configs/ls1043aqds_tfa_SECURE_BOOT_defconfig | 2 + configs/ls1043aqds_tfa_defconfig | 1 + configs/ls1046aqds_qspi_defconfig | 1 + configs/ls1046aqds_sdcard_qspi_defconfig | 1 + configs/ls1046aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1046aqds_tfa_defconfig | 1 + configs/ls1046ardb_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1046ardb_qspi_defconfig | 1 + configs/ls1046ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1046ardb_tfa_defconfig | 1 + drivers/spi/fsl_qspi.c | 1572 +++++++---------- drivers/spi/fsl_qspi.h | 145 -- include/configs/ls1012a_common.h | 17 +- include/configs/ls1012afrwy.h | 3 - include/configs/ls1012ardb.h | 3 - include/configs/ls1021aiot.h | 6 - include/configs/ls1021aqds.h | 11 - include/configs/ls1021atwr.h | 10 - include/configs/ls1043aqds.h | 10 - include/configs/ls1046afrwy.h | 9 - include/configs/ls1046aqds.h | 19 - include/configs/ls1046ardb.h | 20 - include/configs/ls1088a_common.h | 6 - include/configs/ls1088aqds.h | 8 - include/configs/ls1088ardb.h | 18 - include/configs/ls2080aqds.h | 3 - include/configs/ls2080ardb.h | 6 +- include/configs/mx6sxsabreauto.h | 6 - include/configs/mx6sxsabresd.h | 11 - include/configs/mx6ul_14x14_evk.h | 6 - include/configs/mx6ullevk.h | 6 - include/configs/mx7dsabresd.h | 8 - include/configs/pcm052.h | 7 - include/configs/vf610twr.h | 8 - scripts/config_whitelist.txt | 5 - 71 files changed, 664 insertions(+), 1380 deletions(-) delete mode 100644 drivers/spi/fsl_qspi.h -- 2.17.1

2 10