diff --git a/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.05.bb b/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb
similarity index 91%
rename from common/recipes-bsp/u-boot/u-boot-fw-utils_2016.05.bb
rename to common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb
index c240236..eb89efc 100644
--- a/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.05.bb
+++ b/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb
@@ -4,11 +4,11 @@
 SECTION = "bootloader"
 DEPENDS = "mtd-utils"
 
-SRCREV = "3f04d9fef7bbfec3a536337e7fc1b3492d20e331"
-UBRANCH = "v2016.05-aspeed-openbmc"
+SRCREV = "f9b2a49f57c153c7358f9769234c0cefdf4de8d4"
+UBRANCH = "v2016.07-aspeed-openbmc"
 SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=https"
 
-PV = "v2016.05+git${SRCPV}"
+PV = "v2016.07+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
diff --git a/common/recipes-bsp/u-boot/u-boot-mkimage_2016.05.bb b/common/recipes-bsp/u-boot/u-boot-mkimage_2016.07.bb
similarity index 84%
rename from common/recipes-bsp/u-boot/u-boot-mkimage_2016.05.bb
rename to common/recipes-bsp/u-boot/u-boot-mkimage_2016.07.bb
index 27ed131..0fece54 100644
--- a/common/recipes-bsp/u-boot/u-boot-mkimage_2016.05.bb
+++ b/common/recipes-bsp/u-boot/u-boot-mkimage_2016.07.bb
@@ -5,11 +5,11 @@
 
 DEPENDS = "openssl"
 
-SRCREV = "47441cc36bb8e919a066837e4d7c5a8a1c475da4"
-UBRANCH = "v2016.05-ast2500"
+SRCREV = "f9b2a49f57c153c7358f9769234c0cefdf4de8d4"
+UBRANCH = "v2016.07-aspeed-openbmc"
 SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=https"
 
-PV = "v2016.05+git${SRCPV}"
+PV = "v2016.07+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
diff --git a/common/recipes-bsp/u-boot/u-boot_2016.05.bb b/common/recipes-bsp/u-boot/u-boot_2016.05.bb
deleted file mode 100644
index bb97e8b..0000000
--- a/common/recipes-bsp/u-boot/u-boot_2016.05.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require recipes-bsp/u-boot/u-boot.inc
-
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
-DEPENDS += "dtc-native"
-
-SRCREV = "3f04d9fef7bbfec3a536337e7fc1b3492d20e331"
-UBRANCH = "v2016.05-aspeed-openbmc"
-SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=https"
-
-PV = "v2016.05+git${SRCPV}"
-
-EXTRA_OEMAKE_append = " KCFLAGS=-fgnu89-inline"
diff --git a/common/recipes-bsp/u-boot/u-boot_2016.07.bb b/common/recipes-bsp/u-boot/u-boot_2016.07.bb
new file mode 100644
index 0000000..9db0b11
--- /dev/null
+++ b/common/recipes-bsp/u-boot/u-boot_2016.07.bb
@@ -0,0 +1,10 @@
+require recipes-bsp/u-boot/u-boot.inc
+
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
+DEPENDS += "dtc-native"
+
+SRCREV = "f9b2a49f57c153c7358f9769234c0cefdf4de8d4"
+UBRANCH = "v2016.07-aspeed-openbmc"
+SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=https"
+
+PV = "v2016.07+git${SRCPV}"