From patchwork Mon Oct 22 21:47:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 987957 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="k99y/4EQ"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FJ9/0IWR"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42f9D93JwDz9sMx for ; Tue, 23 Oct 2018 08:50:01 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date: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=oAEoCOJPJWeFrGussiL40XoRcufwVsHGQvJrgHiQtaA=; b=k99y/4EQ0YVCR1 e2qNRLSaBbOg25YRKyvyJTKxcu0e6GwKPYVumcCbOIv59kXZ9uj3UYz+SiXq8b4ZEj7hXiFQe41U5 6QWx8jDaY868USSxtfgYnkeiDOCZbq1hGANTCMIihx+t6mIZS68hEu8W5+CcwPgm2COOYpKv4kxnP mEMaVrgQl/5p3mjmofiucVUWFBxxwHvkTgIfZq4IfSbEIVxbuQKfFeO5jADAcIXEhF+1MmpVShQsy wBSt6zKTyy7zep6xg4Us9NDegU0Q0cUB8wopqSGvKftXNn2aXzGxKbY/M7Wf4oi1Npq5CInkVcQpL sv0NFa3O0UtTAOb8bjmQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gEi59-00063z-76; Mon, 22 Oct 2018 21:49:51 +0000 Received: from mail-ed1-x542.google.com ([2a00:1450:4864:20::542]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gEi3W-0005Mr-Fv for openwrt-devel@lists.openwrt.org; Mon, 22 Oct 2018 21:48:30 +0000 Received: by mail-ed1-x542.google.com with SMTP id e5-v6so4692519eds.6 for ; Mon, 22 Oct 2018 14:48:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=TraJeR1NBfLNRtwPXTF9NYg3prE8ApIzemOxkWMRHAE=; b=FJ9/0IWRRNT9K1u1QnvBn/pX0p3ly+JdzX6oNyuKWBTwqTA39RjZsqd7xyhblxt/hI xCx2lnzyMkCb7fGrbmTKX0uGQDy2sopUbhdtLWode8B73KtDzdy4Pnj2HeydIIEcTJ6N ycvNEgNo1RxqlMB+dGPi3cbOLd5YdFVvuQwf6iJjJ9uOr88dkZJggFBe+tmgLYvpF2pS K/fO9D8eobwIjYyvp3JfccJ+z7ENiWRTM+y4jyYDDI6tt2eMXBJtxIgJ1IuPamhJ9An7 5psTDGxMRt4hM9fpKQOmu6qAXQ80g9dYQStC9R10eBgvIOFTbtRIXfoXZYieblX0NEfn 9ZUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=TraJeR1NBfLNRtwPXTF9NYg3prE8ApIzemOxkWMRHAE=; b=IpwOrPonG/wYsYzTRyZ9PKDyRHZnxNvwZQOy519X0XZd1oj978PL8sruPIuu4CAPDX i6zByWat5r0CRcb2pu5HmigWBDUoLZhVFE716VEjjzM7UOlT4k6rgyq2OhAiOh8ritjy mPDtxvOYEmLZgXPIFHrFVc/pY6y4vH3uhPM0gTBWrACzfOqQ1LM0/+LdHEZCDKPFPWfs 2klw8EOQOK3VhKeChgtVm24mCG7LaWS0XGDdxKEC32nvSvh+Tjxql2uuc2p0j1ntwEaO 5zUE+U0NhGff6BXP4mO05SDA7OCqnfK85Fu9/+XRMUnySI0vxDyBChCpGv3avGmYCGat a+GQ== X-Gm-Message-State: ABuFfogzSAxOm/6w6eSkUPzyImK/n6v2t1CoSqncdlqrz16cP6sNeu9y 0ABxrJJv2DUxwDQjSS98Y/y0zSWGCC8= X-Google-Smtp-Source: ACcGV62IQbkmxfB7rjVM/wnVZ6cYE/1jttSXxer17haHcOTOQsmXYWAWb7CS0QCHMUk/1pZPJ0/8qQ== X-Received: by 2002:a17:906:135a:: with SMTP id x26-v6mr36795388ejb.23.1540244878541; Mon, 22 Oct 2018 14:47:58 -0700 (PDT) Received: from debian64.daheim (p5B0D7C4D.dip0.t-ipconnect.de. [91.13.124.77]) by smtp.gmail.com with ESMTPSA id p19-v6sm6910693ejw.69.2018.10.22.14.47.57 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Oct 2018 14:47:57 -0700 (PDT) Received: from chuck by debian64.daheim with local (Exim 4.91) (envelope-from ) id 1gEi3I-0004qz-BZ for openwrt-devel@lists.openwrt.org; Mon, 22 Oct 2018 23:47:56 +0200 From: Christian Lamparter To: openwrt-devel@lists.openwrt.org Date: Mon, 22 Oct 2018 23:47:53 +0200 Message-Id: X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181022_144810_581900_D2618016 X-CRM114-Status: GOOD ( 15.57 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:542 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (chunkeey[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [OpenWrt-Devel] [PATCH v2 1/4] ipq40xx: rt-ac58u: replace ubi auto load hack X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: 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 This patch replaces the custom autoload quirk of the RT-AC58U with a bootargs-append overwrite. The vendor's u-boot doesn't leave the bootargs / cmdline alone, so the it can't be overwritten in any other way right now... And of course, this will be a lot of fun to deal with once the device switches to the new spi-nand subsystem. Signed-off-by: Christian Lamparter --- .../arm/boot/dts/qcom-ipq4018-rt-ac58u.dts | 4 +++ ...dd-quirk-to-autoload-ubi-on-rt-ac58u.patch | 29 ------------------- 2 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts index 0b3e4f0e65..4d546bf40f 100644 --- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts +++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts @@ -35,6 +35,10 @@ led-upgrade = &power; }; + chosen { + bootargs-append = " ubi.mtd=UBI_DEV"; + }; + soc { mdio@90000 { status = "okay"; diff --git a/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch b/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch deleted file mode 100644 index 6a83d79d8c..0000000000 --- a/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b8f3a7ccbeca5bdbd1b6210b94b38d3fef2dd0bd Mon Sep 17 00:00:00 2001 -From: Christian Lamparter -Date: Thu, 19 Jan 2017 01:57:22 +0100 -Subject: [PATCH 16/38] mtd: ubi: add auto_attach HACK for the ASUS RT-AC58U - -This patch adds a hack that allows UBI's autoattach feature -to work with the custom ASUS UBI_DEV partition name. - -This is necessary because the vendor's u-boot doesn't leave -the bootargs / cmdline alone, so the it can't be overwritten -easily otherwise. - -Signed-off-by: Christian Lamparter ---- - drivers/mtd/ubi/build.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/mtd/ubi/build.c -+++ b/drivers/mtd/ubi/build.c -@@ -1187,6 +1187,9 @@ static void __init ubi_auto_attach(void) - mtd = open_mtd_device("ubi"); - if (IS_ERR(mtd)) - mtd = open_mtd_device("data"); -+ /* Hack for the Asus RT-AC58U */ -+ if (IS_ERR(mtd)) -+ mtd = open_mtd_device("UBI_DEV"); - - if (IS_ERR(mtd)) - return;