Makefile: use shell to calculate map_size

[thirdparty/u-boot.git] / Makefile

diff --git a/Makefile b/Makefile
index 848541060e79ac56103f2e1b1095dd21ada9aa8f..6f695559d878e77988f759638dd8e0a365e8e692 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 VERSION = 2024
 PATCHLEVEL = 04
 SUBLEVEL =
-EXTRAVERSION = -rc3
+EXTRAVERSION = -rc4
 NAME =
 
 # *DOCUMENTATION*
@@ -1293,19 +1293,24 @@ spl/u-boot-spl.srec: spl/u-boot-spl FORCE
        $(call if_changed,objcopy)
 
 %.scif: %.srec
-       $(Q)$(MAKE) $(build)=arch/arm/mach-rmobile $@
+       $(Q)$(MAKE) $(build)=arch/arm/mach-renesas $@
 
 OBJCOPYFLAGS_u-boot-nodtb.bin := -O binary \
                $(if $(CONFIG_X86_16BIT_INIT),-R .start16 -R .resetvec) \
                $(if $(CONFIG_MPC85XX_HAVE_RESET_VECTOR),$(if $(CONFIG_OF_SEPARATE),-R .bootpg -R .resetvec))
 
 binary_size_check: u-boot-nodtb.bin FORCE
-       @file_size=$(shell wc -c u-boot-nodtb.bin | awk '{print $$1}') ; \
+       @file_size=$(shell wc -c u-boot-nodtb.bin | awk '{ print $$1 }') ; \
        map_size=$(shell cat u-boot.map | \
-               awk '/_image_copy_start/ {start = $$1} /_image_binary_end/ {end = $$1} END {if (start != "" && end != "") print "ibase=16; " toupper(end) " - " toupper(start)}' \
-               | sed 's/0X//g' \
-               | bc); \
-       if [ "" != "$$map_size" ]; then \
+               awk ' \
+                       /_image_copy_start/ { start = $$1 } \
+                       /_image_binary_end/ { end = $$1 } \
+                       END { \
+                               if (start != "" && end != "") \
+                                       print end " " start; \
+                       }' \
+               | sh -c 'read end start && echo $$((end - start))'); \
+       if [ -n "$$map_size" ]; then \
                if test $$map_size -ne $$file_size; then \
                        echo "u-boot.map shows a binary size of $$map_size" >&2 ; \
                        echo "  but u-boot-nodtb.bin shows $$file_size" >&2 ; \
@@ -2233,6 +2238,7 @@ clean: $(clean-dirs)
                -o -name modules.builtin -o -name '.tmp_*.o.*' \
                -o -name 'dsdt_generated.aml' -o -name 'dsdt_generated.asl.tmp' \
                -o -name 'dsdt_generated.c' \
+               -o -name 'generated_defconfig' \
                -o -name '*.efi' -o -name '*.gcno' -o -name '*.so' \) \
                -type f -print | xargs rm -f