diff options
-rw-r--r-- | lt-qcom-linux-testimages-desktop.yaml | 28 | ||||
-rw-r--r-- | lt-qcom-linux-testimages.yaml | 28 |
2 files changed, 36 insertions, 20 deletions
diff --git a/lt-qcom-linux-testimages-desktop.yaml b/lt-qcom-linux-testimages-desktop.yaml index 3aec9f3ef7..4765f872b4 100644 --- a/lt-qcom-linux-testimages-desktop.yaml +++ b/lt-qcom-linux-testimages-desktop.yaml @@ -49,6 +49,7 @@ values: - 'qemuarm64' - 'qemuarm' + - 'qcom-armv8a' - axis: type: slave name: label @@ -68,20 +69,27 @@ # ensure that we generate the right image type, by default qemu* only generates .ext4, we need .ext4.gz echo "IMAGE_FSTYPES_remove = \"ext4\"" > auto.conf echo "IMAGE_FSTYPES_append = \" ext4.gz\"" >> auto.conf - - # configure serial in rpb-desktop-image-test - echo "SERIAL_CONSOLES = \"115200;ttyMSM0\"" >> auto.conf - # add ext4 block size to 4096, boards with UFS storage needs it - echo "EXTRA_IMAGECMD_ext4 += \" -b 4096 \"" >> auto.conf - - # add machine dependent qcom services to initramfs and rpb images - echo "CORE_IMAGE_EXTRA_INSTALL += \"${QCOM_USERSPACE_TOOLS}\"" >> auto.conf - echo "PACKAGE_INSTALL_append = \" ${QCOM_USERSPACE_TOOLS}\"" >> auto.conf - # enable mesa-dev to test freedreno using deqp echo "MESA_DEV = \"1\"" >> auto.conf echo "CORE_IMAGE_EXTRA_INSTALL += \"mesa-ci\"" >> auto.conf echo "PACKAGECONFIG_append_pn-mesa = \"freedreno xa\"" >> auto.conf + + if [ "${MACHINE}" = "qcom-armv8a" ]; then + # install firmware + echo "NO_RECOMMENDATIONS = \"\"" >> auto.conf + # remove kernel and modules to beign installed + echo "MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_remove = \"kernel-modules\"" >> auto.conf + echo "PACKAGE_EXCLUDE_append = \" kernel*\"" >> auto.conf + else + # configure serial in rpb-desktop-image-test + echo "SERIAL_CONSOLES = \"115200;ttyMSM0\"" >> auto.conf + # add ext4 block size to 4096, boards with UFS storage needs it + echo "EXTRA_IMAGECMD_ext4 += \" -b 4096 \"" >> auto.conf + + # add machine dependent qcom services to initramfs and rpb images + echo "CORE_IMAGE_EXTRA_INSTALL += \"${QCOM_USERSPACE_TOOLS}\"" >> auto.conf + echo "PACKAGE_INSTALL_append = \" ${QCOM_USERSPACE_TOOLS}\"" >> auto.conf + fi - inject: properties-file: pub_dest_parameters - shell: diff --git a/lt-qcom-linux-testimages.yaml b/lt-qcom-linux-testimages.yaml index 39f38c5a97..1d3dd6404d 100644 --- a/lt-qcom-linux-testimages.yaml +++ b/lt-qcom-linux-testimages.yaml @@ -49,6 +49,7 @@ values: - 'qemuarm64' - 'qemuarm' + - 'qcom-armv8a' - axis: type: slave name: label @@ -68,18 +69,25 @@ # ensure that we generate the right image type, by default qemu* only generates .ext4, we need .ext4.gz echo "IMAGE_FSTYPES_remove = \"ext4\"" > auto.conf echo "IMAGE_FSTYPES_append = \" ext4.gz\"" >> auto.conf - - # configure serial in rpb-console-image-test - echo "SERIAL_CONSOLES = \"115200;ttyMSM0\"" >> auto.conf - # add ext4 block size to 4096, boards with UFS storage needs it - echo "EXTRA_IMAGECMD_ext4 += \" -b 4096 \"" >> auto.conf - - # add machine dependent qcom services to initramfs and rpb images - echo "CORE_IMAGE_EXTRA_INSTALL += \"${QCOM_USERSPACE_TOOLS}\"" >> auto.conf - echo "PACKAGE_INSTALL_append = \" ${QCOM_USERSPACE_TOOLS}\"" >> auto.conf - # enable mesa to test freedreno echo "PACKAGECONFIG_append_pn-mesa = \"freedreno xa\"" >> auto.conf + + if [ "${MACHINE}" = "qcom-armv8a" ]; then + # install firmware + echo "NO_RECOMMENDATIONS = \"\"" >> auto.conf + # remove kernel and modules to beign installed + echo "MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_remove = \"kernel-modules\"" >> auto.conf + echo "PACKAGE_EXCLUDE_append = \" kernel*\"" >> auto.conf + else + # configure serial in rpb-console-image-test + echo "SERIAL_CONSOLES = \"115200;ttyMSM0\"" >> auto.conf + # add ext4 block size to 4096, boards with UFS storage needs it + echo "EXTRA_IMAGECMD_ext4 += \" -b 4096 \"" >> auto.conf + + # add machine dependent qcom services to initramfs and rpb images + echo "CORE_IMAGE_EXTRA_INSTALL += \"${QCOM_USERSPACE_TOOLS}\"" >> auto.conf + echo "PACKAGE_INSTALL_append = \" ${QCOM_USERSPACE_TOOLS}\"" >> auto.conf + fi - inject: properties-file: pub_dest_parameters - shell: |