diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2021.01/fvp-base-arm32/0001-Add-vexpress_aemv8a_aarch32-variant.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2021.01/fvp-base-arm32/0001-Add-vexpress_aemv8a_aarch32-variant.patch
index ccfa57ec..c61912e9 100644
--- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2021.01/fvp-base-arm32/0001-Add-vexpress_aemv8a_aarch32-variant.patch
+++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2021.01/fvp-base-arm32/0001-Add-vexpress_aemv8a_aarch32-variant.patch
@@ -1,4 +1,4 @@
-From 4e3e97f82c60bb60709d80bb4622b4239dbb830d Mon Sep 17 00:00:00 2001
+From eb241dfffcf641d7f37e853e1795557796671b19 Mon Sep 17 00:00:00 2001
 From: Anders Dellien <anders.dellien@arm.com>
 Date: Thu, 23 Jul 2020 17:32:55 +0100
 Subject: [PATCH] Add vexpress_aemv8a_aarch32 variant
@@ -25,15 +25,15 @@ Signed-off-by: Anders Dellien <anders.dellien@arm.com>
  arch/arm/Kconfig                          |  5 +++
  board/armltd/vexpress64/Kconfig           |  2 +-
  configs/vexpress_aemv8a_aarch32_defconfig | 40 +++++++++++++++++++++++
- include/configs/vexpress_aemv8a.h         | 28 +++++++++++-----
- 4 files changed, 65 insertions(+), 10 deletions(-)
+ include/configs/vexpress_aemv8a.h         | 24 +++++++++-----
+ 4 files changed, 62 insertions(+), 9 deletions(-)
  create mode 100644 configs/vexpress_aemv8a_aarch32_defconfig
 
 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 54d65f8488..ab3898c470 100644
+index fbe90875ae..8468bfb45b 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1158,6 +1158,11 @@ config TARGET_VEXPRESS64_BASE_FVP
+@@ -1187,6 +1187,11 @@ config TARGET_VEXPRESS64_BASE_FVP
  	select PL01X_SERIAL
  	select SEMIHOSTING
  
@@ -102,19 +102,17 @@ index 0000000000..cf1e8d5cae
 +CONFIG_DM_SERIAL=y
 +CONFIG_PL01X_SERIAL=y
 diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
-index 09cdd3dab5..efb7d403ef 100644
+index e63c335f85..edded8c52b 100644
 --- a/include/configs/vexpress_aemv8a.h
 +++ b/include/configs/vexpress_aemv8a.h
-@@ -9,8 +9,17 @@
+@@ -9,8 +9,15 @@
  
  #define CONFIG_REMAKE_ELF
  
 +#ifdef CONFIG_ARM64
 +#define BOOT_TYPE                       "booti"
-+#define FDT_ADDR                        "0x83000000"
 +#else
 +#define BOOT_TYPE                       "bootz"
-+#define FDT_ADDR                        "0x82000000"
 +#endif
 +
  /* Link Definitions */
@@ -124,7 +122,7 @@ index 09cdd3dab5..efb7d403ef 100644
  /* ATF loads u-boot here for BASE_FVP model */
  #define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SYS_SDRAM_BASE + 0x03f00000)
  #elif CONFIG_TARGET_VEXPRESS64_JUNO
-@@ -76,7 +85,8 @@
+@@ -76,7 +83,8 @@
  #define GICR_BASE			(0x2f100000)
  #else
  
@@ -134,7 +132,7 @@ index 09cdd3dab5..efb7d403ef 100644
  #define GICD_BASE			(0x2f000000)
  #define GICC_BASE			(0x2c000000)
  #elif CONFIG_TARGET_VEXPRESS64_JUNO
-@@ -159,16 +169,19 @@
+@@ -159,7 +167,8 @@
  				"booti ${kernel_addr_r} ${ramdisk_param} ${fdt_addr_r}"
  
  
@@ -144,11 +142,9 @@ index 09cdd3dab5..efb7d403ef 100644
  #define CONFIG_EXTRA_ENV_SETTINGS	\
  				"kernel_name=Image\0"		\
  				"kernel_addr=0x80080000\0"	\
- 				"initrd_name=ramdisk.img\0"	\
- 				"initrd_addr=0x88000000\0"	\
+@@ -168,7 +177,9 @@
  				"fdtfile=devtree.dtb\0"		\
--				"fdt_addr=0x83000000\0"		\
-+				"fdt_addr=" FDT_ADDR "\0"	\
+ 				"fdt_addr=0x83000000\0"		\
  				"boot_name=boot.img\0"		\
 -				"boot_addr=0x8007f800\0"
 +				"boot_addr=0x8007f800\0"	\
@@ -157,7 +153,7 @@ index 09cdd3dab5..efb7d403ef 100644
  
  #define CONFIG_BOOTCOMMAND	"if smhload ${boot_name} ${boot_addr}; then " \
  				"  set bootargs; " \
-@@ -177,18 +190,15 @@
+@@ -177,18 +188,15 @@
  				"  bootm ${boot_addr} ${boot_addr} " \
  				"  ${fdt_addr}; " \
  				"else; " \