diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-25 08:20:54 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-25 08:20:54 -0500 |
| commit | 53e0fef5a74ac10618da083a01bbf97b4387a3dd (patch) | |
| tree | 2e3d22c903796c967a4855a27f996b7705603c74 /scripts/Makefile.lib | |
| parent | cbe607b920bc0827d8fe379ed4f5ae4e2058513e (diff) | |
| parent | 2f7aa89703738b0c37e34120319bab567a8672bd (diff) | |
| download | u-boot-53e0fef5a74ac10618da083a01bbf97b4387a3dd.tar.gz u-boot-53e0fef5a74ac10618da083a01bbf97b4387a3dd.tar.xz u-boot-53e0fef5a74ac10618da083a01bbf97b4387a3dd.zip | |
Merge branch '2021-02-24-assorted-fixes'
- squashfs, btrfs fixes
- Kconfig CONFIG logic fixes
- hikey DM migration
- Some portability fixes for the build system
- Assorted code cleanups
Diffstat (limited to 'scripts/Makefile.lib')
| -rw-r--r-- | scripts/Makefile.lib | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 56e9d54242..78543c6dd1 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -326,8 +326,7 @@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ -d $(depfile).dtc.tmp $(dtc-tmp) || \ (echo "Check $(shell pwd)/$(pre-tmp) for errors" && false) \ ; \ - cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) ; \ - sed -i "s:$(pre-tmp):$(<):" $(depfile) + sed "s:$(pre-tmp):$(<):" $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) $(obj)/%.dtb: $(src)/%.dts FORCE $(call if_changed_dep,dtc) |