uboot: Add support for ubi and mtd partitioning

Ability for u-boot to load a kernel from a ubi volume.
Add boot options for the kernel to boot a rootfs from a ubi volume.
Create env variables that can be set by userspace to indicate to
u-boot and the kernel where the ubi volume information.

Resolves openbmc/openbmc#1940
Resolves openbmc/openbmc#1943

Change-Id: I670435923c563490afa6a85b852594289295651c
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
diff --git a/common/recipes-bsp/u-boot/u-boot.inc b/common/recipes-bsp/u-boot/u-boot.inc
index 811df0b..5ccbea5 100644
--- a/common/recipes-bsp/u-boot/u-boot.inc
+++ b/common/recipes-bsp/u-boot/u-boot.inc
@@ -7,7 +7,8 @@
 SRC_URI += "${@bb.utils.contains('MACHINE_FEATURES', 'obmc-ubi-fs', \
     'file://0001-config-ast-common-hack-bootopts.patch \
      file://0002-Add-MTD-support-to-Aspeed-Flash-driver.patch \
-     file://0003-Add-MTD-and-UBI-support-to-ast-g5.patch', '', d)}"
+     file://0003-Add-MTD-and-UBI-support-to-ast-g5.patch \
+     file://0004-config-ast-common-ubi-bootops.patch', '', d)}"
 
 PV = "v2016.07+git${SRCPV}"