From cf1398262577e46a497fc845227ce09c6f71e748 Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei@gherzan.ro>
Date: Thu, 6 Aug 2020 11:59:33 +0100
Subject: Revert "u-boot: Move fw_env.config to u-boot append"

This reverts commit fc494a35b513b05860c5a813239274017f1ef934.
---
 recipes-bsp/u-boot/libubootenv_%.bbappend | 12 ++++++++++++
 recipes-bsp/u-boot/u-boot_%.bbappend      |  8 --------
 2 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 recipes-bsp/u-boot/libubootenv_%.bbappend

diff --git a/recipes-bsp/u-boot/libubootenv_%.bbappend b/recipes-bsp/u-boot/libubootenv_%.bbappend
new file mode 100644
index 0000000..22d1bdc
--- /dev/null
+++ b/recipes-bsp/u-boot/libubootenv_%.bbappend
@@ -0,0 +1,12 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI_append_rpi = " \
+    file://fw_env.config \
+"
+
+DEPENDS_append_rpi = " rpi-u-boot-scr"
+
+do_install_append_rpi () {
+    install -d ${D}${sysconfdir}
+    install -m 0644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
+}
diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend
index 2442dfc..40b4fc0 100644
--- a/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -1,13 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append_rpi = " \
-    file://fw_env.config \
-"
-
 DEPENDS_append_rpi = " u-boot-default-script"
 
 SRC_URI_append_raspberrypi-cm3 = " file://0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch"
-do_install_append_rpi () {
-    install -d ${D}${sysconfdir}
-    install -m 0644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
-}
-- 
cgit v1.2.3-54-g00ecf