Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 23:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '2023-05-15-assorted-bugfixes'

Browse source 
- Merge in a long-standing fix for some exynos platforms, correct a
  Kconfig description, fix some env issues, fix an issue in
  devfdt_get_addr_size_index_ptr and look for "panel-timings" not
  "panel-timing" per upstream binding.
This commit is contained in:
Tom Rini 2023-05-16 11:16:42 -04:00
commit 5645a50a86
9 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -2119,7 +2119,7 @@ tools/version.h: include/version.h
$(Q)mkdir -p $(dir $@) $(Q)mkdir -p $(dir $@)
$(call if_changed,copy) $(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 $(Q)$(MAKE) $(build)=tools/env
tools-only: export TOOLS_ONLY=y tools-only: export TOOLS_ONLY=y

2
arch/sandbox/dts/test.dts
View file

@ -344,7 +344,7 @@
vsync-len = <13>; vsync-len = <13>;
}; };
}; };
panel-timings { panel-timing {
clock-frequency = <6500000>; clock-frequency = <6500000>;
hactive = <240>; hactive = <240>;
vactive = <320>; vactive = <320>;

2
board/samsung/common/board.c
View file

@ -223,7 +223,7 @@ int board_late_init(void)
char mmcbootdev_str[16]; char mmcbootdev_str[16];
ret = uclass_first_device_err(UCLASS_CROS_EC, &dev); ret = uclass_first_device_err(UCLASS_CROS_EC, &dev);
if (ret && ret != -ENODEV) { if (ret && ret != -ENODEV && ret != -EPFNOSUPPORT) {
/* Force console on */ /* Force console on */
gd->flags &= ~GD_FLG_SILENT; gd->flags &= ~GD_FLG_SILENT;

5
drivers/core/fdtaddr.c
View file

@ -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); 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) fdt_addr_t devfdt_get_addr_name(const struct udevice *dev, const char *name)

2
drivers/core/ofnode.c
View file

@ -998,7 +998,7 @@ int ofnode_decode_panel_timing(ofnode parent,
u32 val = 0; u32 val = 0;
int ret = 0; int ret = 0;
timings = ofnode_find_subnode(parent, "panel-timings"); timings = ofnode_find_subnode(parent, "panel-timing");
if (!ofnode_valid(timings)) if (!ofnode_valid(timings))
return -EINVAL; return -EINVAL;
memset(dt, 0, sizeof(*dt)); memset(dt, 0, sizeof(*dt));

2
drivers/mmc/s5p_sdhci.c
View file

@ -90,7 +90,7 @@ static int s5p_sdhci_core_init(struct sdhci_host *host)
host->name = S5P_NAME; host->name = S5P_NAME;
host->quirks = SDHCI_QUIRK_NO_HISPD_BIT | SDHCI_QUIRK_BROKEN_VOLTAGE | 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; SDHCI_QUIRK_WAIT_SEND_CMD | SDHCI_QUIRK_USE_WIDE8;
host->max_clk = 52000000; host->max_clk = 52000000;
host->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195; host->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195;

2
drivers/video/Kconfig
View file

@ -962,7 +962,7 @@ config BMP_32BPP
endif # VIDEO endif # VIDEO
config SPL_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 depends on SPL_DM
help help
The video subsystem adds a small amount of overhead to the image. The video subsystem adds a small amount of overhead to the image.

2
include/env_default.h
View file

@ -10,9 +10,7 @@
#include <env_callback.h> #include <env_callback.h>
#include <linux/stringify.h> #include <linux/stringify.h>
#ifndef USE_HOSTCC
#include <generated/environment.h> #include <generated/environment.h>
#endif
#ifdef DEFAULT_ENV_INSTANCE_EMBEDDED #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED
env_t embedded_environment __UBOOT_ENV_SECTION__(environment) = { env_t embedded_environment __UBOOT_ENV_SECTION__(environment) = {

4
include/environment/ti/k3_rproc.env
View file

@ -7,14 +7,14 @@ boot_rprocs=
rproc_load_and_boot_one= rproc_load_and_boot_one=
if load mmc ${bootpart} $loadaddr ${rproc_fw}; then if load mmc ${bootpart} $loadaddr ${rproc_fw}; then
if rproc load ${rproc_id} ${loadaddr} ${filesize}; then if rproc load ${rproc_id} ${loadaddr} ${filesize}; then
rproc start ${rproc_id} rproc start ${rproc_id};
fi; fi;
fi fi
boot_rprocs_mmc= boot_rprocs_mmc=
env set rproc_id; env set rproc_id;
env set rproc_fw; env set rproc_fw;
for i in ${rproc_fw_binaries} ; do for i in ${rproc_fw_binaries} ; do
if test -z ${rproc_id} ; then if test -z "${rproc_id}" ; then
env set rproc_id $i; env set rproc_id $i;
else else
env set rproc_fw $i; env set rproc_fw $i;