[2/2] board/stm32mp157c-dk2: remove unnecessary workaround
diff mbox series

Message ID 20191103115017.788940-2-b.bilas@grinn-global.com
State New
Headers show
Series
  • [1/2] configs/stm32mp157c_dk2: disable mkfs metadata_csum and dir_index options
Related show

Commit Message

Bartosz Bilas Nov. 3, 2019, 11:50 a.m. UTC
Since we know the proper solution, remove that faulty patch.

Signed-off-by: Bartosz Bilas <b.bilas@grinn-global.com>
---
 ...-fix-checking-the-presence-of-an-env.patch | 37 -------------------
 configs/stm32mp157c_dk2_defconfig             |  1 -
 2 files changed, 38 deletions(-)
 delete mode 100644 board/stmicroelectronics/stm32mp157c-dk2/patches/uboot/0001-stm32mp1-configs-fix-checking-the-presence-of-an-env.patch

Comments

Peter Korsgaard Nov. 3, 2019, 6:54 p.m. UTC | #1
>>>>> "Bartosz" == Bartosz Bilas <b.bilas@grinn-global.com> writes:

 > Since we know the proper solution, remove that faulty patch.

Ehh, can you be a bit more specific? Do you mean that the change of
ext4fs parameters fix the issue that this is trying to work around?
Bartosz Bilas Nov. 4, 2019, 5:07 p.m. UTC | #2
Hello Peter,

On 03.11.2019 19:54, Peter Korsgaard wrote:
>>>>>> "Bartosz" == Bartosz Bilas <b.bilas@grinn-global.com> writes:
>   > Since we know the proper solution, remove that faulty patch.
>
> Ehh, can you be a bit more specific? Do you mean that the change of
> ext4fs parameters fix the issue that this is trying to work around?

I'm sorry for that - it was so obvious for me during patches generation. 
Yes, I do - disabling new features that are enabled by default in new 
mkfs version fix the issue with mounting rootfs partition.

Best
Bartek

Patch
diff mbox series

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
index 695c8bbc42..0000000000
--- 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 ba044e5e55..7d3cca9987 100644
--- 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"