diff --git a/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk/0001-u-boot-ast2600-57600-baudrate-for-bletchley.patch b/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk/0001-u-boot-ast2600-57600-baudrate-for-bletchley.patch
deleted file mode 100644
index 46f8929..0000000
--- a/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk/0001-u-boot-ast2600-57600-baudrate-for-bletchley.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 12e9371e44b922e0383dba3a231a21b82ca03368 Mon Sep 17 00:00:00 2001
-From: Howard <howard.chiu@quantatw.com>
-Date: Wed, 4 Aug 2021 14:08:14 +0800
-Subject: [PATCH] u-boot: ast2600: 57600 baudrate for bletchley
-
-Specific patch for bletchley only
----
- configs/ast2600_openbmc_spl_defconfig | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configs/ast2600_openbmc_spl_defconfig b/configs/ast2600_openbmc_spl_defconfig
-index c1ed4f54d5..2257673e16 100644
---- a/configs/ast2600_openbmc_spl_defconfig
-+++ b/configs/ast2600_openbmc_spl_defconfig
-@@ -35,7 +35,7 @@ CONFIG_ARMV7_PSCI_NR_CPUS=2
- CONFIG_NR_DRAM_BANKS=1
- CONFIG_FIT=y
- CONFIG_USE_BOOTARGS=y
--CONFIG_BOOTARGS="console=ttyS4,115200n8 root=/dev/ram rw"
-+CONFIG_BOOTARGS="console=ttyS4,57600n8 root=/dev/ram rw"
- CONFIG_USE_BOOTCOMMAND=y
- CONFIG_BOOTCOMMAND="bootm 20100000"
- CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
-@@ -133,3 +133,4 @@ CONFIG_USE_TINY_PRINTF=y
- CONFIG_TPM=y
- CONFIG_SPL_TPM=y
- # CONFIG_EFI_LOADER is not set
-+CONFIG_BAUDRATE=57600
--- 
-2.25.1
-
diff --git a/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk/bletchley.cfg b/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk/bletchley.cfg
new file mode 100644
index 0000000..cd6f2db
--- /dev/null
+++ b/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk/bletchley.cfg
@@ -0,0 +1,3 @@
+CONFIG_USE_BOOTARGS=y
+CONFIG_BOOTARGS="console=ttyS4,57600n8 root=/dev/ram rw"
+CONFIG_BAUDRATE=57600
diff --git a/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend b/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend
index d526638..d8c7b61 100644
--- a/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend
+++ b/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend
@@ -1,5 +1,2 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += " \
-            file://0001-u-boot-ast2600-57600-baudrate-for-bletchley.patch \
-           "
+SRC_URI +="file://bletchley.cfg"
diff --git a/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend b/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend
index c9401d1..de2bc50 100644
--- a/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend
+++ b/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend
@@ -1,5 +1,2 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-aspeed-sdk:"
-
-SRC_URI += " \
-            file://0001-u-boot-ast2600-57600-baudrate-for-bletchley.patch \
-           "
+SRC_URI +="file://bletchley.cfg"
diff --git a/meta-phosphor/scripts/run-repotest b/meta-phosphor/scripts/run-repotest
index 3669e36..a91af56 100755
--- a/meta-phosphor/scripts/run-repotest
+++ b/meta-phosphor/scripts/run-repotest
@@ -39,7 +39,6 @@
 meta-aspeed/recipes-bsp/u-boot/files/default-gcc.patch
 meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0005-ARM-dts-aspeed-Enable-g220a-uart-route.patch
 meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy/0001-Remove-Total_Power-sensor.patch
-meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk/0001-u-boot-ast2600-57600-baudrate-for-bletchley.patch
 meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-aspeed/0001-configs-ast-common-use-57600-baud-rate-to-match-Tiog.patch
 meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed-sdk/0001-board-aspeed-Add-Mux-for-yosemitev2.patch
 meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed-sdk/0002-spl-host-console-handle.patch