diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-21 08:26:40 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-21 08:26:40 -0400 |
| commit | 2fa581ba910368d0f7f995fb906d6c5e4218b594 (patch) | |
| tree | fdbb131099e601f1500908398db119d7f2050225 /scripts | |
| parent | b0b13f4114d30b6756e0f6f3b5819d78de22541e (diff) | |
| parent | 56f01746ab5c6950bd0f76d02252ee4450f86659 (diff) | |
| download | u-boot-2fa581ba910368d0f7f995fb906d6c5e4218b594.tar.gz u-boot-2fa581ba910368d0f7f995fb906d6c5e4218b594.tar.bz2 u-boot-2fa581ba910368d0f7f995fb906d6c5e4218b594.zip | |
Merge git://git.denx.de/u-boot-sh
- Enable -ffunction-sections / -fdata-sections --gc-sections to SH
- RCar Gen3 updates
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/dtc/libfdt/fdt_overlay.c | 5 | ||||
| -rw-r--r-- | scripts/dtc/libfdt/libfdt.h | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/scripts/dtc/libfdt/fdt_overlay.c b/scripts/dtc/libfdt/fdt_overlay.c index be71873366..c090e6991e 100644 --- a/scripts/dtc/libfdt/fdt_overlay.c +++ b/scripts/dtc/libfdt/fdt_overlay.c @@ -879,3 +879,8 @@ err: return ret; } + +int fdt_overlay_apply_node(void *fdt, int target, void *fdto, int node) +{ + return overlay_apply_node(fdt, target, fdto, node); +} diff --git a/scripts/dtc/libfdt/libfdt.h b/scripts/dtc/libfdt/libfdt.h index fa63fffe28..421f90ad93 100644 --- a/scripts/dtc/libfdt/libfdt.h +++ b/scripts/dtc/libfdt/libfdt.h @@ -2032,6 +2032,13 @@ int fdt_del_node(void *fdt, int nodeoffset); */ int fdt_overlay_apply(void *fdt, void *fdto); +/** + * fdt_overlay_apply_node - Merges a node into the base device tree + * + * See overlay_apply_node() for details. + */ +int fdt_overlay_apply_node(void *fdt, int target, void *fdto, int node); + /**********************************************************************/ /* Debugging / informational functions */ /**********************************************************************/ |