Merge ~canonical-kernel-team/+git/autotest-client-tests:phlin/xlnx-kd240 into ~canonical-kernel-team/+git/autotest-client-tests:master

Proposed by Po-Hsu Lin
Status: Merged
Merge reported by: Po-Hsu Lin
Merged at revision: 2f0e29ff911aec30162656bef576bb682460fc17
Proposed branch: ~canonical-kernel-team/+git/autotest-client-tests:phlin/xlnx-kd240
Merge into: ~canonical-kernel-team/+git/autotest-client-tests:master
Diff against target: 14 lines (+3/-0)
1 file modified
ubuntu_xilinx/lib/run-test (+3/-0)
Reviewer Review Type Date Requested Status
Portia Stephens Approve
Review via email: mp+465396@code.launchpad.net

Commit message

Add support to detect Xilinx KD240 board from device-tree.

To post a comment you must log in.
Revision history for this message
Portia Stephens (portias) wrote :

Thanks for this, you beat me too it. It still is going to fail but we should at least update the test case for when it works.

review: Approve
Revision history for this message
Po-Hsu Lin (cypressyew) wrote :

Applied and pushed. Thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/ubuntu_xilinx/lib/run-test b/ubuntu_xilinx/lib/run-test
2index 1cd64d5..452147b 100755
3--- a/ubuntu_xilinx/lib/run-test
4+++ b/ubuntu_xilinx/lib/run-test
5@@ -135,6 +135,9 @@ function _set_globals()
6 RT_XILINX_BOARD="kr260"
7 fi
8
9+ if [ $(cat /proc/device-tree/compatible | grep -ao -e kd240 | head -1) ] ; then
10+ RT_XILINX_BOARD="kd240"
11+ fi
12
13 # Compute the model revision
14 RT_XILINX_REV=${RT_XILINX_MODEL#* Rev}

Subscribers

People subscribed via source and target branches

to all changes: