configs/stm32mp157c_dk2: remove unnecessary workaround

Now that the metadata_csum ext4 option is disabled, we no longer need
the U-Boot workaround.

Signed-off-by: Bartosz Bilas <b.bilas@grinn-global.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/board/stmicroelectronics/stm32mp157c-dk2/patches/uboot/0001-stm32mp1-configs-fix-checking-the-presence-of-an-env.patch b/board/stmicroelectronics/stm32mp157c-dk2/patches/uboot/0001-stm32mp1-configs-fix-checking-the-presence-of-an-env.patch
deleted file mode 100644 (file)
index 695c8bb..0000000
--- a/board/stmicroelectronics/stm32mp157c-dk2/patches/uboot/0001-stm32mp1-configs-fix-checking-the-presence-of-an-env.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a7204e5ae1e5f87ad449c7425cf7614205e60734 Mon Sep 17 00:00:00 2001
-From: Bartosz Bilas <bartosz.bilas@hotmail.com>
-Date: Sun, 27 Oct 2019 09:01:12 +0100
-Subject: [PATCH] stm32mp1: configs: fix checking the presence of an
- environment
-
-Execute env check command within extra env settings section instead of
-bootcmd whereby we are able to mount rootfs partition from sd card properly.
-
-Signed-off-by: Bartosz Bilas <bartosz.bilas@hotmail.com>
----
- include/configs/stm32mp1.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h
-index 988992b336..cadc0358fd 100644
---- a/include/configs/stm32mp1.h
-+++ b/include/configs/stm32mp1.h
-@@ -115,7 +115,6 @@
-       "if test ${boot_device} = serial || test ${boot_device} = usb;" \
-       "then stm32prog ${boot_device} ${boot_instance}; " \
-       "else " \
--              "run env_check;" \
-               "if test ${boot_device} = mmc;" \
-               "then env set boot_targets \"mmc${boot_instance}\"; fi;" \
-               "if test ${boot_device} = nand;" \
-@@ -160,6 +159,7 @@
-       "initrd_high=0xffffffff\0" \
-       "altbootcmd=run bootcmd\0" \
-       "env_default=1\0" \
-+      "run env_check;" \
-       "env_check=if test $env_default -eq 1;"\
-               " then env set env_default 0;env save;fi\0" \
-       STM32MP_BOOTCMD \
--- 
-2.23.0
-

diff --git a/configs/stm32mp157c_dk2_defconfig b/configs/stm32mp157c_dk2_defconfig
index 7e5db3caa99f086f9cde149321ced07260758a32..0535cb212a368c14c4a665f32899f21aa9baa6b9 100644 (file)
--- a/configs/stm32mp157c_dk2_defconfig
+++ b/configs/stm32mp157c_dk2_defconfig
@@ -1,7 +1,6 @@
 BR2_arm=y
 BR2_cortex_a7=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y
-BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32mp157c-dk2/patches"
 BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157c-dk2/overlay/"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/stmicroelectronics/stm32mp157c-dk2/genimage.cfg"