From patchwork Mon Mar 21 12:17:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Marko X-Patchwork-Id: 12787173 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1BDF3C433EF for ; Mon, 21 Mar 2022 12:18:48 +0000 (UTC) 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:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=0ieIYJH48mU8a14PKo0h2CuhEj5755DBw9rhK97dqSY=; b=HWzYrP+NIk7aTN IIgKt7J67KHsFFY9LJ0gL3YB8JwqvFBUNdFCRGP+e1ObfU0Pxll44KjvofG1rWeI5Z+klqqep1VHK VaaWPAOwxGqplqNipwfHI7j9m94hfmpd1QLrlkgN3vL7+lJiWKGnZxmpVt2crLIiHfP88UM3kAsm1 TZ94Gvbz1UVRxdbqZ0/yjhmHJbyF0mifmh2bIG7PymtIfmIVR2hjIi6av1V5TsjmGP4JOFeeY/bbt kqV9gtNtYYdQg9pK4LrIZwyWWVkTQWKlt3LUUZkgqa/ctReh7TS/neKN1/aoZNnAc9v5O5YpZ/Afw 1BXgOw+T4Llo9uC4A1jQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nWGyh-007fPm-Lp; Mon, 21 Mar 2022 12:17:39 +0000 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nWGyd-007fOP-JR for linux-arm-kernel@lists.infradead.org; Mon, 21 Mar 2022 12:17:37 +0000 Received: by mail-ej1-x62c.google.com with SMTP id p15so29413790ejc.7 for ; Mon, 21 Mar 2022 05:17:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sartura-hr.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Gk1B3hBjSKKALLbMXPJzBO9u7PaCeN3YmxnZwj0te/Q=; b=Y5ZBInvrLKsctfPEN/yXexUNGkj0Fcj3fhlmk93UvxeJPgMALV5CGSZy6u+h/wcUCv xDsxIskcl52BSMzq9KDtExq44Y/QXKWiwgxcNwpMkDTqds/uRNuqD7q1LO8W7xtp0AN9 S4e8/6CvVnCXbVJVsNpdjPGRc4IkNF+6VEr5IoFq0houh9lOiMdrkXEJUFioz02y+IF3 QLerTQgAfucvHTo3LezrfMCTjmYYoOI2Dwa+qb0Sst6tlsUat8qg8OPAFqNgsur3m1bi oEAg+0sq8D4XHR2uqc60aiNzdnlVTFOa7DtUDvkC+UlAOEqUueawj3fYzv766afIULJM 9bzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Gk1B3hBjSKKALLbMXPJzBO9u7PaCeN3YmxnZwj0te/Q=; b=38iPUST+hCI33x4Lo5zML5KKQD+IhSjXKnMP4Bhhq6RxJTfbcDF/y6TcfhoIlW05OC HPr3gtm6Xpumn+zhoedI6/erK5WTbZRN+bZyBdH8YtzXuKERjwZBLURoP7XmErN1hJQ9 no3LHjMoO72P8iONMpk9hIhl+FZggewgaF5eyqicukDZxediIMTCMc2vPcZ3/cffOZkh /zAHN0AFz4mZxy+B1njJv6w0RJ9RQTO5u/VmHBxjGw3JoM7LdsaZ4CqPKoApB2Fihb8A J0BLUdoxPEY6m9LRXQxBgv/CehTCJw41cNM/UYHz/lanjfpQhAhDfuQYV65v8/OZca9Z wRsg== X-Gm-Message-State: AOAM532B/IJM0bBV4SrTtD0E8gzD9OBQAcgYNXA+JtfCYiK2BSMX0/P/ jbC39c0kGl9UGdguCaalTbDyQw== X-Google-Smtp-Source: ABdhPJzBcTTL0aQl8R5DyF7VDiOr/LEmvPfCW4xUYRGmKpuSu9pHiougpl2vJlKa0Jp4IScVwCNuIg== X-Received: by 2002:a17:906:26c6:b0:6da:ecd5:fd48 with SMTP id u6-20020a17090626c600b006daecd5fd48mr19909043ejc.93.1647865053745; Mon, 21 Mar 2022 05:17:33 -0700 (PDT) Received: from fedora.robimarko.hr (cpezg-94-253-144-57-cbl.xnet.hr. [94.253.144.57]) by smtp.googlemail.com with ESMTPSA id nc7-20020a1709071c0700b006dfe66694dasm2457100ejc.144.2022.03.21.05.17.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Mar 2022 05:17:33 -0700 (PDT) From: Robert Marko To: andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, pali@kernel.org, marek.behun@nic.cz Cc: Robert Marko Subject: [PATCH 1/2] arm64: dts: uDPU: update partition table Date: Mon, 21 Mar 2022 13:17:27 +0100 Message-Id: <20220321121728.414839-1-robert.marko@sartura.hr> 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-20220321_051735_707779_A4DAA6FD X-CRM114-Status: GOOD ( 12.28 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Partition currently called "uboot" does not only contain U-boot, but rather it contains TF-A, U-boot and U-boot environment. So, to avoid accidentally deleting the U-boot environment which is located at 0x180000 split the partition. "uboot" is not the correct name as you can't boot these boards with U-boot only, TF-A must be present as well, so rename the "uboot" partition to "firmware". While we are here, describe the NOR node as "spi-flash@0" instead of "m25p80@0" which is the old SPI-NOR driver name. Signed-off-by: Robert Marko --- arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts index 95d46e8d081c..ac64949bb53e 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts @@ -99,7 +99,7 @@ &spi0 { pinctrl-names = "default"; pinctrl-0 = <&spi_quad_pins>; - m25p80@0 { + spi-flash@0 { compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <54000000>; @@ -108,10 +108,15 @@ partitions { compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; - /* only bootloader is located on the SPI */ + partition@0 { - label = "uboot"; - reg = <0 0x400000>; + label = "firmware"; + reg = <0x0 0x180000>; + }; + + partition@180000 { + label = "u-boot-env"; + reg = <0x180000 0x10000>; }; }; };