| Jan Kundrát | 302a851 | 2020-10-16 20:57:59 +0000 | [diff] [blame] | 1 | From 1ac1000adde5805b1aa385382f759d1186284d46 Mon Sep 17 00:00:00 2001 |
| 2 | From: Masahiro Yamada <yamada.masahiro@socionext.com> |
| 3 | Date: Wed, 19 Sep 2018 11:35:57 +0900 |
| 4 | Subject: [PATCH 3/3] kbuild: fix # escaping in appending U-Boot own DT |
| 5 | |
| 6 | The escape sequence '\#' does not work for the latest GNU Make from |
| 7 | the git tree. |
| 8 | |
| 9 | Replace it with $(pound) as Linux did. |
| 10 | |
| 11 | Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> |
| 12 | --- |
| 13 | scripts/Makefile.lib | 2 +- |
| 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 15 | |
| 16 | diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib |
| 17 | index f8c3fff1d1..4dceb6d1b3 100644 |
| 18 | --- a/scripts/Makefile.lib |
| 19 | +++ b/scripts/Makefile.lib |
| 20 | @@ -299,7 +299,7 @@ quiet_cmd_dtc = DTC $@ |
| 21 | # Modified for U-Boot |
| 22 | # Bring in any U-Boot-specific include at the end of the file |
| 23 | cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ |
| 24 | - (cat $<; $(if $(u_boot_dtsi),echo '\#include "$(u_boot_dtsi)"')) > $(pre-tmp); \ |
| 25 | + (cat $<; $(if $(u_boot_dtsi),echo '$(pound)include "$(u_boot_dtsi)"')) > $(pre-tmp); \ |
| 26 | $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $(pre-tmp) ; \ |
| 27 | $(DTC) -O dtb -o $@ -b 0 \ |
| 28 | -i $(dir $<) $(DTC_FLAGS) \ |
| 29 | -- |
| 30 | 2.28.0 |
| 31 | |