From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB529FC6196 for ; Fri, 8 Nov 2019 12:07:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B7B53222CB for ; Fri, 8 Nov 2019 12:07:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573214873; bh=UQqrX8WIV1t+B6MoS4A/O7Fq9b82XTjs3GjfvV153io=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KQMpmDGV/XuSFvcvzp/pF/09WhI1sfq/E4LbPp9UmO2HOM5XahYE+wp7wbOcBWJ6Q 8Mev24MyJLqdcvS1P63bZB6+BF0PuYpBkqS5wXxzNviiRdn9O6fBRU5QgqoEQQrKED 1l7DG9ronbVKH208B6u40VKLVPV17NBZ5anfIB4g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388940AbfKHLko (ORCPT ); Fri, 8 Nov 2019 06:40:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:53634 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388839AbfKHLkl (ORCPT ); Fri, 8 Nov 2019 06:40:41 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 39B5A22475; Fri, 8 Nov 2019 11:40:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573213241; bh=UQqrX8WIV1t+B6MoS4A/O7Fq9b82XTjs3GjfvV153io=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zmH7a2AaVu7XEAr+gZeMirtrLecsYYGGRBJctRsNm0QgvLsOVd4QGu4Nzaxf/QFN2 r37NoAhQ0uoNxDjui60hEiB4W7ey/Nf4B7Q1TNoA7ngOfJC/WMQSwmzNgWkBVn1OqP 5uSQWg4RE01eT9SS13FX4VXbqLBWoQQnty92yQug= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "H. Nikolaus Schaller" , Tony Lindgren , Sasha Levin , linux-omap@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 110/205] ARM: dts: omap3-gta04: make NAND partitions compatible with recent U-Boot Date: Fri, 8 Nov 2019 06:36:17 -0500 Message-Id: <20191108113752.12502-110-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191108113752.12502-1-sashal@kernel.org> References: <20191108113752.12502-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: "H. Nikolaus Schaller" [ Upstream commit fa99c21ecb3cd4021a60d0e8bf880e78b5bd0729 ] Vendor defined U-Boot has changed the partition scheme a while ago: * kernel partition 6MB * file system partition uses the remainder up to end of the NAND * increased size of the environment partition (to get an OneNAND compatible base address) * shrink the U-Boot partition Let's be compatible (e.g. Debian kernel built from upstream). Signed-off-by: H. Nikolaus Schaller Signed-off-by: Tony Lindgren Signed-off-by: Sasha Levin --- arch/arm/boot/dts/omap3-gta04.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi index de873e395c05d..bb435684500fc 100644 --- a/arch/arm/boot/dts/omap3-gta04.dtsi +++ b/arch/arm/boot/dts/omap3-gta04.dtsi @@ -619,22 +619,22 @@ bootloaders@80000 { label = "U-Boot"; - reg = <0x80000 0x1e0000>; + reg = <0x80000 0x1c0000>; }; - bootloaders_env@260000 { + bootloaders_env@240000 { label = "U-Boot Env"; - reg = <0x260000 0x20000>; + reg = <0x240000 0x40000>; }; kernel@280000 { label = "Kernel"; - reg = <0x280000 0x400000>; + reg = <0x280000 0x600000>; }; - filesystem@680000 { + filesystem@880000 { label = "File System"; - reg = <0x680000 0xf980000>; + reg = <0x880000 0>; /* 0 = MTDPART_SIZ_FULL */ }; }; }; -- 2.20.1