2 files changed, 11 insertions, 11 deletions
diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils_2013.07%.bbappend b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils_2013.07%.bbappend
index 50c357f..be61682 100644
--- a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils_2013.07%.bbappend
+++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils_2013.07%.bbappend
@@ -1,6 +1,13 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
-SRC_URI += "file://patch-2013.07/0000-u-boot-aspeed-064.patch \
+SRC_URI += "file://fw_env.config \
+            file://patch-2013.07/0000-u-boot-aspeed-064.patch \
             file://patch-2013.07/0001-u-boot-openbmc.patch \
-            file://patch-2013.07/0002-Create-snapshot-of-OpenBMC.patch \
+            file://patch-2013.07/0002-Create-snapshot-of-OpenBMC.patch;striplevel=6 \
            "
+do_install_append() {
+    if [ -e ${WORKDIR}/fw_env.config ] ; then
+        install -d ${D}${sysconfdir}
+        install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
+    fi
+}
diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot_2013.07%.bbappend b/meta-aspeed/recipes-bsp/u-boot/u-boot_2013.07%.bbappend
index 928aca6..a2f26a5 100644
--- a/meta-aspeed/recipes-bsp/u-boot/u-boot_2013.07%.bbappend
+++ b/meta-aspeed/recipes-bsp/u-boot/u-boot_2013.07%.bbappend
@@ -1,13 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
-SRC_URI += "file://fw_env.config \
-            file://patch-2013.07/0000-u-boot-aspeed-064.patch \
+SRC_URI += "file://patch-2013.07/0000-u-boot-aspeed-064.patch \
             file://patch-2013.07/0001-u-boot-openbmc.patch \
-            file://patch-2013.07/0002-Create-snapshot-of-OpenBMC.patch \
+            file://patch-2013.07/0002-Create-snapshot-of-OpenBMC.patch;striplevel=6 \
            "
-
-# Do not install u-boot in rootfs
-do_install[postfuncs] += "remove_uboot_from_rootfs"
-remove_uboot_from_rootfs() {
-    rm -rf ${D}/boot/u-boot*
-}