diff --git a/conf/machine/imx6q1gsmarc.conf b/conf/machine/imx6q1gsmarc.conf
index e609891..9e0855d 100644
--- a/conf/machine/imx6q1gsmarc.conf
+++ b/conf/machine/imx6q1gsmarc.conf
@@ -11,9 +11,9 @@ SOC_FAMILY = "mx6:mx6dl:mx6q"
 # Use u-boot SMARC-FiMX6
 PREFERRED_PROVIDER_u-boot_imx6q1gsmarc = "u-boot-smarcfimx6"
 
-UBOOT_SUFFIX = "bin"
-UBOOT_BINARY = "u-boot.bin"
-UBOOT_MAKE_TARGET = "u-boot.bin"
+UBOOT_SUFFIX = "imx"
+UBOOT_BINARY = "u-boot.imx"
+UBOOT_MAKE_TARGET = "u-boot.imx"
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "smarcfimx6_quad_1g_ser3_config,sdcard"
 
diff --git a/conf/machine/imx6q2gsmarc.conf b/conf/machine/imx6q2gsmarc.conf
index 255f7bb..408023d 100644
--- a/conf/machine/imx6q2gsmarc.conf
+++ b/conf/machine/imx6q2gsmarc.conf
@@ -11,9 +11,9 @@ SOC_FAMILY = "mx6:mx6dl:mx6q"
 # Use u-boot SMARC-FiMX6
 PREFERRED_PROVIDER_u-boot_imx6q2gsmarc = "u-boot-smarcfimx6"
 
-UBOOT_SUFFIX = "bin"
-UBOOT_BINARY = "u-boot.bin"
-UBOOT_MAKE_TARGET = "u-boot.bin"
+UBOOT_SUFFIX = "imx"
+UBOOT_BINARY = "u-boot.imx"
+UBOOT_MAKE_TARGET = "u-boot.imx"
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "smarcfimx6_quad_2g_ser3_config,sdcard"
 
diff --git a/conf/machine/imx6solosmarc.conf b/conf/machine/imx6solosmarc.conf
index 7706031..7161f22 100644
--- a/conf/machine/imx6solosmarc.conf
+++ b/conf/machine/imx6solosmarc.conf
@@ -11,9 +11,9 @@ SOC_FAMILY = "mx6:mx6dl:mx6q"
 # Use u-boot SMARC-FiMX6
 PREFERRED_PROVIDER_u-boot_imx6solosmarc = "u-boot-smarcfimx6"
 
-UBOOT_SUFFIX = "bin"
-UBOOT_BINARY = "u-boot.bin"
-UBOOT_MAKE_TARGET = "u-boot.bin"
+UBOOT_SUFFIX = "imx"
+UBOOT_BINARY = "u-boot.imx"
+UBOOT_MAKE_TARGET = "u-boot.imx"
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "smarcfimx6_solo_ser3_config,sdcard"
 
diff --git a/conf/machine/imx6u1gsmarc.conf b/conf/machine/imx6u1gsmarc.conf
index af4125c..eb5c689 100644
--- a/conf/machine/imx6u1gsmarc.conf
+++ b/conf/machine/imx6u1gsmarc.conf
@@ -11,9 +11,9 @@ SOC_FAMILY = "mx6:mx6dl:mx6q"
 # Use u-boot SMARC-FiMX6
 PREFERRED_PROVIDER_u-boot_imx6u1gsmarc = "u-boot-smarcfimx6"
 
-UBOOT_SUFFIX = "bin"
-UBOOT_BINARY = "u-boot.bin"
-UBOOT_MAKE_TARGET = "u-boot.bin"
+UBOOT_SUFFIX = "imx"
+UBOOT_BINARY = "u-boot.imx"
+UBOOT_MAKE_TARGET = "u-boot.imx"
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "smarcfimx6_dl_1g_ser3_config,sdcard"
 
diff --git a/recipes-bsp/u-boot/u-boot-smarcfimx6_2014.04-smarcfimx6.bb b/recipes-bsp/u-boot/u-boot-smarcfimx6_2014.04-smarcfimx6.bb
index fdce457..a14ff46 100644
--- a/recipes-bsp/u-boot/u-boot-smarcfimx6_2014.04-smarcfimx6.bb
+++ b/recipes-bsp/u-boot/u-boot-smarcfimx6_2014.04-smarcfimx6.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
 PROVIDES += "u-boot"
 PV = "2014.04-smarcfimx6"
 
-SRCREV = "79bc910696bbe4ea425900eaf9513e0d8e2a2970"
+SRCREV = "7d536ce6aa004ca8963abdc9568a6799952c17b0"
 SRCBRANCH = "smarc-imx_v2014.04_3.14.28_1.0.0_ga"
 # eMMC Boot Up
 #SRCREV = "17242f3dbeaead1f77f552b138cbbd61608013cc"
diff --git a/recipes-kernel/linux/linux-smarcfimx6_3.14.28.bb b/recipes-kernel/linux/linux-smarcfimx6_3.14.28.bb
index 258ef1d..51f582c 100644
--- a/recipes-kernel/linux/linux-smarcfimx6_3.14.28.bb
+++ b/recipes-kernel/linux/linux-smarcfimx6_3.14.28.bb
@@ -17,7 +17,7 @@ SRC_URI = "${EMB_KERNEL_MIRROR};protocol=ssh;branch=${SRCBRANCH} \
         file://defconfig \
 "
 
-SRCREV = "b1c777f7d6ab8f361f0ca94a10c6f59e1bae7f8f"
+SRCREV = "cbc387c117a2f09a8a5a204a9a78d45685e9acc6"
 PV = "3.14.28"
 LOCALVERSION = "-1.0.1_smarc"