u-boot: Remove kconfig specific env integration patch

UBOOT_KCONFIG_SUPPORT defaults to 1 in meta-balena starting with commit ef248aa5163 and the static integration of the env is no longer necessary because it is already done by the OS u-boot class. Signed-off-by: Alexandru Costache <alexandru@balena.io>
balena-os · Aug 24, 2023 · 32d1f35 · 32d1f35
1 parent b804123
commit 32d1f35
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 41 deletions.
diff --git a/...recipes-bsp/u-boot/u-boot/0001-Integrate-machine-independent-resin-environment-conf.patch b/...recipes-bsp/u-boot/u-boot/0001-Integrate-machine-independent-resin-environment-conf.patch
diff --git a/layers/meta-balena-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend b/layers/meta-balena-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -1,11 +1,7 @@
 inherit resin-u-boot
-UBOOT_KCONFIG_SUPPORT = "1"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-# Remove patch inherited from meta-resin. This needs to be rebased for v2018.07
-SRC_URI:remove = " file://resin-specific-env-integration-kconfig.patch "
-
 # Update to u-boot v2021.10 on top of which
 # we apply the NVME patches for CM4.
 SRCREV="d80bb749fab53da72c4a0e09b8c2d2aaa3103c91"
@@ -21,7 +17,6 @@ RPI_PATCHES = " \
 "
 
 SRC_URI += " \
-    file://0001-Integrate-machine-independent-resin-environment-conf.patch \
     ${RPI_PATCHES} \
 "