Modified recipes and patches to be compatible with

u-boot-2018.03-armada-18.12.

recipes-bsp/u-boot/patches-espressobin/0002-Removed-default-environment-vars.patch

@@ -4,14 +4,14 @@ Date: Sat, 13 Feb 2021 09:29:19 +0800
 Subject: [PATCH 2/3] Removed default environment vars
 
 ---
- include/configs/mvebu_armada-common.h | 46 -----------------------------------
- 1 file changed, 46 deletions(-)
+ include/configs/mvebu_armada-common.h | 51 -----------------------------------
+ 1 file changed, 51 deletions(-)
 
 diff --git a/include/configs/mvebu_armada-common.h b/include/configs/mvebu_armada-common.h
-index b4e0851..5ecb68a 100644
+index 84be257..da505cd 100644
 --- a/include/configs/mvebu_armada-common.h
 +++ b/include/configs/mvebu_armada-common.h
-@@ -26,52 +26,6 @@
+@@ -24,57 +24,6 @@
  #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, \
  					  115200, 230400, 460800, 921600 }
 
@@ -24,14 +24,21 @@ index b4e0851..5ecb68a 100644
 -#define CONFIG_HAS_ETH2
 -#define CONFIG_ETHPRIME			"eth0"
 -#define CONFIG_ROOTPATH                 "/srv/nfs/" /* Default Dir for NFS */
--#define CONFIG_EXTRA_ENV_SETTINGS	"kernel_addr=0x5000000\0"	\
+-#define CONFIG_ENV_OVERWRITE		/* ethaddr can be reprogrammed */
+-#define CONFIG_EXTRA_ENV_SETTINGS	"bootcmd=run get_images; " \
+-						"run set_bootargs; " \
+-						"booti $kernel_addr_r " \
+-						"$ramdisk_addr_r " \
+-						"$fdt_addr_r\0" \
+-					"extra_params=pci=pcie_bus_safe\0" \
+-					"kernel_addr_r=0x7000000\0"	\
 -					"initrd_addr=0xa00000\0"	\
 -					"initrd_size=0x2000000\0"	\
--					"fdt_addr=0x4f00000\0"		\
--					"loadaddr=0x5000000\0"		\
+-					"fdt_addr_r=0x6f00000\0"	\
+-					"loadaddr=0x6000000\0"		\
 -					"fdt_high=0xffffffffffffffff\0"	\
 -					"hostname=marvell\0"		\
--					"ramfs_addr=0x8000000\0"	\
+-					"ramdisk_addr_r=0x8000000\0"	\
 -					"ramfs_name=-\0"		\
 -					"fdt_name=fdt.dtb\0"		\
 -					"netdev=eth0\0"			\
@@ -42,25 +49,23 @@ index b4e0851..5ecb68a 100644
 -					"image_name=Image\0"		\
 -					"get_ramfs=if test \"${ramfs_name}\"" \
 -						" != \"-\"; then setenv " \
--						"ramfs_addr 0x8000000; " \
--						"tftpboot $ramfs_addr " \
+-						"ramdisk_addr_r 0x8000000; " \
+-						"tftpboot $ramdisk_addr_r " \
 -						"$ramfs_name; else setenv " \
--						"ramfs_addr -;fi\0"	\
--					"get_images=tftpboot $kernel_addr " \
+-						"ramdisk_addr_r -;fi\0"	\
+-					"get_images=tftpboot $kernel_addr_r " \
 -						"$image_name; tftpboot " \
--						"$fdt_addr $fdt_name; " \
+-						"$fdt_addr_r $fdt_name; " \
 -						"run get_ramfs\0"	\
 -					"console=" CONFIG_DEFAULT_CONSOLE "\0"\
 -					"root=root=/dev/nfs rw\0"	\
 -					"set_bootargs=setenv bootargs $console"\
 -						" $root ip=$ipaddr:$serverip:" \
 -						"$gatewayip:$netmask:$hostname"\
 -						":$netdev:none nfsroot="\
--						"$serverip:$rootpath " \
--						"$extra_params"
--#define CONFIG_BOOTCOMMAND	"run get_images; run set_bootargs; " \
--				"booti $kernel_addr $ramfs_addr $fdt_addr"
--#define CONFIG_ENV_OVERWRITE	/* ethaddr can be reprogrammed */
+-						"$serverip:$rootpath,tcp,v3 " \
+-						"$extra_params " \
+-						"$cpuidle"
  /*
   * For booting Linux, the board info and command line data
   * have to be in the first 8 MB of memory, since this is

recipes-bsp/u-boot/patches-espressobin/0003-Added-fdt_addr_r-and-kernel_addr_r-to-CONFIG_EXTRA_E.patch

@@ -9,15 +9,15 @@ Subject: [PATCH 3/3] Added fdt_addr_r and kernel_addr_r to
  1 file changed, 3 insertions(+)
 
 diff --git a/include/configs/mvebu_armada-common.h b/include/configs/mvebu_armada-common.h
-index 5ecb68a..fcf5d38 100644
+index da505cd..6e78435 100644
 --- a/include/configs/mvebu_armada-common.h
 +++ b/include/configs/mvebu_armada-common.h
-@@ -26,6 +26,9 @@
+@@ -24,6 +24,9 @@
  #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, \
  					  115200, 230400, 460800, 921600 }
 
-+#define CONFIG_EXTRA_ENV_SETTINGS	"fdt_addr_r=0x4f00000\0"		\
-+					  				"kernel_addr_r=0x5000000"
++#define CONFIG_EXTRA_ENV_SETTINGS  "fdt_addr_r=0x4f00000\0"        \
++                                   "kernel_addr_r=0x5000000"
 +
  /*
   * For booting Linux, the board info and command line data

recipes-bsp/u-boot/patches/0003-Integration-of-Mender-boot-code-into-U-Boot.patch

@@ -12,7 +12,7 @@ Signed-off-by: Marcin Pasinski <marcin.pasinski@northern.tech>
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/include/env_default.h b/include/env_default.h
-index ea6704a..700aedb 100644
+index b574345..0095810 100644
 --- a/include/env_default.h
 +++ b/include/env_default.h
 @@ -10,6 +10,8 @@
@@ -22,7 +22,7 @@ index ea6704a..700aedb 100644
 +#include <env_mender.h>
 +
  #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED
- env_t environment __PPCENV__ = {
+ env_t environment __UBOOT_ENV_SECTION__ = {
  	ENV_CRC,	/* CRC Sum */
 @@ -22,6 +24,7 @@ static char default_environment[] = {
  #else

recipes-bsp/u-boot/u-boot-espressobin.inc

@@ -5,8 +5,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/patches:"
 
 # Additions
 
-B = "${WORKDIR}/build"
-
 FILESEXTRAPATHS_prepend := "${THISDIR}/patches-espressobin:"
 SRC_URI_append = " \
     file://0001-Added-rootwait-to-CONFIG_MENDER_BOOTCOMMAND.patch \