diff --git a/recipes-aspeed/images/aspeed-image-norootfs.bb b/recipes-aspeed/images/aspeed-image-norootfs.bb
index 04a41e3..54c095b 100644
--- a/recipes-aspeed/images/aspeed-image-norootfs.bb
+++ b/recipes-aspeed/images/aspeed-image-norootfs.bb
@@ -6,7 +6,6 @@
 
 UBOOT_SUFFIX ?= "bin"
 ASPEED_IMAGE_KERNEL_OFFSET_KB ?= "512"
-ASPEED_IMAGE_KERNEL_OFFSET_KB_aspeed-g6 ?= "640"
 ASPEED_IMAGE_SIZE_KB ?= "32768"
 ASPEED_IMAGE_KERNEL_IMAGE ?= "fitImage-${INITRAMFS_IMAGE}-${MACHINE}-${MACHINE}"
 ASPEED_IMAGE_NAME ?= "aspeed-norootfs-${MACHINE}.bin"
diff --git a/recipes-bsp/u-boot/files/0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch b/recipes-bsp/u-boot/files/0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch
index 8bf99c7..aa56af7 100644
--- a/recipes-bsp/u-boot/files/0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch
+++ b/recipes-bsp/u-boot/files/0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch
@@ -1,7 +1,8 @@
-From 5cc81108739c8b5eb5679f726ae86e677e9dee65 Mon Sep 17 00:00:00 2001
+From c89683eaf94f1f9ac899963c518d10f8abfaf00b Mon Sep 17 00:00:00 2001
 From: Brad Bishop <bradleyb@fuzziesquirrel.com>
 Date: Thu, 5 Sep 2019 20:39:57 -0400
-Subject: [PATCH] arm: evb-ast2600: put environment back at 512KiB
+Subject: [PATCH v3 u-boot aspeed-dev-v2019.04] arm: evb-ast2600: put
+ environment back at 512KiB
 
 Prior to 473f430b90 the environment was at 512KiB, and compatible with
 OpenBMC.  Restore OpenBMC compatibility by moving the environment back
@@ -11,9 +12,28 @@
 Upstream-Status: https://github.com/AspeedTech-BMC/u-boot/pull/1
 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
 ---
- include/configs/evb_ast2600.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+v3:
+  -apply bootm address parameter change globally in aspeed-common.h
+v2:
+  -adjusted bootcmd fit address to match new image location
+---
+ include/configs/aspeed-common.h | 2 +-
+ include/configs/evb_ast2600.h   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
+diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h
+index 7a730d17ad..7b8b2a118d 100644
+--- a/include/configs/aspeed-common.h
++++ b/include/configs/aspeed-common.h
+@@ -52,7 +52,7 @@
+ /*
+  * Miscellaneous configurable options
+  */
+-#define CONFIG_BOOTCOMMAND		"bootm 200a0000"
++#define CONFIG_BOOTCOMMAND		"bootm 20080000"
+ #define CONFIG_ENV_OVERWRITE
+ 
+ #define CONFIG_SYS_BOOTM_LEN 		(0x800000 * 2)
 diff --git a/include/configs/evb_ast2600.h b/include/configs/evb_ast2600.h
 index b4de42a05a..3a12f2f0d4 100644
 --- a/include/configs/evb_ast2600.h