diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc
index a495f20..22b9a1f 100644
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc
@@ -6,7 +6,7 @@
 PREFERRED_VERSION_u-boot ?= "v2016.05+git%"
 PREFERRED_VERSION_u-boot-fw-utils ?= "v2016.05+git%"
 
-UBOOT_MACHINE ?= "ast_g4_config"
+UBOOT_MACHINE ?= "ast_g4_ncsi_config"
 UBOOT_ENTRYPOINT ?= "0x40001000"
 UBOOT_LOADADDRESS ?= "0x40001000"
 
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/config.patch b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/config.patch
deleted file mode 100644
index c5216e7..0000000
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/config.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/include/configs/palmetto.h
-+++ b/include/configs/palmetto.h
-@@ -96,11 +96,8 @@
- #define CONFIG_UPDATE           "tftp 40800000 ast2400.scr; so 40800000'"
- 
- #define CONFIG_BOOTDELAY	3		/* autoboot after 3 seconds	*/
--#define CONFIG_AUTOBOOT_KEYED
- #define CONFIG_AUTOBOOT_PROMPT		\
- 	"autoboot in %d seconds (stop with 'Delete' key)...\n", bootdelay
--#define CONFIG_AUTOBOOT_STOP_STR	"\x1b\x5b\x33\x7e" /* 'Delete', ESC[3~ */
--#define CONFIG_ZERO_BOOTDELAY_CHECK
- 
- #ifdef CONFIG_FLASH_AST2300
- #define CONFIG_BOOTCOMMAND	"bootm 20080000 20300000"
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc
index 3f016e4..7e4f5b9 100644
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc
@@ -4,7 +4,7 @@
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-obmc"
 
-UBOOT_MACHINE ?= "ast_g5_config"
+UBOOT_MACHINE ?= "ast_g5_ncsi_config"
 UBOOT_ENTRYPOINT ?= "0x80001000"
 UBOOT_LOADADDRESS ?= "0x80001000"
 
diff --git a/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/machine/evb-ast2500.conf b/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/machine/evb-ast2500.conf
index 559e2b6..f94432e 100644
--- a/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/machine/evb-ast2500.conf
+++ b/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/machine/evb-ast2500.conf
@@ -1,6 +1,8 @@
 KMACHINE = "aspeed"
 KERNEL_DEVICETREE = "${KMACHINE}-ast2500-evb.dtb"
 
+UBOOT_MACHINE = "ast_g5_phy_config"
+
 require conf/machine/include/ast2500.inc
 require conf/machine/include/obmc-bsp-common.inc
 require conf/machine/include/sample.inc
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/machine/firestone.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/machine/firestone.conf
index fa0d35e..3f790a5 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/machine/firestone.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/machine/firestone.conf
@@ -5,7 +5,7 @@
 require conf/machine/include/obmc-bsp-common.inc
 require conf/machine/include/ibm.inc
 
-UBOOT_MACHINE_firestone = "ast_g4_config"
+UBOOT_MACHINE_firestone = "ast_g4_phy_config"
 UBOOT_ENTRYPOINT = "0x40008000"
 UBOOT_LOADADDRESS = "0x40008000"
 
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/machine/garrison.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/machine/garrison.conf
index 820a513..3a6d7a1 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/machine/garrison.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/machine/garrison.conf
@@ -5,7 +5,7 @@
 require conf/machine/include/obmc-bsp-common.inc
 require conf/machine/include/ibm.inc
 
-UBOOT_MACHINE_garrison = "ast_g4_config"
+UBOOT_MACHINE_garrison = "ast_g4_ncsi_config"
 UBOOT_ENTRYPOINT = "0x40008000"
 UBOOT_LOADADDRESS = "0x40008000"
 
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
index e69a9af..d50fd58 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
@@ -5,7 +5,7 @@
 require conf/machine/include/obmc-bsp-common.inc
 require conf/machine/include/ibm.inc
 
-UBOOT_MACHINE_palmetto = "ast_g4_config"
+UBOOT_MACHINE_palmetto = "ast_g4_ncsi_config"
 UBOOT_ENTRYPOINT = "0x40008000"
 UBOOT_LOADADDRESS = "0x40008000"
 
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf
index 19ada2a..36941a6 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf
@@ -1,7 +1,7 @@
 KMACHINE = "aspeed"
 KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
 
-UBOOT_MACHINE = "witherspoon_bmc_config"
+UBOOT_MACHINE = "ast_g5_ncsi_config"
 
 require conf/machine/include/ast2500.inc
 require conf/machine/include/obmc-bsp-common.inc
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf
index d861f74..3254023 100644
--- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf
@@ -5,7 +5,7 @@
 require conf/machine/include/obmc-bsp-common.inc
 require conf/machine/include/rackspace.inc
 
-UBOOT_MACHINE_barreleye = "ast_g4_config"
+UBOOT_MACHINE_barreleye = "ast_g4_ncsi_config"
 UBOOT_ENTRYPOINT = "0x40008000"
 UBOOT_LOADADDRESS = "0x40008000"
 
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-bsp/u-boot/files/u-boot-barreleye.patch b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-bsp/u-boot/files/u-boot-barreleye.patch
deleted file mode 100644
index dab24f6..0000000
--- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-bsp/u-boot/files/u-boot-barreleye.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: git/drivers/net/aspeednic.c
-===================================================================
---- git.orig/drivers/net/aspeednic.c	2015-10-29 13:23:42.225712001 -0500
-+++ git/drivers/net/aspeednic.c	2015-10-29 13:26:52.205712001 -0500
-@@ -1155,7 +1155,7 @@
- 
-   RESET_DE4X5(dev);
- 
--  aspeednic_probe_phy(dev);
-+  //aspeednic_probe_phy(dev);
- 
-   set_mac_address (dev, bis);
-   set_mac_control_register (dev);
diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.05.bb b/meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb
similarity index 91%
rename from meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.05.bb
rename to meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb
index c240236..eb89efc 100644
--- a/meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.05.bb
+++ b/meta-phosphor/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/meta-phosphor/common/recipes-bsp/u-boot/u-boot-mkimage_2016.05.bb b/meta-phosphor/common/recipes-bsp/u-boot/u-boot-mkimage_2016.07.bb
similarity index 84%
rename from meta-phosphor/common/recipes-bsp/u-boot/u-boot-mkimage_2016.05.bb
rename to meta-phosphor/common/recipes-bsp/u-boot/u-boot-mkimage_2016.07.bb
index 27ed131..0fece54 100644
--- a/meta-phosphor/common/recipes-bsp/u-boot/u-boot-mkimage_2016.05.bb
+++ b/meta-phosphor/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/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.05.bb b/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.05.bb
deleted file mode 100644
index bb97e8b..0000000
--- a/meta-phosphor/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/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.07.bb b/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.07.bb
new file mode 100644
index 0000000..9db0b11
--- /dev/null
+++ b/meta-phosphor/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}"