Merge patch series "zlib: Address CVE-2016-9841"

[J-u-boot.git] / Makefile

diff --git a/Makefile b/Makefile
index 91afee668e3134c8237020fad25bef879e9504d7..7321fe1499e6cc50d10e184b770e84c54c413f03 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 VERSION = 2024
 PATCHLEVEL = 04
 SUBLEVEL =
-EXTRAVERSION = -rc4
+EXTRAVERSION =
 NAME =
 
 # *DOCUMENTATION*
@@ -1300,12 +1300,17 @@ OBJCOPYFLAGS_u-boot-nodtb.bin := -O binary \
                $(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 ; \
@@ -1355,7 +1360,7 @@ u-boot-nodtb.bin: u-boot FORCE
 
 u-boot.ldr:    u-boot
                $(CREATE_LDR_ENV)
-               $(LDR) -T $(CONFIG_CPU) -c $@ $< $(LDR_FLAGS)
+               $(LDR) -T $(CONFIG_LDR_CPU) -c $@ $< $(LDR_FLAGS)
                $(BOARD_SIZE_CHECK)
 
 # binman
@@ -1958,6 +1963,7 @@ define filechk_version.h
        echo \#define U_BOOT_VERSION_NUM $(VERSION); \
        echo \#define U_BOOT_VERSION_NUM_PATCH $$(echo $(PATCHLEVEL) | \
                sed -e "s/^0*//"); \
+       echo \#define HOST_ARCH $(HOST_ARCH); \
        echo \#define CC_VERSION_STRING \"$$(LC_ALL=C $(CC) --version | head -n 1)\"; \
        echo \#define LD_VERSION_STRING \"$$(LC_ALL=C $(LD) --version | head -n 1)\"; )
 endef
@@ -2194,7 +2200,8 @@ CLEAN_FILES += include/autoconf.mk* include/bmp_logo.h include/bmp_logo_data.h \
               mkimage-out.spl.mkimage mkimage.spl.mkimage imx-boot.map \
               itb.fit.fit itb.fit.itb itb.map spl.map mkimage-out.rom.mkimage \
               mkimage.rom.mkimage mkimage-in-simple-bin* rom.map simple-bin* \
-              idbloader-spi.img lib/efi_loader/helloworld_efi.S *.itb
+              idbloader-spi.img lib/efi_loader/helloworld_efi.S *.itb \
+              Test* capsule.*.efi-capsule capsule*.map
 
 # Directories & files removed with 'make mrproper'
 MRPROPER_DIRS  += include/config include/generated spl tpl vpl \