yocto-bsp updates to reflect ia32-base move, v2

index 2a07889..1da2306 100644
@@ -20,6 +20,8 @@ require conf/machine/include/tune-atom.inc
 require conf/machine/include/tune-core2.inc
 
 require conf/machine/include/ia32-base.inc
+{{ if xserver == "y" and xserver_choice == "xserver_emgd": }}
+require conf/machine/include/meta-intel.inc
 
 {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }}
 

index 2d16d2e..3a1f52c 100644
@@ -122,9 +122,9 @@ yocto_bsp_create_usage = """
 
  See 'yocto bsp help create' for more detailed instructions.
 
- NOTE: For x86- and x86_64-based BSPs, the generated BSP assumes the
- presence of the meta-intel layer. Ensure the meta-intel layer is
- present and added to bblayers.conf.
+ NOTE: For x86-based BSPs that select the EMGD xserver, the generated
+ BSP assumes the presence of the meta-intel layer. Ensure the
+ meta-intel layer is present and added to bblayers.conf.
 
  See 'yocto bsp help create' for more detailed instructions.
 """

@@ -183,9 +183,9 @@ DESCRIPTION
       /path/to/poky/meta-mybsp \\
       "
 
-    NOTE: For x86- and x86_64-based BSPs, the generated BSP assumes
-    the presence of the meta-intel layer. Ensure the meta-intel layer
-    is present and added to bblayers.conf.
+    NOTE: For x86-based BSPs that select the EMGD xserver, the
+    generated BSP assumes the presence of the meta-intel layer. Ensure
+    the meta-intel layer is present and added to bblayers.conf.
 
     For example, assuming your poky repo is at /path/to/poky, your new
     BSP layer is at /path/to/poky/meta-mybsp, and your build directory

index 928659f..228c0e2 100644
@@ -65,6 +65,14 @@ You should then be able to build a {{=machine}} image as such:
   $ source oe-init-build-env
   $ bitbake core-image-sato
 
+NOTE: if the '{{=machine}}' machine includes the emgd-driver-bin
+package (i.e. if the emgd version of the xserver is being used), it
+has a proprietary license that must be whitelisted by adding the
+string "license_emgd-driver-bin_1.14" to the LICENSE_FLAGS_WHITELIST
+variable in your local.conf.  For example:
+
+  LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.14"
+
 At the end of a successful build, you should have a live image that
 you can boot from a USB flash drive (see instructions on how to do
 that below, in the section 'Booting the images from /binary').

index 00ce863..ac5058c 100644
@@ -449,6 +449,16 @@ def boolean(input_str, name):
         return name
 
 
+def strip_base(input_str):
+    """
+    strip '/base' off the end of input_str, so we can use 'base' in
+    the branch names we present to the user.
+    """
+    if input_str and input_str.endswith("/base"):
+        return input_str[:-len("/base")]
+    return input_str.strip()
+
+
 deferred_choices = {}
 
 def gen_choices_defer(input_line, context, checklist = False):