From patchwork Fri Apr 1 13:11:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Piotr Dymacz X-Patchwork-Id: 1612201 X-Patchwork-Delegate: pepe2k@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=h+DYlXBm; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=UH7/XPsU; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KVLHf6fDVz9sXM for ; Sat, 2 Apr 2022 00:14:54 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=BA+d9FrSpeQ4tAXEEtRzT6sl6uVZffUVFOF+z20irhY=; b=h+DYlXBmDwj82u It6tyBNTq4VhWmqt/Ul/cs+4jnjipff7RrPyPqUozMUyFDP/9tO5myat477ouHDCzxqVec1WC7Rzv jNdo57d93q/znJLeTHdcZSHKV4g8gSLmn1RpeM78b1RkMrshXVD4dJrCaQPysx8zk/Snvw/BHXljS 38My3D3ZJqZpNS/N43DrfHpXo7NigoozT7kEK6L/6ymHIHJg6KHa0HcNuw/XVBztVxDAqleZFgKfw L8mStdDy1BqmqUlwmXTXF/92BOFHYp09epylc1oqZHNFZigF+keNx/1DaROG3MSYO3YH4LwomsWqz 4ctlLxSJ+60/h2oTf1TQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1naH4O-005jin-Kt; Fri, 01 Apr 2022 13:12:04 +0000 Received: from mail-lj1-x234.google.com ([2a00:1450:4864:20::234]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1naH4I-005jgQ-La for openwrt-devel@lists.openwrt.org; Fri, 01 Apr 2022 13:12:00 +0000 Received: by mail-lj1-x234.google.com with SMTP id a30so3798507ljq.13 for ; Fri, 01 Apr 2022 06:11:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=bxjnnQT4+iPTFhAIPJco4S+g0M7HaWP0CWOvALNg/Ms=; b=UH7/XPsUzV31pU1JxZoo+Pbup+RIlt/Uvf/0X+ZtHBY7cVGYlv91tm2In3tQpA+fCC GMiY2sgYUC/JdwVc1oVm1fqMV64aK06Evsq9Bv/QB8THaAR/hdMl+BCsatepg0qT9XnJ OWgFE3zY74I7xy9uimso1LL3kEAxW5SZdadsOoAs23tMRNSPOov60dXdtSmPhXd76vPL 8EuwdqMMrqyIDrxER6izowHU5nYahQ4YOo6xSnFXQ4SsmaCqQxdW1KZoYFU6iKjN6ff9 fL9fwB9EOIDKhqv4CMQWByQ39zGqV9uBhw5og6VUqS/jskgOp5+iwseJptsnPbHEwFg0 82Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=bxjnnQT4+iPTFhAIPJco4S+g0M7HaWP0CWOvALNg/Ms=; b=PO/WIZ5CDK4uNvYKNc17IH9vuZorsHdzF4GRwD5iaOvajz16PtOCVDz6l/yqpZTpDY fGY+HwWJ6QwIaMZB/Hll+cfWVTHFAsnPE/oEoABPFrOmq0fqgHvMQT7TytoA4hTZ6eqr ljMvlrrDU2BtotCvCm/+RCgJUfrzdoTJybjeJPcqQ36lnYfcdFpoz2/vYc1itp4sOFrg VYoentxYzFbTMzdJcO8zE4X5f3542Ue3SH45tx3T7li8evsv5p6idXgx/MxhRot3/4o+ WfdSv8yMXJntB9VaXYCNeMD8/k+Fl7WkBOyVAH3kyLuZHQvn80ilfhJCKZbUVgmmfRSL PZTw== X-Gm-Message-State: AOAM533LumT7acfg8NDzCnZr4yZ9nenTYjmEqeBKy5nQBMgVuimrInKO qIyqSHRocgygBBxosu85nu0Dqerm1A4= X-Google-Smtp-Source: ABdhPJyv0Xkm+SE1AmcoA8zbfC/6qar33Kremku4qiFuRRsa7In13kZKlurUiTa7izpGhVKNfFclOw== X-Received: by 2002:a2e:8e96:0:b0:24a:eac4:7ffe with SMTP id z22-20020a2e8e96000000b0024aeac47ffemr9074753ljk.430.1648818713618; Fri, 01 Apr 2022 06:11:53 -0700 (PDT) Received: from desktop-mint.lan ([45.142.163.102]) by smtp.gmail.com with ESMTPSA id i25-20020a0565123e1900b0044a2908b040sm238402lfv.115.2022.04.01.06.11.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 06:11:53 -0700 (PDT) From: Piotr Dymacz To: openwrt-devel@lists.openwrt.org Subject: [PATCH 1/4] uboot-imx: bump to 2022.01 release Date: Fri, 1 Apr 2022 15:11:34 +0200 Message-Id: <20220401131137.697545-1-pepe2k@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220401_061158_753277_36DFF975 X-CRM114-Status: GOOD ( 12.95 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Two patches were removed because of the changes introduced in upstream: 1. 110-mx6cuboxi-mmc-fallback.patch Looks like similar changes were introduced in 6c3fbf3e456c ("mx6cuboxi: customize board_boot_order to access eMMC"). Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:234 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [pepe2k[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Two patches were removed because of the changes introduced in upstream: 1. 110-mx6cuboxi-mmc-fallback.patch Looks like similar changes were introduced in 6c3fbf3e456c ("mx6cuboxi: customize board_boot_order to access eMMC"). 2. 111-mx6cuboxi_defconfig-force-mmc-boot.patch The 'CONFIG_SPL_FORCE_MMC_BOOT' was removed in 15aec318ef03 ("Revert "imx: Introduce CONFIG_SPL_FORCE_MMC_BOOT to force MMC boot on falcon mode"). Signed-off-by: Piotr Dymacz --- package/boot/uboot-imx/Makefile | 4 ++-- ...efconfig-enable-some-useful-commands.patch | 21 ++++------------- .../patches/110-mx6cuboxi-mmc-fallback.patch | 15 ------------ ...1-mx6cuboxi_defconfig-force-mmc-boot.patch | 23 ------------------- 4 files changed, 7 insertions(+), 56 deletions(-) delete mode 100644 package/boot/uboot-imx/patches/110-mx6cuboxi-mmc-fallback.patch delete mode 100644 package/boot/uboot-imx/patches/111-mx6cuboxi_defconfig-force-mmc-boot.patch diff --git a/package/boot/uboot-imx/Makefile b/package/boot/uboot-imx/Makefile index 2faa48bd73..d5f5555595 100644 --- a/package/boot/uboot-imx/Makefile +++ b/package/boot/uboot-imx/Makefile @@ -7,10 +7,10 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=2020.04 +PKG_VERSION:=2022.01 PKG_RELEASE:=$(AUTORELEASE) -PKG_HASH:=fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372 +PKG_HASH:=81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413 include $(INCLUDE_DIR)/u-boot.mk include $(INCLUDE_DIR)/package.mk diff --git a/package/boot/uboot-imx/patches/0001-apalis_imx6_defconfig-enable-some-useful-commands.patch b/package/boot/uboot-imx/patches/0001-apalis_imx6_defconfig-enable-some-useful-commands.patch index 10ed918e77..ee50b071e0 100644 --- a/package/boot/uboot-imx/patches/0001-apalis_imx6_defconfig-enable-some-useful-commands.patch +++ b/package/boot/uboot-imx/patches/0001-apalis_imx6_defconfig-enable-some-useful-commands.patch @@ -16,22 +16,11 @@ Signed-off-by: Petr Štetiar --- a/configs/apalis_imx6_defconfig +++ b/configs/apalis_imx6_defconfig -@@ -44,6 +44,7 @@ CONFIG_CMD_GPIO=y - CONFIG_CMD_GPT=y - CONFIG_CMD_I2C=y - CONFIG_CMD_MMC=y -+CONFIG_CMD_PART=y - CONFIG_CMD_USB=y - CONFIG_CMD_USB_SDP=y - CONFIG_CMD_USB_MASS_STORAGE=y -@@ -53,6 +54,10 @@ CONFIG_CMD_PMIC=y +@@ -60,6 +60,7 @@ CONFIG_CMD_CACHE=y + CONFIG_CMD_TIME=y + CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y - CONFIG_OF_CONTROL=y - CONFIG_DEFAULT_DEVICE_TREE="imx6-apalis" -+CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y -+CONFIG_CMD_FAT=y -+CONFIG_CMD_FS_GENERIC=y + CONFIG_OF_CONTROL=y + CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y - CONFIG_SYS_RELOC_GD_ENV_ADDR=y - CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/package/boot/uboot-imx/patches/110-mx6cuboxi-mmc-fallback.patch b/package/boot/uboot-imx/patches/110-mx6cuboxi-mmc-fallback.patch deleted file mode 100644 index 9d490ddf7e..0000000000 --- a/package/boot/uboot-imx/patches/110-mx6cuboxi-mmc-fallback.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/board/solidrun/mx6cuboxi/mx6cuboxi.c -+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c -@@ -286,6 +286,12 @@ static void setup_iomux_enet(void) - gpio_free_list_nodev(&desc, 1); - } - -+void board_boot_order(u32 *spl_boot_list) -+{ -+ spl_boot_list[0] = spl_boot_device(); -+ spl_boot_list[1] = BOOT_DEVICE_MMC1; -+} -+ - int board_phy_config(struct phy_device *phydev) - { - if (phydev->drv->config) diff --git a/package/boot/uboot-imx/patches/111-mx6cuboxi_defconfig-force-mmc-boot.patch b/package/boot/uboot-imx/patches/111-mx6cuboxi_defconfig-force-mmc-boot.patch deleted file mode 100644 index 4c3dc4ce20..0000000000 --- a/package/boot/uboot-imx/patches/111-mx6cuboxi_defconfig-force-mmc-boot.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 00ad8b42dfe801107db25ead8249cb10afcd0f94 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20=C5=A0tetiar?= -Date: Sun, 1 Mar 2020 22:10:23 +0100 -Subject: [PATCH] mx6cuboxi_defconfig: force mmc boot -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Petr Štetiar ---- - configs/mx6cuboxi_defconfig | 1 + - 1 file changed, 1 insertion(+) - ---- a/configs/mx6cuboxi_defconfig -+++ b/configs/mx6cuboxi_defconfig -@@ -9,6 +9,7 @@ CONFIG_ENV_SIZE=0x2000 - CONFIG_ENV_OFFSET=0xFE000 - CONFIG_DM_GPIO=y - CONFIG_SPL_MMC_SUPPORT=y -+CONFIG_SPL_FORCE_MMC_BOOT=y - CONFIG_SPL_SERIAL_SUPPORT=y - CONFIG_NR_DRAM_BANKS=1 - CONFIG_SPL=y