summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-04-21 02:48:02 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2018-04-21 02:48:02 -0700
commit3463b6952221534b46418edd694a86ff7e355d9b (patch)
tree4ae8724b3d5ff7fcbc457c71d80da54b646a2c76 /scripts
parent3866b9c77840ed6000d55aff08ff1cd18e1ef07b (diff)
parent81a6413ed7a55270dca11bca9bf76b9535e32795 (diff)
Merge "Merge android-4.4.127 (d6bbe8b) into msm-4.4"
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.lib13
1 files changed, 9 insertions, 4 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 9f9cd525960f..16dc35023e87 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -275,6 +275,11 @@ cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) || \
# DTC
# ---------------------------------------------------------------------------
+# Disable noisy checks by default
+ifeq ($(KBUILD_ENABLE_EXTRA_GCC_CHECKS),)
+DTC_FLAGS += -Wno-unit_address_vs_reg
+endif
+
# Generate an assembly file to wrap the output of the device tree compiler
quiet_cmd_dt_S_dtb= DTB $@
cmd_dt_S_dtb= \
@@ -282,11 +287,11 @@ cmd_dt_S_dtb= \
echo '\#include <asm-generic/vmlinux.lds.h>'; \
echo '.section .dtb.init.rodata,"a"'; \
echo '.balign STRUCT_ALIGNMENT'; \
- echo '.global __dtb_$(*F)_begin'; \
- echo '__dtb_$(*F)_begin:'; \
+ echo '.global __dtb_$(subst -,_,$(*F))_begin'; \
+ echo '__dtb_$(subst -,_,$(*F))_begin:'; \
echo '.incbin "$<" '; \
- echo '__dtb_$(*F)_end:'; \
- echo '.global __dtb_$(*F)_end'; \
+ echo '__dtb_$(subst -,_,$(*F))_end:'; \
+ echo '.global __dtb_$(subst -,_,$(*F))_end'; \
echo '.balign STRUCT_ALIGNMENT'; \
) > $@