Minor changes for better consistency with other BSP layers

Signed-off-by: Dan O'Donovan <dan@emutex.com>

README

@@ -83,13 +83,13 @@ II. Booting the live USB image
 This BSP creates bootable live images, which can be used to directly
 boot Yocto off of a USB flash drive.  Upon completion of a successful
 build, described in the previous section, the images are created in
-a sub-folder named ./tmp/deploy/images/intel-corei7-64/
+a sub-folder named ./tmp/deploy/images/up-board/
 
 Under Linux, insert a USB flash drive.  Assuming the USB flash drive
 takes device /dev/sdf, use dd to copy the live image to it.  For
 example:
 
-# dd if=core-image-sato-intel-corei7-64.hddimg of=/dev/sdf
+# dd if=core-image-sato-up-board.hddimg of=/dev/sdf
 # sync
 # eject /dev/sdf
 

conf/layer.conf

@@ -8,3 +8,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "up-board"
 BBFILE_PATTERN_up-board = "^${LAYERDIR}/"
 BBFILE_PRIORITY_up-board = "6"
+
+LAYERDEPENDS_up-board = "intel"

conf/machine/up-board.conf

@@ -3,25 +3,30 @@
 
 #@DESCRIPTION: Machine configuration for up-board systems
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto-dev"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "4.1%"
 
+require conf/machine/include/intel-corei7-64-common.inc
+require conf/machine/include/intel-common-pkgarch.inc
+require conf/machine/include/meta-intel.inc
 
-DEFAULTTUNE ?= "corei7-64"
-require conf/machine/include/tune-corei7.inc
-
-require conf/machine/include/x86-base.inc
-
-MACHINE_FEATURES += "wifi efi pcbios"
+MACHINE_FEATURES += "pcbios efi"
+MACHINE_FEATURES += "va-impl-intel"
+MACHINE_FEATURES += "wifi 3g nfc"
+MACHINE_FEATURES += "intel-ucode"
 
+MACHINE_HWCODECS ?= "va-intel gstreamer-vaapi-1.0"
 
 XSERVER ?= "${XSERVER_X86_BASE} \
-           ${XSERVER_X86_EXT} \
-           ${XSERVER_X86_I915} \
+            ${XSERVER_X86_EXT} \
+            ${XSERVER_X86_FBDEV} \
+            ${XSERVER_X86_I915} \
            "
 
-MACHINE_EXTRA_RRECOMMENDS += "linux-firmware v86d eee-acpi-scripts"
-
-EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi"
+MACHINE_EXTRA_RRECOMMENDS += "linux-firmware"
 
 GLIBC_ADDONS = "nptl"
 
+SYSLINUX_OPTS = "serial 0 115200"
+SERIAL_CONSOLE = "115200 ttyS0"
+APPEND += "console=ttyS0,115200 console=tty0"