aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2014-04-12 11:59:05 +0000
committerGabor Juhos <juhosg@openwrt.org>2014-04-12 11:59:05 +0000
commit17f848538cb9d219533e485642514d4085766604 (patch)
tree0e4ea1018c551482728a7dcc9bbfed9a5a725946 /target/linux/ar71xx
parentcd7560671259cc0a279c1e61f96695fcfc906bf4 (diff)
downloadupstream-17f848538cb9d219533e485642514d4085766604.tar.gz
upstream-17f848538cb9d219533e485642514d4085766604.tar.bz2
upstream-17f848538cb9d219533e485642514d4085766604.zip
ar71xx: fix image generation
Move the comments out from the shell script to fix build breakage introduced in r40464. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 40466
Diffstat (limited to 'target/linux/ar71xx')
-rw-r--r--target/linux/ar71xx/image/Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 6234ba2e89..c21c470755 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -149,11 +149,15 @@ endef
endif
# $(1): name of the 1st file.
+# $(2): size limit of the 1st file if it is greater than 262144, or
+# the erase size of the flash if it is greater than zero and less
+# than 262144
# $(3): name of the 2nd file.
+# $(4): size limit of the 2nd file if $(2) is greater than 262144, otherwise
+# it is the size limit of the output file
# $(5): name of the output file.
# $(6): padding size.
define CatFiles
- # $(4): size limit of the output file.
if [ $(2) -eq 0 ]; then \
filename="$(3)"; fstype=$$$${filename##*\.}; \
case "$$$${fstype}" in \
@@ -174,8 +178,6 @@ define CatFiles
echo "Warning: $(5) is too big (> $(4) bytes)" >&2; \
rm -f $(5); \
fi; \
- # $(2): size limit of the 1st file.
- # $(4): size limit of the 2nd file.
else if [ $(2) -gt 262144 ]; then \
if [ `stat -c%s "$(1)"` -gt $(2) ]; then \
echo "Warning: $(1) is too big (> $(2) bytes)" >&2; \
@@ -184,8 +186,6 @@ define CatFiles
else \
( dd if=$(1) bs=$(2) conv=sync; dd if=$(3) ) > $(5); \
fi; fi; \
- # $(2): padding size for the 2nd file.
- # $(4): size limit of the output file.
else \
( dd if=$(1) bs=$(2) conv=sync; dd if=$(3) ) > $(5); \
if [ `stat -c%s $(5)` -gt $(4) ]; then \