summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2013-03-04 00:20:36 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-17 23:10:27 +0000
commit63f0834fbd30c364d850943a322de5a559765134 (patch)
tree3c4b2eaca88e08a03b5607e4401e96c6ff57c67d
parentead9ada172e93117f13812bd47aa2ed05dd5a2f3 (diff)
downloadpoky-63f0834fbd30c364d850943a322de5a559765134.tar.gz
scripts/lib/bsp/engine.py: add preempt-rt and tiny to map_standard_kbranch()
Update map_standard_kbranch() with preempt-rt and tiny variants. (From meta-yocto rev: 48233b051b0599ee745d0b8d24863a08e7440d6a) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/bsp/engine.py36
1 files changed, 36 insertions, 0 deletions
diff --git a/scripts/lib/bsp/engine.py b/scripts/lib/bsp/engine.py
index 55f1e6b43e..86cb51c5f4 100644
--- a/scripts/lib/bsp/engine.py
+++ b/scripts/lib/bsp/engine.py
@@ -1741,3 +1741,39 @@ def map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch):
1741 return "bsp/common-pc/common-pc-standard.scc" 1741 return "bsp/common-pc/common-pc-standard.scc"
1742 else: 1742 else:
1743 return "ktypes/standard/standard.scc" 1743 return "ktypes/standard/standard.scc"
1744
1745
1746def map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch):
1747 """
1748 Return the linux-yocto bsp branch to use with the specified
1749 kbranch. This handles the -preempt-rt variants for 3.4 and 3.8;
1750 the other variants don't need mappings.
1751 """
1752 if need_new_kbranch == "y":
1753 kbranch = new_kbranch
1754 else:
1755 kbranch = existing_kbranch
1756
1757 if kbranch.startswith("standard/preempt-rt/common-pc-64"):
1758 return "bsp/common-pc-64/common-pc-64-preempt-rt.scc"
1759 if kbranch.startswith("standard/preempt-rt/common-pc"):
1760 return "bsp/common-pc/common-pc-preempt-rt.scc"
1761 else:
1762 return "ktypes/preempt-rt/preempt-rt.scc"
1763
1764
1765def map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch):
1766 """
1767 Return the linux-yocto bsp branch to use with the specified
1768 kbranch. This handles the -tiny variants for 3.4 and 3.8; the
1769 other variants don't need mappings.
1770 """
1771 if need_new_kbranch == "y":
1772 kbranch = new_kbranch
1773 else:
1774 kbranch = existing_kbranch
1775
1776 if kbranch.startswith("standard/tiny/common-pc"):
1777 return "bsp/common-pc/common-pc-tiny.scc"
1778 else:
1779 return "ktypes/tiny/tiny.scc"