diff --git a/meta-aspeed/recipes-bsp/u-boot/files/fw_env_ast2600_nor.config b/meta-aspeed/recipes-bsp/u-boot/files/fw_env_ast2600_nor.config
deleted file mode 100644
index ccd037e..0000000
--- a/meta-aspeed/recipes-bsp/u-boot/files/fw_env_ast2600_nor.config
+++ /dev/null
@@ -1,2 +0,0 @@
-# MTD device name	Device offset	Env. size	Flash sector size	Number of sectors
-/dev/mtd/u-boot-env	0x0000		0x10000		0x1000
diff --git a/meta-aspeed/recipes-bsp/u-boot/files/fw_env_flash_64M_nor.config b/meta-aspeed/recipes-bsp/u-boot/files/fw_env_flash_64M_nor.config
deleted file mode 100644
index 52d0882..0000000
--- a/meta-aspeed/recipes-bsp/u-boot/files/fw_env_flash_64M_nor.config
+++ /dev/null
@@ -1,2 +0,0 @@
-# MTD device name	Device offset	Env. size	Flash sector size	Number of sectors
-/dev/mtd/u-boot-env	0x0000		0x20000		0x1000
diff --git a/meta-aspeed/recipes-bsp/u-boot/files/fw_env_flash_32M_nor.config b/meta-aspeed/recipes-bsp/u-boot/files/fw_env_flash_nor.config
similarity index 100%
rename from meta-aspeed/recipes-bsp/u-boot/files/fw_env_flash_32M_nor.config
rename to meta-aspeed/recipes-bsp/u-boot/files/fw_env_flash_nor.config
diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb
index 1a7e8f5..e02369f 100644
--- a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb
+++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb
@@ -8,16 +8,12 @@
 PROVIDES += "u-boot-fw-utils"
 RPROVIDES:${PN} += "u-boot-fw-utils"
 
-SRC_URI += "file://fw_env_ast2600_nor.config"
+# The 32MB NOR and 64MB NOR layouts use the same configuration
+SRC_URI += "file://fw_env_flash_nor.config"
 SRC_URI += "file://fw_env_ast2600_mmc.config"
-SRC_URI += "file://fw_env_flash_32M_nor.config"
-SRC_URI += "file://fw_env_flash_64M_nor.config"
-SRC_URI:append:uboot-flash-32768 = " file://u-boot_flash_32M.cfg"
 
-ENV_CONFIG_FILE = "fw_env_ast2600_nor.config"
+ENV_CONFIG_FILE = "fw_env_flash_nor.config"
 ENV_CONFIG_FILE:df-phosphor-mmc = "fw_env_ast2600_mmc.config"
-ENV_CONFIG_FILE:uboot-flash-32768 = "fw_env_flash_32M_nor.config"
-ENV_CONFIG_FILE:uboot-flash-65536 = "fw_env_flash_64M_nor.config"
 
 INSANE_SKIP:${PN} = "already-stripped"
 EXTRA_OEMAKE:class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" V=1'