Merge tag 'u-boot-imx-20191009' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / Makefile

diff --git a/Makefile b/Makefile
index 80b7811f7be8caa2b7fa68bb54be0fc906166313..842bc6c11b6b7191452a3031ef4c23200bc1afc2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -337,14 +337,18 @@ endif
 #  KBUILD_MODULES := 1
 #endif
 
+# Check ths size of a binary:
+# Args:
+#   $1: File to check
+#   #2: Size limit in bytes (decimal or 0xhex)
 define size_check
        actual=$$( wc -c $1 | awk '{print $$1}'); \
        limit=$$( printf "%d" $2 ); \
        if test $$actual -gt $$limit; then \
                echo "$1 exceeds file size limit:" >&2; \
-               echo "  limit:  $$limit bytes" >&2; \
-               echo "  actual: $$actual bytes" >&2; \
-               echo "  excess: $$((actual - limit)) bytes" >&2; \
+               echo "  limit:  $$(printf %#x bytes $$limit) bytes" >&2; \
+               echo "  actual: $$(printf %#x $$actual) bytes" >&2; \
+               echo "  excess: $$(printf %#x $$((actual - limit))) bytes" >&2;\
                exit 1; \
        fi
 endef
@@ -1213,7 +1217,9 @@ u-boot.ldr:       u-boot
 # Use 'make BINMAN_DEBUG=1' to enable debugging
 quiet_cmd_binman = BINMAN  $@
 cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \
-                build -u -d u-boot.dtb -O . -m \
+                --toolpath $(objtree)/tools \
+               $(if $(BINMAN_VERBOSE),-v$(BINMAN_VERBOSE)) \
+               build -u -d u-boot.dtb -O . -m \
                -I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \
                $(BINMAN_$(@F))