diff options
author | Daniel Díaz <daniel.diaz@linaro.org> | 2018-06-25 17:36:14 -0500 |
---|---|---|
committer | Daniel Díaz <daniel.diaz@linaro.org> | 2018-06-27 13:28:50 -0500 |
commit | 68636e26b4357bcf2ba92fd1c62c681a29c178e0 (patch) | |
tree | 1ed49d546e299b337eff2ed7c9dcb4ec08ae4580 /openembedded-lkft | |
parent | 0d365e957fb8cdd96d1d645a7d89c3e548f819ff (diff) |
openembedded-lkft: remove provisions for STiH410
This machine has been removed from the LKFT plans some time
back. No need to keep it here.
Change-Id: Iae03a438fd57149908fe9b43ecd67770fcb64f91
Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
Diffstat (limited to 'openembedded-lkft')
-rwxr-xr-x | openembedded-lkft/builders.sh | 16 | ||||
-rw-r--r-- | openembedded-lkft/lava-job-definitions/devices/b2260 | 60 |
2 files changed, 2 insertions, 74 deletions
diff --git a/openembedded-lkft/builders.sh b/openembedded-lkft/builders.sh index bb7a842593..797c94e896 100755 --- a/openembedded-lkft/builders.sh +++ b/openembedded-lkft/builders.sh @@ -72,7 +72,6 @@ rm -rf conf build/conf build/tmp-*glibc/ # Accept EULA if/when needed export EULA_dragonboard410c=1 -export EULA_stih410b2260=1 source setup-environment build # Add job BUILD_NUMBER to output files names @@ -116,19 +115,8 @@ EOF ;; esac -cat << EOF >> ${distro_conf} -KERNEL_ALT_IMAGETYPE_remove_stih410-b2260 = "vmlinux" -EOF - -# Mali GPU driver fails to build -# error: implicit declaration of function 'copy_from_user' -# [-Werror=implicit-function-declaration] -# Ignore the whole gpu MACHINE_FEATURES mechanism -stih410_b2260_conf=$(find ../layers/meta-st-cannes2/conf/machine -name stih410-b2260.conf) -sed -i -e '/gpu/d' ${stih410_b2260_conf} - # Include additional recipes in the image -[ "${MACHINE}" = "am57xx-evm" -o "${MACHINE}" = "stih410-b2260" -o "${MACHINE}" = "beaglebone" ] || extra_pkgs="numactl" +[ "${MACHINE}" = "am57xx-evm" -o "${MACHINE}" = "beaglebone" ] || extra_pkgs="numactl" cat << EOF >> conf/local.conf CORE_IMAGE_BASE_INSTALL_append = " kernel-selftests kselftests-mainline kselftests-next libhugetlbfs-tests ltp ${extra_pkgs}" CORE_IMAGE_BASE_INSTALL_append = " python python-misc python-modules python-numpy python-pexpect python-pyyaml" @@ -218,7 +206,7 @@ rm -f ${DEPLOY_DIR_IMAGE}/*.rootfs.ext4 \ # FIXME: Sparse and converted images here, until it gets done by OE case "${MACHINE}" in - juno|stih410-b2260) + juno) ;; intel-core2-32) for rootfs in ${DEPLOY_DIR_IMAGE}/*.hddimg; do diff --git a/openembedded-lkft/lava-job-definitions/devices/b2260 b/openembedded-lkft/lava-job-definitions/devices/b2260 deleted file mode 100644 index eed7178d11..0000000000 --- a/openembedded-lkft/lava-job-definitions/devices/b2260 +++ /dev/null @@ -1,60 +0,0 @@ -{% extends "lkft-nfs.jinja2" %} - -{% block global_settings %} -{{ super() }} -context: - test_character_delay: 10 -{% endblock global_settings %} - -{% block device_type %}b2260{% endblock %} - -{% block deploy_target %} -- deploy: - namespace: target - timeout: - minutes: 15 - to: tftp - kernel: - url: {{KERNEL_URL}} - type: uimage - dtb: - url: {{DTB_URL}} - nfsrootfs: - url: {{NFSROOTFS_URL}} - compression: xz - os: oe -{% endblock deploy_target %} - -{% block boot_target %} -- boot: - namespace: target - timeout: - minutes: 10 - method: u-boot - commands: nfs - auto_login: - login_prompt: "stih410-b2260 login: " - username: root - prompts: - - 'root@stih410-b2260:~#' -{% endblock boot_target %} - -{% block test_target %} - {{ super() }} - - from: inline - repository: - metadata: - format: Lava-Test Test Definition 1.0 - name: prep-tmp-disk - description: "Mount local disk for tmp space" - run: - steps: - # no content at the moment - # to be updated once SD cards are available - - df -h - - mount - - ls /dev/disk/by-id/ -l - name: prep-tmp-disk - path: inline/prep.yaml -{% endblock test_target %} - |