Set conf.${board_type} as the default config when no board_ident is
specified. This helps to reuse a single config for multiple board
identities.
Hense, rename the conf.qemu_arm64_na to conf.qemu_arm64 so that it
can be shared by all qemu_arm64 boards.Signed-off-by: Raymond Mao <[email protected]> --- bin/travis-ci/{conf.qemu_arm64_na => conf.qemu_arm64} | 0 bin/u-boot-test-common | 6 +++++- 2 files changed, 5 insertions(+), 1 deletion(-) rename bin/travis-ci/{conf.qemu_arm64_na => conf.qemu_arm64} (100%) diff --git a/bin/travis-ci/conf.qemu_arm64_na b/bin/travis-ci/conf.qemu_arm64 similarity index 100% rename from bin/travis-ci/conf.qemu_arm64_na rename to bin/travis-ci/conf.qemu_arm64 diff --git a/bin/u-boot-test-common b/bin/u-boot-test-common index 2c3b476..0e443d7 100755 --- a/bin/u-boot-test-common +++ b/bin/u-boot-test-common @@ -32,5 +32,9 @@ hostname="`hostname`" if [ -n "${USE_LABGRID_SJG}" ]; then . "${bin_dir}/${hostname}/conf.all" else - . "${bin_dir}/${hostname}/conf.${board_type}_${board_ident}" + if [ -f "${bin_dir}/${hostname}/conf.${board_type}_${board_ident}" ]; then + . "${bin_dir}/${hostname}/conf.${board_type}_${board_ident}" + else + . "${bin_dir}/${hostname}/conf.${board_type}" + fi fi -- 2.25.1
