From 03972ff6719456e1a1b11d520edb332a7c6a0e9b Mon Sep 17 00:00:00 2001 From: John Keeping Date: Tue, 9 May 2023 12:02:50 +0100 Subject: video: tweak CONFIG_SPL_VIDEO description Make it clear that this is the SPL option to avoid potential confusion when the description for CONFIG_SPL_VIDEO is the same as that for CONFIG_VIDEO. Signed-off-by: John Keeping --- drivers/video/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index fcc0e85d2e..1e2f4e6de4 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -962,7 +962,7 @@ config BMP_32BPP endif # VIDEO config SPL_VIDEO - bool "Enable driver model support for LCD/video" + bool "Enable driver model support for LCD/video in SPL" depends on SPL_DM help The video subsystem adds a small amount of overhead to the image. -- cgit v1.2.1 From 7d01ee9d19db9670486ffc427c67855420ed8c94 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Tue, 9 May 2023 21:05:46 +0200 Subject: Revert "mmc: s5p_sdhci: unset the SDHCI_QUIRK_BROKEN_R1B" This reverts commit a034ec06ff1d558bbe11d5ee05edbb4de3ee2215. Commit 4a3ea75de4c5 ("Revert "mmc: sdhci: set to INT_DATA_END when there are data"") reverted the alternative fix that was added for Exynos 4 devices, causing an error when trying to boot from an sdcard: <...> Loading Environment from MMC... sdhci_send_command: Timeout for status update! mmc fail to send stop cmd <...> Re-add the quirk to allow booting from sdcards again. Signed-off-by: Henrik Grimler --- drivers/mmc/s5p_sdhci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c index dee84263c3..3b74feae68 100644 --- a/drivers/mmc/s5p_sdhci.c +++ b/drivers/mmc/s5p_sdhci.c @@ -90,7 +90,7 @@ static int s5p_sdhci_core_init(struct sdhci_host *host) host->name = S5P_NAME; host->quirks = SDHCI_QUIRK_NO_HISPD_BIT | SDHCI_QUIRK_BROKEN_VOLTAGE | - SDHCI_QUIRK_32BIT_DMA_ADDR | + SDHCI_QUIRK_BROKEN_R1B | SDHCI_QUIRK_32BIT_DMA_ADDR | SDHCI_QUIRK_WAIT_SEND_CMD | SDHCI_QUIRK_USE_WIDE8; host->max_clk = 52000000; host->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195; -- cgit v1.2.1 From c9901bd2adad104adb132bdcc92fe2e86b4bcaa0 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Tue, 9 May 2023 21:05:47 +0200 Subject: samsung: common: do not reset if cros-ec uclass is missing Otherwise non-ChromeOS samsung devices, like the odroid boards, are stuck in a bootloop if CONFIG_CROS_EC is not enabled: <...> MMC: SAMSUNG SDHCI: 2, EXYNOS DWMMC: 0 Loading Environment from MMC... *** Warning - bad CRC, using default environment cros-ec communications failure -96 Please reset with Power+Refresh Cannot init cros-ec device resetting ... Issue started after commit e44d7e73fe0d ("dm: core: Switch uclass_*_device_err to use uclass_*_device_check"). Signed-off-by: Henrik Grimler Reviewed-by: Simon Glass Reviewed-by: Minkyu Kang --- board/samsung/common/board.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c index 16ce5cb892..663d7ca991 100644 --- a/board/samsung/common/board.c +++ b/board/samsung/common/board.c @@ -223,7 +223,7 @@ int board_late_init(void) char mmcbootdev_str[16]; ret = uclass_first_device_err(UCLASS_CROS_EC, &dev); - if (ret && ret != -ENODEV) { + if (ret && ret != -ENODEV && ret != -EPFNOSUPPORT) { /* Force console on */ gd->flags &= ~GD_FLG_SILENT; -- cgit v1.2.1 From 40b77f2a3ac13a7547c1b7c9c51a4090869de8f4 Mon Sep 17 00:00:00 2001 From: Christophe Leroy Date: Thu, 11 May 2023 08:16:49 +0200 Subject: envtools lack extra settings since commit 86b9c3e4e4 ("env: Allow U-Boot scripts to be placed in After converting my targets from CFG_EXTRA_ENV_SETTINGS to CONFIG_EXTRA_ENV_TEXT as suggested by Tom, I discovered that fw_setenv doesn't set the entire defaut environment anymore. I tried to fix it with the below patch, but it fails qemu-x86 CI test, see https://source.denx.de/u-boot/custodians/u-boot-mpc8xx/-/pipelines/16326 That's the only CI test that fails AFAICS. Could you help with a solution ? This needs to be fixed. Thanks Christophe ---- >8 ---- From: Christophe Leroy Subject: [RFC PATCH] envtools: Fix default environment After converting some targets from CFG_EXTRA_ENV_SETTINGS to CONFIG_EXTRA_ENV_TEXT, default environment embedded in fw_env tool missed all extra settings. Commit 86b9c3e4e4 ("env: Allow U-Boot scripts to be placed in a .env file") restricted the inclusion of the content of that file to builds without USE_HOSTCC. But as mentionned in commit 79fc0c5f49 ("tools/env: cross-compile fw_printenv without setting HOSTCC"), HOSTCC and USE_HOSTCC are kept for code re-use. Remove the restricting so that settings included in a .env file are also added to fw_env tool. Fixes: 86b9c3e4e4 ("env: Allow U-Boot scripts to be placed in a .env file") Signed-off-by: Christophe Leroy --- Makefile | 2 +- include/env_default.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index fb02bba08f..a5ab5e3da9 100644 --- a/Makefile +++ b/Makefile @@ -2119,7 +2119,7 @@ tools/version.h: include/version.h $(Q)mkdir -p $(dir $@) $(call if_changed,copy) -envtools: scripts_basic $(version_h) $(timestamp_h) tools/version.h +envtools: u-boot-initial-env scripts_basic $(version_h) $(timestamp_h) tools/version.h $(Q)$(MAKE) $(build)=tools/env tools-only: export TOOLS_ONLY=y diff --git a/include/env_default.h b/include/env_default.h index c0df39d62f..b16c22d5a2 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -10,9 +10,7 @@ #include #include -#ifndef USE_HOSTCC #include -#endif #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED env_t embedded_environment __UBOOT_ENV_SECTION__(environment) = { -- cgit v1.2.1 From cd88058da36ef3e8bd9ef533f37185c7cfba21df Mon Sep 17 00:00:00 2001 From: Raphael Gallais-Pou Date: Thu, 11 May 2023 16:36:52 +0200 Subject: drivers: core: ofnode: fix typo in panel timing decode In case where a single timing resolution is implemented in the device-tree, the property is named "panel-timing", as specify in Linux kernel binding file: Documentation/devicetree/bindings/display/panel/panel-common.yaml # Display Timings panel-timing: description: Most display panels are restricted to a single resolution and require specific display timings. The panel-timing subnode expresses those timings. $ref: panel-timing.yaml# display-timings: description: Some display panels support several resolutions with different timings. The display-timings bindings supports specifying several timings and optionally specifying which is the native mode. $ref: display-timings.yaml# Fixes: 0347cc773270 ("drivers: core: ofnode: Add panel timing decode.") Signed-off-by: Raphael Gallais-Pou Signed-off-by: Patrick Delaunay --- arch/sandbox/dts/test.dts | 2 +- drivers/core/ofnode.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 6f9af489a3..ff9f9222e6 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -344,7 +344,7 @@ vsync-len = <13>; }; }; - panel-timings { + panel-timing { clock-frequency = <6500000>; hactive = <240>; vactive = <320>; diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index f49ee493d3..ec574c4460 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -998,7 +998,7 @@ int ofnode_decode_panel_timing(ofnode parent, u32 val = 0; int ret = 0; - timings = ofnode_find_subnode(parent, "panel-timings"); + timings = ofnode_find_subnode(parent, "panel-timing"); if (!ofnode_valid(timings)) return -EINVAL; memset(dt, 0, sizeof(*dt)); -- cgit v1.2.1 From 58f4bb833b22da464b94e3d0088338eb4e5f4dcc Mon Sep 17 00:00:00 2001 From: Johan Jonker Date: Wed, 10 May 2023 23:48:44 +0200 Subject: core: fdtaddr: use map_sysmem() as cast for the return (part 2) For the devfdt_get_addr_size_index_ptr() function use map_sysmem() function as cast for the return for use in sandbox. Signed-off-by: Johan Jonker --- drivers/core/fdtaddr.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/core/fdtaddr.c b/drivers/core/fdtaddr.c index 3b59b70c24..546db675aa 100644 --- a/drivers/core/fdtaddr.c +++ b/drivers/core/fdtaddr.c @@ -131,7 +131,10 @@ void *devfdt_get_addr_size_index_ptr(const struct udevice *dev, int index, { fdt_addr_t addr = devfdt_get_addr_size_index(dev, index, size); - return (addr == FDT_ADDR_T_NONE) ? NULL : (void *)(uintptr_t)addr; + if (addr == FDT_ADDR_T_NONE) + return NULL; + + return map_sysmem(addr, 0); } fdt_addr_t devfdt_get_addr_name(const struct udevice *dev, const char *name) -- cgit v1.2.1 From 6d677ea8ecd11c26e45dae1ed855ec275177b149 Mon Sep 17 00:00:00 2001 From: Manorit Chawdhry Date: Mon, 15 May 2023 12:22:42 +0530 Subject: environment: ti: rproc: fix remoteproc environment variables During refactor this seemed to have been missed. Fixes: 65dbb128fb45 ("include: environment: ti: Use .env for environment variables") Signed-off-by: Manorit Chawdhry --- include/environment/ti/k3_rproc.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/environment/ti/k3_rproc.env b/include/environment/ti/k3_rproc.env index 21dad7b241..87d9d76eba 100644 --- a/include/environment/ti/k3_rproc.env +++ b/include/environment/ti/k3_rproc.env @@ -7,14 +7,14 @@ boot_rprocs= rproc_load_and_boot_one= if load mmc ${bootpart} $loadaddr ${rproc_fw}; then if rproc load ${rproc_id} ${loadaddr} ${filesize}; then - rproc start ${rproc_id} + rproc start ${rproc_id}; fi; fi boot_rprocs_mmc= env set rproc_id; env set rproc_fw; for i in ${rproc_fw_binaries} ; do - if test -z ${rproc_id} ; then + if test -z "${rproc_id}" ; then env set rproc_id $i; else env set rproc_fw $i; -- cgit v1.2.1