diff options
| author | Tom Rini <[email protected]> | 2023-05-16 11:16:42 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-05-16 11:16:42 -0400 |
| commit | 5645a50a8639a53856bcda60f5eb9e07a5bd31a9 (patch) | |
| tree | 30c9ab7fd5b86a4a74aa554720cdb3fcaa67c8a0 /include | |
| parent | c21fc9e1529e22c7acffe9bec7c0500ea15559dc (diff) | |
| parent | 6d677ea8ecd11c26e45dae1ed855ec275177b149 (diff) | |
Merge branch '2023-05-15-assorted-bugfixes'
- 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.
Diffstat (limited to 'include')
| -rw-r--r-- | include/env_default.h | 2 | ||||
| -rw-r--r-- | include/environment/ti/k3_rproc.env | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/env_default.h b/include/env_default.h index c0df39d62f9..b16c22d5a28 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 21dad7b2412..87d9d76eba4 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; |