diff --git a/riscv-bootargs-preboot.patch b/riscv-bootargs-preboot.patch
index 4faba11..f234428 100644
--- a/riscv-bootargs-preboot.patch
+++ b/riscv-bootargs-preboot.patch
@@ -1,22 +1,22 @@
 diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig
-index 7e1e5a77..792afee8 100644
+index 33776f03..42ec49eb 100644
 --- a/configs/qemu-riscv64_smode_defconfig
 +++ b/configs/qemu-riscv64_smode_defconfig
-@@ -11,3 +11,7 @@ CONFIG_CMD_BOOTEFI_SELFTEST=y
- CONFIG_CMD_NVEDIT_EFI=y
+@@ -13,3 +13,7 @@ CONFIG_CMD_NVEDIT_EFI=y
  # CONFIG_CMD_MII is not set
  CONFIG_OF_PRIOR_STAGE=y
+ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 +CONFIG_USE_BOOTARGS=y
 +CONFIG_BOOTARGS="console=ttyS0 earlycon"
 +CONFIG_USE_PREBOOT=y
 +CONFIG_PREBOOT="cp.l ${fdtcontroladdr} ${fdt_addr_r} 0x10000;"
 diff --git a/configs/sifive_fu540_defconfig b/configs/sifive_fu540_defconfig
-index 48865e5f..8a4bc0b7 100644
+index 790da976..dff48057 100644
 --- a/configs/sifive_fu540_defconfig
 +++ b/configs/sifive_fu540_defconfig
-@@ -9,3 +9,5 @@ CONFIG_MISC_INIT_R=y
- CONFIG_DISPLAY_CPUINFO=y
+@@ -11,3 +11,5 @@ CONFIG_DISPLAY_CPUINFO=y
  CONFIG_DISPLAY_BOARDINFO=y
  CONFIG_OF_PRIOR_STAGE=y
+ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 +CONFIG_USE_BOOTARGS=y
 +CONFIG_BOOTARGS="console=ttySIF0 earlycon"
diff --git a/uboot-riscv-def-kernel_comp_addr_r-filesize.patch b/uboot-riscv-def-kernel_comp_addr_r.patch
similarity index 80%
rename from uboot-riscv-def-kernel_comp_addr_r-filesize.patch
rename to uboot-riscv-def-kernel_comp_addr_r.patch
index 57922ba..bc3963b 100644
--- a/uboot-riscv-def-kernel_comp_addr_r-filesize.patch
+++ b/uboot-riscv-def-kernel_comp_addr_r.patch
@@ -1,26 +1,24 @@
 diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h
-index bc831a84..442f0f9d 100644
+index 801d2f5c..0bcadb0f 100644
 --- a/include/configs/qemu-riscv.h
 +++ b/include/configs/qemu-riscv.h
-@@ -60,6 +60,8 @@
+@@ -59,6 +59,7 @@
  	"scriptaddr=0x88100000\0" \
  	"pxefile_addr_r=0x88200000\0" \
  	"ramdisk_addr_r=0x88300000\0" \
 +	"kernel_comp_addr_r=0x90000000\0" \
-+	"filesize=0x4000000\0" \
  	BOOTENV
  #endif
  
 diff --git a/include/configs/sifive-fu540.h b/include/configs/sifive-fu540.h
-index 59cf0281..5114dde1 100644
+index 4fef86c1..864bb051 100644
 --- a/include/configs/sifive-fu540.h
 +++ b/include/configs/sifive-fu540.h
-@@ -40,6 +40,8 @@
+@@ -39,6 +39,7 @@
  	"scriptaddr=0x88100000\0" \
  	"pxefile_addr_r=0x88200000\0" \
  	"ramdisk_addr_r=0x88300000\0" \
 +	"kernel_comp_addr_r=0x90000000\0" \
-+	"filesize=0x4000000\0" \
  	BOOTENV
  
  #endif /* __CONFIG_H */
diff --git a/uboot-tools.spec b/uboot-tools.spec
index 1f18b8d..88e8049 100644
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@ -64,7 +64,7 @@ Patch25: uboot-addappend.patch
 
 # Not upstream
 # Define kernel_comp_addr_r and filesize for booti Image.gz support
-Patch26: uboot-riscv-def-kernel_comp_addr_r-filesize.patch
+Patch26: uboot-riscv-def-kernel_comp_addr_r.patch
 
 # Not upstream (but posted)
 # See: https://patchwork.ozlabs.org/patch/1196837/