diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | arch/sandbox/dts/test.dts | 2 | ||||
| -rw-r--r-- | board/samsung/common/board.c | 2 | ||||
| -rw-r--r-- | drivers/core/fdtaddr.c | 5 | ||||
| -rw-r--r-- | drivers/core/ofnode.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/s5p_sdhci.c | 2 | ||||
| -rw-r--r-- | drivers/video/Kconfig | 2 | ||||
| -rw-r--r-- | include/env_default.h | 2 | ||||
| -rw-r--r-- | include/environment/ti/k3_rproc.env | 4 |
9 files changed, 12 insertions, 11 deletions
@@ -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/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/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; 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) 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)); 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; 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. 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 <env_callback.h> #include <linux/stringify.h> -#ifndef USE_HOSTCC #include <generated/environment.h> -#endif #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED env_t embedded_environment __UBOOT_ENV_SECTION__(environment) = { 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; |