From patchwork Wed Oct 19 08:31:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 5477 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp333041wrs; Wed, 19 Oct 2022 06:40:07 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7+fC+9iZLIINe2jWp8VzTWHlIAHdtxl7sSuK4oTbM02m/7C2PeNzZy4QTU/WCEH9Ml8vrr X-Received: by 2002:a17:907:a05:b0:77b:b538:6476 with SMTP id bb5-20020a1709070a0500b0077bb5386476mr6958101ejc.324.1666186806947; Wed, 19 Oct 2022 06:40:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666186806; cv=none; d=google.com; s=arc-20160816; b=ovzyl0jF8L4DWEy/c6w4U+vsURUYA/Dg/qo5oAIYolcia/ozf8acrPdJRDKz0vsbw2 jCueNhYJbab7cQK9xQBMaoUfQFb9n9w0ogtoMS8337iLzQTqRXwsuNUp5rv+9qeb9cCQ 9TABzRh3/Ff+Fxfu/7EJckJ4Po21cpyCjocMXQmdY8J9SuzqIJuirrOb+j8e7Xb0RmNp 5n1yZhgSXfPMhw9ebsdkxME4C9K/zU+1MRjX7Z944Zyne9UooNOmGWbA2r+gSVp4Ms0X ByMfPlt44Dys4ICMauwI05EsvnRuF+GSbD21t6ZVHMut3rfMZ3kC2PSmLlosvDJZctie Ir7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=G2WHTzLtP7gg2XY0Hgi1BfqURevE6DX7kMtC8TOueqU=; b=c8jAECnW+y8weZ4u2PuG+sQ+gGmvMvJ/9/gWS3+osw0haOmei9VX/roPgW9r2sxv1Z f5/rsjEltp2cRPdjX1JdbKtLeiuBFGD+WRHD5186m+l8FDAakqPNEJLM6d/dyQPGBatS +3ppF21tZQzyZKiclhCQ9nVc752kqC7/D5q9ZjP7tXITQfcWJNSlBZmx72zkG7yGP0lr maIyES1dj2CE8NgX5rbuHxAFgzCMm7zgN9vRlM+P9xk7Gte6KAq9Mc3v5S42Z+Obr+Tl lnWn0hOyrLyvhXOcSwxPzGlTsXtje+mLa5IXZRypkdB1OLb87qkPhSA+XEiGCIb39beN ZC/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=udaDnnP7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z88-20020a509e61000000b00459dc4e4b7fsi13109571ede.143.2022.10.19.06.39.41; Wed, 19 Oct 2022 06:40:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=udaDnnP7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231697AbiJSNhA (ORCPT + 99 others); Wed, 19 Oct 2022 09:37:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230302AbiJSNgQ (ORCPT ); Wed, 19 Oct 2022 09:36:16 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB03814EC46; Wed, 19 Oct 2022 06:25:09 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 15ABFB82476; Wed, 19 Oct 2022 09:05:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89808C433C1; Wed, 19 Oct 2022 09:05:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666170324; bh=Wx81bFGklbMM4d2EYeslYJlmfJiZ5tfrj5cy7G8MD9w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=udaDnnP7Flgmq58VqJjHq6hIfyjvUMVy1P0RKRZ8uOzmzZwSJ3CV0Hw4uBf4AI7YY 829ZyPQ7AhePSBOcWMuDewDDSAzIK9/OkQHOD3uZQwy9QvI7dtzZoIODMtY6P1x3vn x7PHnZcDHkjHfi4KiEHW6uWRAWV0YnG+WRlsd+U0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?utf-8?q?Pali_Roh=C3=A1r?= , Michael Ellerman , Sasha Levin Subject: [PATCH 6.0 613/862] powerpc: dts: turris1x.dts: Fix NOR partitions labels Date: Wed, 19 Oct 2022 10:31:40 +0200 Message-Id: <20221019083317.008903237@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747123497609096769?= X-GMAIL-MSGID: =?utf-8?q?1747123497609096769?= From: Pali Rohár [ Upstream commit c9986f0aefd1ae22fe9cf794d49699643f1e268b ] Partition partition@20000 contains generic kernel image and it does not have to be used only for rescue purposes. Partition partition@1c0000 contains bootable rescue system and partition partition@340000 contains factory image/data for restoring to NAND. So change partition labels to better fit their purpose by removing possible misleading substring "rootfs" from these labels. Fixes: 54c15ec3b738 ("powerpc: dts: Add DTS file for CZ.NIC Turris 1.x routers") Signed-off-by: Pali Rohár Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20220830225500.8856-1-pali@kernel.org Signed-off-by: Sasha Levin --- arch/powerpc/boot/dts/turris1x.dts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/boot/dts/turris1x.dts b/arch/powerpc/boot/dts/turris1x.dts index 12e08271e61f..47027b4cebb3 100644 --- a/arch/powerpc/boot/dts/turris1x.dts +++ b/arch/powerpc/boot/dts/turris1x.dts @@ -263,21 +263,21 @@ }; partition@20000 { - /* 1.7 MB for Rescue Linux Kernel Image */ + /* 1.7 MB for Linux Kernel Image */ reg = <0x00020000 0x001a0000>; - label = "rescue-kernel"; + label = "kernel"; }; partition@1c0000 { /* 1.5 MB for Rescue JFFS2 Root File System */ reg = <0x001c0000 0x00180000>; - label = "rescue-rootfs"; + label = "rescue"; }; partition@340000 { - /* 11 MB for TAR.XZ Backup with content of NAND Root File System */ + /* 11 MB for TAR.XZ Archive with Factory content of NAND Root File System */ reg = <0x00340000 0x00b00000>; - label = "backup-rootfs"; + label = "factory"; }; partition@e40000 {