From: Bin Meng <[email protected]> Use a hyphen between "qemu" and the architecture name for the "board_type" field in the conf file name, and indicate "arm64" for the ARM SBSA virtual platform.
Update the Labgrid U-Boot provider to use the renamed ARM defconfig. Signed-off-by: Bin Meng <[email protected]> Signed-off-by: Bin Meng <[email protected]> --- Changes in v2: - Rebase on the latest mainline - Update the Labgrid U-Boot provider to use qemu-arm bin/ellesmere/conf.qemu-arm64 | 1 + bin/ellesmere/conf.qemu-arm64_spl_na | 1 + bin/ellesmere/conf.qemu-arm_na | 1 + bin/ellesmere/conf.qemu-arm_spl_na | 1 + bin/ellesmere/conf.qemu_arm64 | 1 - bin/ellesmere/conf.qemu_arm64_spl_na | 1 - bin/ellesmere/conf.qemu_arm_na | 1 - bin/ellesmere/conf.qemu_arm_spl_na | 1 - bin/travis-ci/{conf.qemu_arm64 => conf.qemu-arm64} | 0 .../{conf.qemu-arm-sbsa_na => conf.qemu-arm64-sbsa_na} | 0 .../{conf.qemu_arm64_spl_na => conf.qemu-arm64_spl_na} | 0 .../{conf.qemu_arm64_tpl_na => conf.qemu-arm64_tpl_na} | 0 bin/travis-ci/{conf.qemu_arm64be_na => conf.qemu-arm64be_na} | 0 bin/travis-ci/{conf.qemu_arm_na => conf.qemu-arm_na} | 0 bin/travis-ci/{conf.qemu_arm_spl_na => conf.qemu-arm_spl_na} | 0 labgrid-sjg/kea_env.cfg | 2 +- 16 files changed, 5 insertions(+), 5 deletions(-) create mode 120000 bin/ellesmere/conf.qemu-arm64 create mode 120000 bin/ellesmere/conf.qemu-arm64_spl_na create mode 120000 bin/ellesmere/conf.qemu-arm_na create mode 120000 bin/ellesmere/conf.qemu-arm_spl_na delete mode 120000 bin/ellesmere/conf.qemu_arm64 delete mode 120000 bin/ellesmere/conf.qemu_arm64_spl_na delete mode 120000 bin/ellesmere/conf.qemu_arm_na delete mode 120000 bin/ellesmere/conf.qemu_arm_spl_na rename bin/travis-ci/{conf.qemu_arm64 => conf.qemu-arm64} (100%) rename bin/travis-ci/{conf.qemu-arm-sbsa_na => conf.qemu-arm64-sbsa_na} (100%) rename bin/travis-ci/{conf.qemu_arm64_spl_na => conf.qemu-arm64_spl_na} (100%) rename bin/travis-ci/{conf.qemu_arm64_tpl_na => conf.qemu-arm64_tpl_na} (100%) rename bin/travis-ci/{conf.qemu_arm64be_na => conf.qemu-arm64be_na} (100%) rename bin/travis-ci/{conf.qemu_arm_na => conf.qemu-arm_na} (100%) rename bin/travis-ci/{conf.qemu_arm_spl_na => conf.qemu-arm_spl_na} (100%) diff --git a/bin/ellesmere/conf.qemu-arm64 b/bin/ellesmere/conf.qemu-arm64 new file mode 120000 index 0000000..312f519 --- /dev/null +++ b/bin/ellesmere/conf.qemu-arm64 @@ -0,0 +1 @@ +../travis-ci/conf.qemu-arm64 \ No newline at end of file diff --git a/bin/ellesmere/conf.qemu-arm64_spl_na b/bin/ellesmere/conf.qemu-arm64_spl_na new file mode 120000 index 0000000..112a3d5 --- /dev/null +++ b/bin/ellesmere/conf.qemu-arm64_spl_na @@ -0,0 +1 @@ +../travis-ci/conf.qemu-arm64_spl_na \ No newline at end of file diff --git a/bin/ellesmere/conf.qemu-arm_na b/bin/ellesmere/conf.qemu-arm_na new file mode 120000 index 0000000..d103ff9 --- /dev/null +++ b/bin/ellesmere/conf.qemu-arm_na @@ -0,0 +1 @@ +../travis-ci/conf.qemu-arm_na \ No newline at end of file diff --git a/bin/ellesmere/conf.qemu-arm_spl_na b/bin/ellesmere/conf.qemu-arm_spl_na new file mode 120000 index 0000000..aee911e --- /dev/null +++ b/bin/ellesmere/conf.qemu-arm_spl_na @@ -0,0 +1 @@ +../travis-ci/conf.qemu-arm_spl_na \ No newline at end of file diff --git a/bin/ellesmere/conf.qemu_arm64 b/bin/ellesmere/conf.qemu_arm64 deleted file mode 120000 index dee6855..0000000 --- a/bin/ellesmere/conf.qemu_arm64 +++ /dev/null @@ -1 +0,0 @@ -../travis-ci/conf.qemu_arm64 \ No newline at end of file diff --git a/bin/ellesmere/conf.qemu_arm64_spl_na b/bin/ellesmere/conf.qemu_arm64_spl_na deleted file mode 120000 index abbbc02..0000000 --- a/bin/ellesmere/conf.qemu_arm64_spl_na +++ /dev/null @@ -1 +0,0 @@ -../travis-ci/conf.qemu_arm64_spl_na \ No newline at end of file diff --git a/bin/ellesmere/conf.qemu_arm_na b/bin/ellesmere/conf.qemu_arm_na deleted file mode 120000 index aa91a9f..0000000 --- a/bin/ellesmere/conf.qemu_arm_na +++ /dev/null @@ -1 +0,0 @@ -../travis-ci/conf.qemu_arm_na \ No newline at end of file diff --git a/bin/ellesmere/conf.qemu_arm_spl_na b/bin/ellesmere/conf.qemu_arm_spl_na deleted file mode 120000 index e171c5a..0000000 --- a/bin/ellesmere/conf.qemu_arm_spl_na +++ /dev/null @@ -1 +0,0 @@ -../travis-ci/conf.qemu_arm_spl_na \ No newline at end of file diff --git a/bin/travis-ci/conf.qemu_arm64 b/bin/travis-ci/conf.qemu-arm64 similarity index 100% rename from bin/travis-ci/conf.qemu_arm64 rename to bin/travis-ci/conf.qemu-arm64 diff --git a/bin/travis-ci/conf.qemu-arm-sbsa_na b/bin/travis-ci/conf.qemu-arm64-sbsa_na similarity index 100% rename from bin/travis-ci/conf.qemu-arm-sbsa_na rename to bin/travis-ci/conf.qemu-arm64-sbsa_na diff --git a/bin/travis-ci/conf.qemu_arm64_spl_na b/bin/travis-ci/conf.qemu-arm64_spl_na similarity index 100% rename from bin/travis-ci/conf.qemu_arm64_spl_na rename to bin/travis-ci/conf.qemu-arm64_spl_na diff --git a/bin/travis-ci/conf.qemu_arm64_tpl_na b/bin/travis-ci/conf.qemu-arm64_tpl_na similarity index 100% rename from bin/travis-ci/conf.qemu_arm64_tpl_na rename to bin/travis-ci/conf.qemu-arm64_tpl_na diff --git a/bin/travis-ci/conf.qemu_arm64be_na b/bin/travis-ci/conf.qemu-arm64be_na similarity index 100% rename from bin/travis-ci/conf.qemu_arm64be_na rename to bin/travis-ci/conf.qemu-arm64be_na diff --git a/bin/travis-ci/conf.qemu_arm_na b/bin/travis-ci/conf.qemu-arm_na similarity index 100% rename from bin/travis-ci/conf.qemu_arm_na rename to bin/travis-ci/conf.qemu-arm_na diff --git a/bin/travis-ci/conf.qemu_arm_spl_na b/bin/travis-ci/conf.qemu-arm_spl_na similarity index 100% rename from bin/travis-ci/conf.qemu_arm_spl_na rename to bin/travis-ci/conf.qemu-arm_spl_na diff --git a/labgrid-sjg/kea_env.cfg b/labgrid-sjg/kea_env.cfg index a12bbd5..0072732 100644 --- a/labgrid-sjg/kea_env.cfg +++ b/labgrid-sjg/kea_env.cfg @@ -1161,7 +1161,7 @@ targets: login_prompt: ' login: ' username: 'root' UBootProviderDriver: - board: qemu_arm + board: qemu-arm UBootWriterDriver: method: qemu UBootStrategy: {} --- base-commit: 59437fd1c7a6a84da05efe5cefde47264f78dcbe branch: qemu-arm -- 2.53.0
