From: Joe Hershberger <joe.hershberger@ni.com>
Date: Thu, 8 Nov 2012 10:19:09 +0000 (+0000)
Subject: Allow CONFIG_BOARD_SIZE_LIMIT to be specified in hex
X-Git-Tag: v2013.01-rc2~84
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d060e6f4416e667d718ad60636fdf6cbf5f1f576;p=u-boot

Allow CONFIG_BOARD_SIZE_LIMIT to be specified in hex

Use the printf command to convert the number in any valid format into
the expected decimal format.  The resulting errors should be printed to
stderr.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---

diff --git a/Makefile b/Makefile
index 2132ebf10f..de96861ea2 100644
--- a/Makefile
+++ b/Makefile
@@ -390,12 +390,12 @@ __LIBS := $(subst $(obj),,$(LIBS)) $(subst $(obj),,$(LIBBOARD))
 ifneq ($(CONFIG_BOARD_SIZE_LIMIT),)
 BOARD_SIZE_CHECK = \
 	@actual=`wc -c $@ | awk '{print $$1}'`; \
-	limit=$(CONFIG_BOARD_SIZE_LIMIT); \
+	limit=`printf "%d" $(CONFIG_BOARD_SIZE_LIMIT)`; \
 	if test $$actual -gt $$limit; then \
-		echo "$@ exceeds file size limit:"; \
-		echo "  limit:  $$limit bytes"; \
-		echo "  actual: $$actual bytes"; \
-		echo "  excess: $$((actual - limit)) bytes"; \
+		echo "$@ exceeds file size limit:" >&2 ; \
+		echo "  limit:  $$limit bytes" >&2 ; \
+		echo "  actual: $$actual bytes" >&2 ; \
+		echo "  excess: $$((actual - limit)) bytes" >&2; \
 		exit 1; \
 	fi
 else