Add u-boot redundant environments

Update fw_env config with two sections.
Update init script to handle redundant envs.
Patch u-boot. Can be removed when openbmc/u-boot is updated and recipe
bumped.

Resolves openbmc/openbmc#1937

Change-Id: I15137f55d960381a0b3fbb58c53090bbd5b86482
Signed-off-by: Edward A. James <eajames@us.ibm.com>
diff --git a/common/recipes-phosphor/initfs/files/obmc-init.sh b/common/recipes-phosphor/initfs/files/obmc-init.sh
index a402ecb..afa8ac1 100644
--- a/common/recipes-phosphor/initfs/files/obmc-init.sh
+++ b/common/recipes-phosphor/initfs/files/obmc-init.sh
@@ -55,7 +55,7 @@
 	# count non-blank non-comment lines
 	# copies=$(grep -v ^# /etc/fw_env.config | grep -c [::alnum::])
 	# ... we could if we had the fw_env.config in the initramfs
-	copies=1
+	copies=2
 
 	# * Change \n to \r and \0 to \n
 	# * Skip to the 5th byte to skip over crc