From nobody Sat Oct 18 02:15:27 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD962C4321E for ; Wed, 19 Oct 2022 13:37:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232397AbiJSNhC (ORCPT ); Wed, 19 Oct 2022 09:37:02 -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=20Roh=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pali Roh=C3=A1r [ 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 rout= ers") Signed-off-by: Pali Roh=C3=A1r 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/tur= ris1x.dts index 12e08271e61f..47027b4cebb3 100644 --- a/arch/powerpc/boot/dts/turris1x.dts +++ b/arch/powerpc/boot/dts/turris1x.dts @@ -263,21 +263,21 @@ }; =20 partition@20000 { - /* 1.7 MB for Rescue Linux Kernel Image */ + /* 1.7 MB for Linux Kernel Image */ reg =3D <0x00020000 0x001a0000>; - label =3D "rescue-kernel"; + label =3D "kernel"; }; =20 partition@1c0000 { /* 1.5 MB for Rescue JFFS2 Root File System */ reg =3D <0x001c0000 0x00180000>; - label =3D "rescue-rootfs"; + label =3D "rescue"; }; =20 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 Sy= stem */ reg =3D <0x00340000 0x00b00000>; - label =3D "backup-rootfs"; + label =3D "factory"; }; =20 partition@e40000 { --=20 2.35.1