[U-Boot] [PATCH v2] board/armltd/integrator/split_by_variant.sh: fix 'echo -n'
Andreas Bießmann
andreas.devel at googlemail.com
Fri Sep 24 21:20:40 CEST 2010
This patch fixes an error when running MAKEALL for ARM9.
On OS X /bin/sh uses builtin echo which does not utilise '-n' switch.
GNU manual for builtins recomend to use here-document style to solve
this portability issue.
This patch removes the usage of 'echo -n' and replace by here-document
style or a oneline echo command.
Signed-off-by: Andreas Bießmann <andreas.devel at googlemail.com>
CC: Peter Pearse <peter.pearse at arm.com>
---
v1: first try, replace each occurrence of 'echo' by here-document
v2: replace oneliners by single 'echo' as sugested by Mike
board/armltd/integrator/split_by_variant.sh | 129 ++++++++++++---------------
1 files changed, 57 insertions(+), 72 deletions(-)
diff --git a/board/armltd/integrator/split_by_variant.sh b/board/armltd/integrator/split_by_variant.sh
index 702b436..d869dd2 100755
--- a/board/armltd/integrator/split_by_variant.sh
+++ b/board/armltd/integrator/split_by_variant.sh
@@ -10,12 +10,12 @@ then
# ---------------------------------------------------------
# Set the platform defines
# ---------------------------------------------------------
-echo -n "/* Integrator configuration implied " > ${config_file}
-echo " by Makefile target */" >> ${config_file}
-echo -n "#define CONFIG_INTEGRATOR" >> ${config_file}
-echo " /* Integrator board */" >> ${config_file}
-echo -n "#define CONFIG_ARCH_INTEGRATOR" >> ${config_file}
-echo " 1 /* Integrator/AP */" >> ${config_file}
+cat > ${config_file} << _EOF
+/* Integrator configuration implied by Makefile target */
+#define CONFIG_INTEGRATOR /* Integrator board */
+#define CONFIG_ARCH_INTEGRATOR 1 /* Integrator/AP */
+_EOF
+
# ---------------------------------------------------------
# Set the core module defines according to Core Module
# ---------------------------------------------------------
@@ -50,37 +50,37 @@ else
ap720t_config)
cpu="arm720t"
- echo -n "#define CONFIG_CM720T" >> ${config_file}
- echo " 1 /* CPU core is ARM720T */ " >> ${config_file}
+ echo "#define CONFIG_CM720T 1 /* CPU core is ARM720T */" \
+ >> ${config_file}
variant="Core module CM720T"
;;
ap922_XA10_config)
cpu="arm_intcm"
variant="unported core module CM922T_XA10"
- echo -n "#define CONFIG_CM922T_XA10" >> ${config_file}
- echo " 1 /* CPU core is ARM922T_XA10 */" >> ${config_file}
+ echo "#define CONFIG_CM922T_XA10 1 /* CPU core is ARM922T_XA10 */" \
+ >> ${config_file}
;;
ap920t_config)
cpu="arm920t"
variant="Core module CM920T"
- echo -n "#define CONFIG_CM920T" >> ${config_file}
- echo " 1 /* CPU core is ARM920T */" >> ${config_file}
+ echo "#define CONFIG_CM920T 1 /* CPU core is ARM920T */" \
+ >> ${config_file}
;;
ap926ejs_config)
cpu="arm926ejs"
variant="Core module CM926EJ-S"
- echo -n "#define CONFIG_CM926EJ_S" >> ${config_file}
- echo " 1 /* CPU core is ARM926EJ-S */ " >> ${config_file}
+ echo "#define CONFIG_CM926EJ_S 1 /* CPU core is ARM926EJ-S */" \
+ >> ${config_file}
;;
ap946es_config)
cpu="arm946es"
variant="Core module CM946E-S"
- echo -n "#define CONFIG_CM946E_S" >> ${config_file}
- echo " 1 /* CPU core is ARM946E-S */ " >> ${config_file}
+ echo "#define CONFIG_CM946E_S 1 /* CPU core is ARM946E-S */" \
+ >> ${config_file}
;;
*)
@@ -94,33 +94,26 @@ fi
case "$cpu" in
arm_intcm)
- echo "/* Core module undefined/not ported */" >> ${config_file}
- echo "#define CONFIG_ARM_INTCM 1" >> ${config_file}
- echo -n "#undef CONFIG_CM_MULTIPLE_SSRAM" >> ${config_file}
- echo -n " /* CM may not have " >> ${config_file}
- echo "multiple SSRAM mapping */" >> ${config_file}
- echo -n "#undef CONFIG_CM_SPD_DETECT " >> ${config_file}
- echo -n " /* CM may not support SPD " >> ${config_file}
- echo "query */" >> ${config_file}
- echo -n "#undef CONFIG_CM_REMAP " >> ${config_file}
- echo -n " /* CM may not support " >> ${config_file}
- echo "remapping */" >> ${config_file}
- echo -n "#undef CONFIG_CM_INIT " >> ${config_file}
- echo -n " /* CM may not have " >> ${config_file}
- echo "initialization reg */" >> ${config_file}
- echo -n "#undef CONFIG_CM_TCRAM " >> ${config_file}
- echo " /* CM may not have TCRAM */" >> ${config_file}
- echo -n " /* May not be processor " >> ${config_file}
- echo "without cache support */" >> ${config_file}
- echo "#define CONFIG_SYS_NO_ICACHE 1" >> ${config_file}
- echo "#define CONFIG_SYS_NO_DCACHE 1" >> ${config_file}
+ cat >> ${config_file} << _EOF
+/* Core module undefined/not ported */
+#define CONFIG_ARM_INTCM 1
+#undef CONFIG_CM_MULTIPLE_SSRAM /* CM may not have multiple SSRAM mapping */
+#undef CONFIG_CM_SPD_DETECT /* CM may not support SPD query */
+#undef CONFIG_CM_REMAP /* CM may not support remapping */
+#undef CONFIG_CM_INIT /* CM may not have initialization reg */
+#undef CONFIG_CM_TCRAM /* CM may not have TCRAM */
+/* May not be processor without cache support */
+#define CONFIG_SYS_NO_ICACHE 1
+#define CONFIG_SYS_NO_DCACHE 1
+_EOF
;;
arm720t)
- echo -n " /* May not be processor " >> ${config_file}
- echo "without cache support */" >> ${config_file}
- echo "#define CONFIG_SYS_NO_ICACHE 1" >> ${config_file}
- echo "#define CONFIG_SYS_NO_DCACHE 1" >> ${config_file}
+ cat >> ${config_file} << _EOF
+/* May not be processor without cache support */
+#define CONFIG_SYS_NO_ICACHE 1
+#define CONFIG_SYS_NO_DCACHE 1
+_EOF
;;
esac
@@ -129,12 +122,11 @@ else
# ---------------------------------------------------------
# Set the platform defines
# ---------------------------------------------------------
-echo -n "/* Integrator configuration implied " > ${config_file}
-echo " by Makefile target */" >> ${config_file}
-echo -n "#define CONFIG_INTEGRATOR" >> ${config_file}
-echo " /* Integrator board */" >> ${config_file}
-echo -n "#define CONFIG_ARCH_CINTEGRATOR" >> ${config_file}
-echo " 1 /* Integrator/CP */" >> ${config_file}
+cat >> ${config_file} << _EOF
+/* Integrator configuration implied by Makefile target */
+#define CONFIG_INTEGRATOR /* Integrator board */
+#define CONFIG_ARCH_CINTEGRATOR 1 /* Integrator/CP */
+_EOF
cpu="arm_intcm"
variant="unknown core module"
@@ -163,37 +155,37 @@ else
cp922_XA10_config)
cpu="arm_intcm"
variant="unported core module CM922T_XA10"
- echo -n "#define CONFIG_CM922T_XA10" >> ${config_file}
- echo " 1 /* CPU core is ARM922T_XA10 */" >> ${config_file}
+ echo "#define CONFIG_CM922T_XA10 1 /* CPU core is ARM922T_XA10 */" \
+ >> ${config_file}
;;
cp920t_config)
cpu="arm920t"
variant="Core module CM920T"
- echo -n "#define CONFIG_CM920T" >> ${config_file}
- echo " 1 /* CPU core is ARM920T */" >> ${config_file}
+ echo "#define CONFIG_CM920T 1 /* CPU core is ARM920T */" \
+ >> ${config_file}
;;
cp926ejs_config)
cpu="arm926ejs"
variant="Core module CM926EJ-S"
- echo -n "#define CONFIG_CM926EJ_S" >> ${config_file}
- echo " 1 /* CPU core is ARM926EJ-S */ " >> ${config_file}
+ echo "#define CONFIG_CM926EJ_S 1 /* CPU core is ARM926EJ-S */" \
+ >> ${config_file}
;;
cp946es_config)
cpu="arm946es"
variant="Core module CM946E-S"
- echo -n "#define CONFIG_CM946E_S" >> ${config_file}
- echo " 1 /* CPU core is ARM946E-S */ " >> ${config_file}
+ echo "#define CONFIG_CM946E_S 1 /* CPU core is ARM946E-S */" \
+ >> ${config_file}
;;
cp1136_config)
cpu="arm1136"
variant="Core module CM1136EJF-S"
- echo -n "#define CONFIG_CM1136EJF_S" >> ${config_file}
- echo " 1 /* CPU core is ARM1136JF-S */ " >> ${config_file}
+ echo "#define CONFIG_CM1136EJF_S 1 /* CPU core is ARM1136JF-S */" \
+ >> ${config_file}
;;
*)
@@ -208,22 +200,15 @@ fi
if [ "$cpu" = "arm_intcm" ]
then
- echo "/* Core module undefined/not ported */" >> ${config_file}
- echo "#define CONFIG_ARM_INTCM 1" >> ${config_file}
- echo -n "#undef CONFIG_CM_MULTIPLE_SSRAM" >> ${config_file}
- echo -n " /* CM may not have " >> ${config_file}
- echo "multiple SSRAM mapping */" >> ${config_file}
- echo -n "#undef CONFIG_CM_SPD_DETECT " >> ${config_file}
- echo -n " /* CM may not support SPD " >> ${config_file}
- echo "query */" >> ${config_file}
- echo -n "#undef CONFIG_CM_REMAP " >> ${config_file}
- echo -n " /* CM may not support " >> ${config_file}
- echo "remapping */" >> ${config_file}
- echo -n "#undef CONFIG_CM_INIT " >> ${config_file}
- echo -n " /* CM may not have " >> ${config_file}
- echo "initialization reg */" >> ${config_file}
- echo -n "#undef CONFIG_CM_TCRAM " >> ${config_file}
- echo " /* CM may not have TCRAM */" >> ${config_file}
+ cat >> ${config_file} << _EOF
+/* Core module undefined/not ported */
+#define CONFIG_ARM_INTCM 1
+#undef CONFIG_CM_MULTIPLE_SSRAM /* CM may not have multiple SSRAM mapping */
+#undef CONFIG_CM_SPD_DETECT /* CM may not support SPD query */
+#undef CONFIG_CM_REMAP /* CM may not support remapping */
+#undef CONFIG_CM_INIT /* CM may not have initialization reg */
+#undef CONFIG_CM_TCRAM /* CM may not have TCRAM */
+_EOF
fi
fi # ap
--
1.7.3
More information about the U-Boot
mailing list