On 13/06/2017 13:54, Andrew Jones wrote:
> Signed-off-by: Andrew Jones <drjones@xxxxxxxxxx>
Reviewed-by: Laurent Vivier <lvivier@xxxxxxxxxx>
> ---
> configure | 1 +
> scripts/arch-run.bash | 4 ++--
> scripts/mkstandalone.sh | 6 ++++++
> 3 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/configure b/configure
> index cde2cfe9db61..e1efb3ca0cca 100755
> --- a/configure
> +++ b/configure
> @@ -194,5 +194,6 @@ FIRMWARE=$firmware
> ENDIAN=$endian
> PRETTY_PRINT_STACKS=$pretty_print_stacks
> ENVIRON_DEFAULT=$environ_default
> +ERRATATXT=errata.txt
> U32_LONG_FMT=$u32_long
> EOF
> diff --git a/scripts/arch-run.bash b/scripts/arch-run.bash
> index 27b8531fcfcf..7c6c79ad3a9d 100644
> --- a/scripts/arch-run.bash
> +++ b/scripts/arch-run.bash
> @@ -196,9 +196,9 @@ env_generate_errata ()
> kernel_sublevel=${kernel_sublevel%%[!0-9]*}
>
> [ "$ENVIRON_DEFAULT" != "yes" ] && return
> - [ ! -f errata.txt ] && return
> + [ ! -f "$ERRATATXT" ] && return
>
> - for line in $(grep -v '^#' errata.txt | tr -d '[:blank:]' | cut -d: -f1,2); do
> + for line in $(grep -v '^#' "$ERRATATXT" | tr -d '[:blank:]' | cut -d: -f1,2); do
> commit=${line%:*}
> minver=${line#*:}
>
> diff --git a/scripts/mkstandalone.sh b/scripts/mkstandalone.sh
> index 55cfc4ef8c00..a15941f75375 100755
> --- a/scripts/mkstandalone.sh
> +++ b/scripts/mkstandalone.sh
> @@ -40,6 +40,7 @@ generate_test ()
>
> echo "#!/usr/bin/env bash"
> echo "export STANDALONE=yes"
> + echo "export ENVIRON_DEFAULT=yes"
> echo "export HOST=\$(uname -m | sed -e 's/i.86/i386/;s/arm.*/arm/;s/ppc64.*/ppc64/')"
> echo "export PRETTY_PRINT_STACKS=no"
>
> @@ -62,6 +63,11 @@ generate_test ()
> echo 'export FIRMWARE'
> fi
>
> + if [ "$ERRATATXT" ]; then
> + temp_file ERRATATXT "$ERRATATXT"
> + echo 'export ERRATATXT'
> + fi
> +
> temp_file bin "$kernel"
> args[3]='$bin'
>
>
