arm-bsp/fvp-base*: move to u-boot 2020.10

Move both FVP platforms to u-boot 2020.10

Change-Id: If94bb5a343e2709574f84283f39d8d227b32d84d
Signed-off-by: Anders Dellien <anders.dellien@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>

meta-arm-bsp/conf/machine/fvp-common.inc

@@ -31,7 +31,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 PREFERRED_VERSION_linux-yocto ?= "5.4%"
 
-PREFERRED_VERSION_u-boot ?= "2020.07"
+PREFERRED_VERSION_u-boot ?= "2020.10"
 PREFERRED_VERSION_trusted-firmware-a ?= "2.4%"
 
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"

meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bbappend

@@ -2,7 +2,6 @@
 
 THIS_DIR := "${THISDIR}"
 FILESEXTRAPATHS_prepend = "${THIS_DIR}/${BP}:"
-FILESEXTRAPATHS_prepend_fvp-base = "${THIS_DIR}/${BP}/fvp-common:"
 
 #
 # Corstone-500 MACHINE
@@ -11,16 +10,6 @@ SRC_URI_append_corstone500 = " \
                    file://0001-armv7-adding-generic-timer-access-through-MMIO.patch \
                    file://0002-board-arm-add-corstone500-board.patch"
 
-#
-# FVP BASE KMACHINE
-#
-SRC_URI_append_fvp-base = " file://u-boot_vexpress_fvp.patch"
-
-#
-# FVP BASE ARM32 KMACHINE
-#
-SRC_URI_append_fvp-base-arm32 = " file://0001-Add-vexpress_aemv8a_aarch32-variant.patch"
-
 #
 # Juno KMACHINE
 #

meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.10.bbappend

@@ -0,0 +1,13 @@
+# Machine specific u-boot
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:"
+
+#
+# FVP BASE
+#
+SRC_URI_append_fvp-base = " file://u-boot_vexpress_fvp.patch"
+
+#
+# FVP BASE ARM32
+#
+SRC_URI_append_fvp-base-arm32 = " file://0001-Add-vexpress_aemv8a_aarch32-variant.patch"