Suffix for RAM and silent console images versions, indentation fix 2014-11-19
authorPiotr Dymacz <pepe2k@gmail.com>
Wed, 19 Nov 2014 08:35:23 +0000 (09:35 +0100)
committerPiotr Dymacz <pepe2k@gmail.com>
Wed, 19 Nov 2014 08:41:54 +0000 (09:41 +0100)
Makefile

index 4245a0acb3f2059d2dc8b174ff330184227346f6..755eb0023de0e3981deacf69d72035063bbb51fd 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -211,7 +211,15 @@ gl-inet:
        @make --no-print-directory show_size
 
 ifdef CONFIG_SKIP_LOWLEVEL_INIT
+  ifdef DISABLE_CONSOLE_OUTPUT
+show_size:     export UBOOT_FILE_NAME_SUFFIX=__SILENT-CONSOLE__RAM
+  else
 show_size:     export UBOOT_FILE_NAME_SUFFIX=__RAM
+  endif
+else
+  ifdef DISABLE_CONSOLE_OUTPUT
+show_size:     export UBOOT_FILE_NAME_SUFFIX=__SILENT-CONSOLE
+  endif
 endif
 show_size:
 ifdef COMPRESSED_UBOOT
@@ -235,10 +243,10 @@ endif
        @`echo ' *'$(UBOOT_FILE_NAME)$(UBOOT_FILE_NAME_SUFFIX).bin >> $(BUILD_TOPDIR)/bin/$(UBOOT_FILE_NAME)$(UBOOT_FILE_NAME_SUFFIX).md5`
 # Do not check image size for RAM version
 ifndef CONFIG_SKIP_LOWLEVEL_INIT
-       @if [ "`wc -c < $(BUILD_TOPDIR)/bin/$(UBOOT_FILE_NAME).bin`" -gt "`/bin/echo '$(MAX_UBOOT_SIZE)*1024' | bc`" ]; then \
+       @if [ "`wc -c < $(BUILD_TOPDIR)/bin/$(UBOOT_FILE_NAME)$(UBOOT_FILE_NAME_SUFFIX).bin`" -gt "`/bin/echo '$(MAX_UBOOT_SIZE)*1024' | bc`" ]; then \
                        /bin/echo -e "\e[31m\n**************************************************"; \
-            /bin/echo "*     WARNING: U-BOOT IMAGE SIZE IS TOO BIG!     *"; \
-            /bin/echo -e "**************************************************"; \
+                       /bin/echo "*     WARNING: U-BOOT IMAGE SIZE IS TOO BIG!     *"; \
+                       /bin/echo -e "**************************************************"; \
        fi;
 endif
        @/bin/echo -ne "\e[0m"