4 files changed, 7 insertions, 6 deletions

diff --git a/meta-fsl-arm/classes/image_types_fsl.bbclass b/meta-fsl-arm/classes/image_types_fsl.bbclass
index d6c642180..75eca59f8 100644
--- a/meta-fsl-arm/classes/image_types_fsl.bbclass
+++ b/meta-fsl-arm/classes/image_types_fsl.bbclass
@@ -89,7 +89,7 @@ SDCARD_GENERATION_COMMAND_mxs = "generate_mxs_sdcard"
 SDCARD_GENERATION_COMMAND_mx25 = "generate_imx_sdcard"
 SDCARD_GENERATION_COMMAND_mx5 = "generate_imx_sdcard"
 SDCARD_GENERATION_COMMAND_mx6 = "generate_imx_sdcard"
-SDCARD_GENERATION_COMMAND_vf60 = "generate_imx_sdcard"
+SDCARD_GENERATION_COMMAND_vf = "generate_imx_sdcard"
 
 #
 # Create an image that can by written onto a SD card using dd for use
diff --git a/meta-fsl-arm/conf/machine/include/imx-base.inc b/meta-fsl-arm/conf/machine/include/imx-base.inc
index 4ea5de335..bb5539c1b 100644
--- a/meta-fsl-arm/conf/machine/include/imx-base.inc
+++ b/meta-fsl-arm/conf/machine/include/imx-base.inc
@@ -16,7 +16,7 @@ UBOOT_ENTRYPOINT_mx53  = "0x70008000"
 UBOOT_ENTRYPOINT_mx6  = "0x10008000"
 UBOOT_ENTRYPOINT_mx6sl = "0x80008000"
 UBOOT_ENTRYPOINT_mx6sx = "0x80008000"
-UBOOT_ENTRYPOINT_vf60 = "0x80008000"
+UBOOT_ENTRYPOINT_vf = "0x80008000"
 
 XSERVER_DRIVER = "xf86-video-fbdev"
 XSERVER_DRIVER_mx5 = "xf86-video-imxfb"
@@ -45,6 +45,7 @@ MACHINE_SOCARCH_mx6dl = "${TUNE_PKGARCH}-mx6qdl"
 MACHINE_SOCARCH_mx6sx = "${TUNE_PKGARCH}-mx6sx"
 MACHINE_SOCARCH_mx6sl = "${TUNE_PKGARCH}-mx6sl"
 MACHINE_SOCARCH_vf60 = "${TUNE_PKGARCH}-vf60"
+MACHINE_SOCARCH_vf50 = "${TUNE_PKGARCH}-vf50"
 PACKAGE_EXTRA_ARCHS_append = " ${MACHINE_SOCARCH}"
 
 MACHINE_ARCH_FILTER = "virtual/kernel"
@@ -79,7 +80,7 @@ MACHINE_EXTRA_RRECOMMENDS += "udev-rules-imx"
 # GStreamer 0.10 plugins
 MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin"
 MACHINE_GSTREAMER_PLUGIN_mx3 ?= ""
-MACHINE_GSTREAMER_PLUGIN_vf60 ?= ""
+MACHINE_GSTREAMER_PLUGIN_vf ?= ""
 
 # GStreamer 1.0 plugins
 MACHINE_GSTREAMER_1_0_PLUGIN ?= ""
diff --git a/meta-fsl-arm/conf/machine/twr-vf65gs10.conf b/meta-fsl-arm/conf/machine/twr-vf65gs10.conf
index 1f19dcbd7..21f189f7a 100644
--- a/meta-fsl-arm/conf/machine/twr-vf65gs10.conf
+++ b/meta-fsl-arm/conf/machine/twr-vf65gs10.conf
@@ -1,13 +1,13 @@
 #@TYPE: Machine
 #@NAME: Freescale Vybrid TWR-VF65GS10
-#@SOC: vf60
+#@SOC: VF610
 #@DESCRIPTION: Machine configuration for Freescale Vybrid TWR-VF65GS10
 #@MAINTAINER: Anthony Felice <tony.felice@timesys.com>
 
 include conf/machine/include/imx-base.inc
 include conf/machine/include/tune-cortexa5.inc
 
-SOC_FAMILY = "vf60"
+SOC_FAMILY = "vf:vf60"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-timesys"
 
diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc.inc b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc.inc
index 83a76c09c..07fb5074a 100644
--- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc.inc
+++ b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc.inc
@@ -11,7 +11,7 @@ was submitted for revision and it takes some time to become part of a stable \
 version, or because it is not applicable for upstreaming."
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
-COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6|vf60)"
+COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6|vf)"
 
 DEPENDS_mxs += "elftosb-native openssl-native"