From patchwork Sun Nov 3 11:50:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Bilas X-Patchwork-Id: 1188543 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=grinn-global.com Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 475Z4N2Hr6z9sPF for ; Sun, 3 Nov 2019 22:50:26 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 400E18A87F; Sun, 3 Nov 2019 11:50:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fKvtA6UR-Rps; Sun, 3 Nov 2019 11:50:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 9B0218A87B; Sun, 3 Nov 2019 11:50:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id C25F01BF3DC for ; Sun, 3 Nov 2019 11:50:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B77C98A1DE for ; Sun, 3 Nov 2019 11:50:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aS5c04IIV96E for ; Sun, 3 Nov 2019 11:50:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from smtp.megiteam.pl (smtp.megiteam.pl [31.186.83.105]) by whitealder.osuosl.org (Postfix) with ESMTPS id 357EB8A87B for ; Sun, 3 Nov 2019 11:50:20 +0000 (UTC) Received: from host-81-161-202-42.oxylion.net.pl ([81.161.202.42] helo=bartekk-pc.lan) by smtp.megiteam.pl with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86.2_XX) (envelope-from ) id 1iREOe-0006zN-75; Sun, 03 Nov 2019 12:50:16 +0100 From: Bartosz Bilas To: buildroot@buildroot.org Date: Sun, 3 Nov 2019 12:50:17 +0100 Message-Id: <20191103115017.788940-2-b.bilas@grinn-global.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191103115017.788940-1-b.bilas@grinn-global.com> References: <20191103115017.788940-1-b.bilas@grinn-global.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] board/stm32mp157c-dk2: remove unnecessary workaround X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Bilas Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Since we know the proper solution, remove that faulty patch. Signed-off-by: Bartosz Bilas --- ...-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 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 -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 ---- - 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"