diff --git a/meta-barreleye/conf/machine/barreleye.conf b/meta-barreleye/conf/machine/barreleye.conf
index d861f74..3254023 100644
--- a/meta-barreleye/conf/machine/barreleye.conf
+++ b/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-barreleye/recipes-bsp/u-boot/files/u-boot-barreleye.patch b/meta-barreleye/recipes-bsp/u-boot/files/u-boot-barreleye.patch
deleted file mode 100644
index dab24f6..0000000
--- a/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);