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.
Signed-off-by: Andreas Bießmann andreas.de...@googlemail.com
CC: Peter Pearse peter.pea...@arm.com
---
board/armltd/integrator/split_by_variant.sh | 139 +--
1 files changed, 67 insertions(+), 72 deletions(-)
diff --git a/board/armltd/integrator/split_by_variant.sh
b/board/armltd/integrator/split_by_variant.sh
index 702b436..0713fd1 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}
-echoby Makefile target */ ${config_file}
-echo -n#define CONFIG_INTEGRATOR ${config_file}
-echo/* Integrator board */${config_file}
-echo -n#define CONFIG_ARCH_INTEGRATOR ${config_file}
-echo1 /* 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,42 @@ else
ap720t_config)
cpu=arm720t
- echo -n #define CONFIG_CM720T ${config_file}
- echo 1 /* CPU core is ARM720T */ ${config_file}
+ cat ${config_file} _EOF
+#define CONFIG_CM720T 1 /* CPU core is ARM720T */
+_EOF
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}
+ cat ${config_file} _EOF
+#define CONFIG_CM922T_XA10 1 /* CPU core is ARM922T_XA10 */
+_EOF
;;
ap920t_config)
cpu=arm920t
variant=Core module CM920T
- echo -n #define CONFIG_CM920T ${config_file}
- echo 1 /* CPU core is ARM920T */ ${config_file}
+ cat ${config_file} _EOF
+#define CONFIG_CM920T 1 /* CPU core is ARM920T */
+_EOF
;;
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}
+ cat ${config_file} _EOF
+#define CONFIG_CM926EJ_S 1 /* CPU core is ARM926EJ-S */
+_EOF
;;
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}
+ cat ${config_file} _EOF
+#define CONFIG_CM946E_S 1 /* CPU core is ARM946E-S */
+_EOF
;;
*)
@@ -94,33 +99,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}
- echomultiple SSRAM mapping */ ${config_file}
- echo -n #undef CONFIG_CM_SPD_DETECT${config_file}
- echo -n /* CM may not support SPD ${config_file}
- echoquery */ ${config_file}
- echo -n #undef CONFIG_CM_REMAP ${config_file}
- echo -n /* CM may not support ${config_file}
- echoremapping */ ${config_file}
- echo -n #undef CONFIG_CM_INIT ${config_file}
- echo -n /* CM may not have${config_file}
- echoinitialization 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}
- echowithout 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
