projects
/
platform
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cbacacd
)
Correct SPL uses of CMD_FDT
author
Simon Glass
<sjg@chromium.org>
Sun, 5 Feb 2023 22:36:30 +0000
(15:36 -0700)
committer
Tom Rini
<trini@konsulko.com>
Thu, 9 Feb 2023 21:32:25 +0000
(16:32 -0500)
This converts 2 usages of this option to the non-SPL form, since there is
no SPL_CMD_FDT defined in Kconfig
Signed-off-by: Simon Glass <sjg@chromium.org>
boot/bootm.c
patch
|
blob
|
history
boot/image-fdt.c
patch
|
blob
|
history
diff --git
a/boot/bootm.c
b/boot/bootm.c
index 56b82bbb8b7439efbf9c6b5bc09c2e7c42b3cb08..2eec60ec7b566004c82d2dbde0b23d812cceb3ad 100644
(file)
--- a/
boot/bootm.c
+++ b/
boot/bootm.c
@@
-313,7
+313,7
@@
int bootm_find_images(int flag, int argc, char *const argv[], ulong start,
return 1;
}
- if (
CONFIG_IS_ENABLED(
CMD_FDT))
+ if (
IS_ENABLED(CONFIG_
CMD_FDT))
set_working_fdt_addr(map_to_sysmem(images.ft_addr));
#endif
diff --git
a/boot/image-fdt.c
b/boot/image-fdt.c
index b830a0ab4187bd3e265167f712e9a7941c0b45cd..408abce096fe6b889523efaa7a2a3be638bff94b 100644
(file)
--- a/
boot/image-fdt.c
+++ b/
boot/image-fdt.c
@@
-272,7
+272,7
@@
int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size)
*of_flat_tree = of_start;
*of_size = of_len;
- if (
CONFIG_IS_ENABLED(
CMD_FDT))
+ if (
IS_ENABLED(CONFIG_
CMD_FDT))
set_working_fdt_addr(map_to_sysmem(*of_flat_tree));
return 0;