May 2021 - U-Boot

[PATCH 1/2] mmc: fsl_esdhc_imx: use mmc_send_cmd instead of dm_mmc_send_cmd
by Jaehoon Chung 31 May '21

31 May '21

Use mmc_send_cmd instead of dm_mmc_send_cmd. It doesn't need to distinguish this function. Signed-off-by: Jaehoon Chung <jh80.chung(a)samsung.com> --- drivers/mmc/fsl_esdhc_imx.c | 2 +- drivers/mmc/mmc_private.h | 1 - include/mmc.h | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index a4675838e58a..4f4a6a8c9934 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -865,7 +865,7 @@ static void esdhc_stop_tuning(struct mmc *mmc) cmd.cmdarg = 0; cmd.resp_type = MMC_RSP_R1b; - dm_mmc_send_cmd(mmc->dev, &cmd, NULL); + mmc_send_cmd(mmc, &cmd, NULL); } static int fsl_esdhc_execute_tuning(struct udevice *dev, uint32_t opcode) diff --git a/drivers/mmc/mmc_private.h b/drivers/mmc/mmc_private.h index a0900e8cadd8..a6cd250d2935 100644 --- a/drivers/mmc/mmc_private.h +++ b/drivers/mmc/mmc_private.h @@ -12,7 +12,6 @@ #include <mmc.h> -int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data); int mmc_send_status(struct mmc *mmc, unsigned int *status); int mmc_poll_for_busy(struct mmc *mmc, int timeout); diff --git a/include/mmc.h b/include/mmc.h index 8600881705f4..7f8ba2b017ee 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -795,6 +795,7 @@ int mmc_initialize(struct bd_info *bis); int mmc_init_device(int num); int mmc_init(struct mmc *mmc); int mmc_send_tuning(struct mmc *mmc, u32 opcode, int *cmd_error); +int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data); #if CONFIG_IS_ENABLED(MMC_UHS_SUPPORT) || \ CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) || \ -- 2.29.0

1 1

[PATCH 1/3] mmc: fsl_esdhc_imx: use mmc_send_cmd instead of dm_mmc_send_cmd
by Jaehoon Chung 31 May '21

31 May '21

Use mmc_send_cmd instead of dm_mmc_send_cmd. It doesn't need to distinguish this function. Signed-off-by: Jaehoon Chung <jh80.chung(a)samsung.com> --- drivers/mmc/fsl_esdhc_imx.c | 2 +- drivers/mmc/mmc_private.h | 1 - include/mmc.h | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index a4675838e58a..4f4a6a8c9934 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -865,7 +865,7 @@ static void esdhc_stop_tuning(struct mmc *mmc) cmd.cmdarg = 0; cmd.resp_type = MMC_RSP_R1b; - dm_mmc_send_cmd(mmc->dev, &cmd, NULL); + mmc_send_cmd(mmc, &cmd, NULL); } static int fsl_esdhc_execute_tuning(struct udevice *dev, uint32_t opcode) diff --git a/drivers/mmc/mmc_private.h b/drivers/mmc/mmc_private.h index a0900e8cadd8..a6cd250d2935 100644 --- a/drivers/mmc/mmc_private.h +++ b/drivers/mmc/mmc_private.h @@ -12,7 +12,6 @@ #include <mmc.h> -int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data); int mmc_send_status(struct mmc *mmc, unsigned int *status); int mmc_poll_for_busy(struct mmc *mmc, int timeout); diff --git a/include/mmc.h b/include/mmc.h index 8600881705f4..7f8ba2b017ee 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -795,6 +795,7 @@ int mmc_initialize(struct bd_info *bis); int mmc_init_device(int num); int mmc_init(struct mmc *mmc); int mmc_send_tuning(struct mmc *mmc, u32 opcode, int *cmd_error); +int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data); #if CONFIG_IS_ENABLED(MMC_UHS_SUPPORT) || \ CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) || \ -- 2.29.0

1 1

[[PATCH] colibri_imx6: add board_fit_config_name_match to support FIT in SPL
by liu.ming50＠gmail.com 30 May '21

30 May '21

From: Ming Liu <liu.ming50(a)gmail.com> Only one dtb is currently supported, so match with imx6-colibri. Signed-off-by: Ming Liu <liu.ming50(a)gmail.com> --- board/toradex/colibri_imx6/colibri_imx6.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index c0e7754469..587d92a8e9 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -1081,6 +1081,16 @@ void board_init_f(ulong dummy) board_init_r(NULL, 0); } +#ifdef CONFIG_SPL_LOAD_FIT +int board_fit_config_name_match(const char *name) +{ + if (!strcmp(name, "imx6-colibri")) + return 0; + + return -1; +} +#endif + void reset_cpu(void) { } -- 2.29.0

1 0

[[PATCH] tools: image-host: fix wrong return value
by liu.ming50＠gmail.com 30 May '21

30 May '21

From: Ming Liu <liu.ming50(a)gmail.com> The return value '-ENOSPC' of fit_set_timestamp function does not match the caller fit_image_write_sig's expection which is '-FDT_ERR_NOSPACE'. Fix it by not calling fit_set_timestamp, but call fdt_setprop instead. This fixes a following mkimage error: | Can't write signature for 'signature@1' signature node in | 'conf(a)imx6ull-colibri-wifi-eval-v3.dtb' conf node: <unknown error> | mkimage Can't add hashes to FIT blob: -1 Signed-off-by: Ming Liu <liu.ming50(a)gmail.com> --- tools/image-host.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/image-host.c b/tools/image-host.c index 270d36fe45..73095461a7 100644 --- a/tools/image-host.c +++ b/tools/image-host.c @@ -132,8 +132,10 @@ static int fit_image_write_sig(void *fit, int noffset, uint8_t *value, if (!ret) { time_t timestamp = imagetool_get_source_date(cmdname, time(NULL)); + uint32_t t = cpu_to_uimage(timestamp); - ret = fit_set_timestamp(fit, noffset, timestamp); + ret = fdt_setprop(fit, noffset, FIT_TIMESTAMP_PROP, &t, + sizeof(uint32_t)); } if (region_prop && !ret) { uint32_t strdata[2]; -- 2.29.0

1 0

[PATCH] board: freescale: p2041rdb: use correct EEPROM address length
by Matt Merhar 30 May '21

30 May '21

These boards, according to the schematic and per the board I own, use an M24256-BWDW6TP I2C EEPROM which requires two address bytes. This fixes the 'mac' command which is used to program, among other things, the MAC addresses for the ethernet interfaces on the board. Signed-off-by: Matt Merhar <mattmerhar(a)protonmail.com> --- include/configs/P2041RDB.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 3895c2d0c7..715154a0dd 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -92,7 +92,7 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_I2C_EEPROM_NXID #define CONFIG_SYS_EEPROM_BUS_NUM 0 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 -#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 +#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 /* * DDR Setup -- 2.25.1

1 0

[PATCH v2 0/3] test/py: Rewrite SquashFS commands test suite
by Joao Marcos Costa 30 May '21

30 May '21

Hello, This patch series fixes the following issues: - poor strategy to check if files were properly loaded - wrong quoting style for strings - tests failing at the second run because of a wrong clean-up strategy Finally, it improves: - code overall documentation level, with more comments and better naming for functions and variables - code readability by adding more helper functions - completeness: more test cases were added for both sqfsls and sqfsload commands The sqfsload new test suite may fail when testing images with fragmented files if the patch I previously sent (fs/squashfs: fix reading of fragmented files) is not applied, so this patch series depends on it. Changes since V1: - Leave the copyright year as it was (2020) instead of changing it to 2021 - Remove spurious comments and print statements - Fix the style issues pointed by pylint3 Best regards, Joao Joao Marcos Costa (3): test/py: rewrite common tools for SquashFS tests test/py: rewrite sqfsload command test suite test/py: rewrite sqfsls command test suite .../test_fs/test_squashfs/sqfs_common.py | 237 +++++++++++++----- .../test_fs/test_squashfs/test_sqfs_load.py | 166 +++++++++--- .../test_fs/test_squashfs/test_sqfs_ls.py | 138 ++++++++-- 3 files changed, 428 insertions(+), 113 deletions(-) -- 2.25.1

1 3

[PATCH 0/3] test/py: Rewrite SquashFS commands test suite
by Joao Marcos Costa 29 May '21

29 May '21

Hello, This patch series fixes the following issues: - poor strategy to check if files were properly loaded - wrong quoting style for strings - tests failing at the second run because of a wrong clean-up strategy Finally, it improves: - code overall documentation level, with more comments and better naming for functions and variables - code readability by adding more helper functions - completeness: more test cases were added for both sqfsls and sqfsload commands The sqfsload new test suite may fail when testing images with fragmented files if the patch I previously sent (fs/squashfs: fix reading of fragmented files) is not applied, so this patch series depends on it. Best regards, Joao Joao Marcos Costa (3): test/py: rewrite common tools for SquashFS tests test/py: rewrite sqfsload command test suite test/py: rewrite sqfsls command test suite .../test_fs/test_squashfs/sqfs_common.py | 198 ++++++++++++------ .../test_fs/test_squashfs/test_sqfs_load.py | 99 ++++++--- .../test_fs/test_squashfs/test_sqfs_ls.py | 80 +++++-- 3 files changed, 264 insertions(+), 113 deletions(-) -- 2.25.1

5 7

[PATCH] common: The do_repeat flag interferes with commands issued via run_command API
by Farhan Ali 29 May '21

29 May '21

Must clear the do_repeat flag once it is consumed. Signed-off-by: Farhan Ali <farhan.ali(a)broadcom.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Sean Anderson <seanga2(a)gmail.com> Cc: Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> Cc: Farhan Ali <farhan.ali(a)broadcom.com> Cc: "peng.wang(a)smartm.com" <peng.wang(a)smartm.com> Cc: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- common/cli_hush.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/cli_hush.c b/common/cli_hush.c index 1467ff81b3..1c9adf5683 100644 --- a/common/cli_hush.c +++ b/common/cli_hush.c @@ -1559,6 +1559,11 @@ static int run_pipe_real(struct pipe *pi) # endif #endif /* __U_BOOT__ */ + /* Clear do_repeat after consumption, avoids conflicts + * with cmds issued via run_command API + */ + do_repeat = 0; + nextin = 0; #ifndef __U_BOOT__ pi->pgrp = -1; -- 2.27.0

2 3

[PATCH] pytest:Shutdown power-supply to board after the pytest execution
by opensource.kab＠gmail.com 29 May '21

29 May '21

From: Adarsh Babu Kalepalli <opensource.kab(a)gmail.com> After executing the test-cases from pytest ,the board is still powered.Shutting down the board power supply at this point ,would keep the board safe. Signed-off-by: Adarsh Babu Kalepalli <opensource.kab(a)gmail.com> --- test/py/conftest.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/py/conftest.py b/test/py/conftest.py index 11a3f307ea..077358a37f 100644 --- a/test/py/conftest.py +++ b/test/py/conftest.py @@ -406,6 +406,13 @@ def cleanup(): """ if console: + if ((console.config.board_type != "sandbox") and (console.config.board_type != "sandbox64")): + args = [console.config.board_type, console.config.board_identity] + console.log.action('Powering Down the board') + cmd = ['u-boot-test-power-off'] + args + runner = console.log.get_runner(cmd[0], sys.stdout) + runner.run(cmd) + runner.close() console.close() if log: with log.section('Status Report', 'status_report'): -- 2.17.1

3 2

[PATCH] sunxi: Bring back SD card as MMC device 0
by Andre Przywara 29 May '21

29 May '21

Commit 2243d19e5618 ("mmc: mmc-uclass: Use dev_seq() to read aliases node's index") now actually enforces U-Boot's device enumeration policy, where explicitly named devices come first, then any other non-named devices follow, without filling gaps. For quite a while we have had an "mmc1 = &mmc2;" alias in our sunxi-u-boot.dtsi, which now leads to the problem that the SD card (which was always mmc device 0) now gets to be number 2. I guess this breaks quite some boot scripts, and is confusing at least. Just add an explicit mmc0 alias in the very same file to fix this and restore the old behaviour. Signed-off-by: Andre Przywara <andre.przywara(a)arm.com> Reported-by: Samuel Holland <samuel(a)sholland.org> --- arch/arm/dts/sunxi-u-boot.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi index a4227a3c22d..06da009fa28 100644 --- a/arch/arm/dts/sunxi-u-boot.dtsi +++ b/arch/arm/dts/sunxi-u-boot.dtsi @@ -12,6 +12,7 @@ / { aliases { + mmc0 = &mmc0; mmc1 = &mmc2; }; -- 2.17.5

3 6