scripts/lib/bsp/engine.py: update map_standard_kbranch()

Update map_standard_kbranch() to be consistent with the new changes in
meta naming and remove obsolete standard/default mapping.

(From meta-yocto rev: 40998ba44e1a4ebb1c165cab1a250025041e0da0)

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 6 insertions, 8 deletions

diff --git a/scripts/lib/bsp/engine.py b/scripts/lib/bsp/engine.py
index aa26280796..55f1e6b43e 100644
--- a/scripts/lib/bsp/engine.py
+++ b/scripts/lib/bsp/engine.py
@@ -1727,7 +1727,7 @@ def yocto_layer_list(args, scripts_path, properties_file):
 def map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch):
     """
     Return the linux-yocto bsp branch to use with the specified
-    kbranch.  This handles the -standard variants for 3.2 and 3.4; the
+    kbranch.  This handles the -standard variants for 3.4 and 3.8; the
     other variants don't need mappings.
     """
     if need_new_kbranch == "y":
@@ -1735,11 +1735,9 @@ def map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch):
     else:
         kbranch = existing_kbranch
 
-    if (kbranch.startswith("standard/default/common-pc-64") or
-        kbranch.startswith("standard/common-pc-64")):
-        return "bsp/common-pc-64/common-pc-64-standard"
-    if (kbranch.startswith("standard/default/common-pc") or
-        kbranch.startswith("standard/common-pc")):
-        return "bsp/common-pc/common-pc-standard"
+    if kbranch.startswith("standard/common-pc-64"):
+        return "bsp/common-pc-64/common-pc-64-standard.scc"
+    if kbranch.startswith("standard/common-pc"):
+        return "bsp/common-pc/common-pc-standard.scc"
     else:
-        return "ktypes/standard"
+        return "ktypes/standard/standard.scc"