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"