From patchwork Wed Dec 4 17:54:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 180824 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp930985ile; Wed, 4 Dec 2019 10:02:15 -0800 (PST) X-Google-Smtp-Source: APXvYqzoWDKTjkUaPnT3UL7PFgUjl+WdlcgldIi2XTNk4xcf1EF8xAV1/yqgUKUoV7PyQLUScbdX X-Received: by 2002:a9d:18b:: with SMTP id e11mr3274908ote.305.1575482535331; Wed, 04 Dec 2019 10:02:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575482535; cv=none; d=google.com; s=arc-20160816; b=KW9fGU3Qb5qY1ha5B7gUvnVHbr5/dafR0rEVVLCpDWdDbhmRNwitW1oawvRjRTj7js q8r5OALJjJbAGb2TQ/mBnUpYoZJ11Rl1KoVSSwosNNVDU2yECNQvfyjUYgpiqu2WrHAs uCI84rEsyqgRKmX36hwnd4TwaQGis05WK0Gm/FSeNvv4Tp41FMElHJziyk3Ip/z7oqvX B1jWga/o8z/BaXwCcGfM1tskKPJYB0FMGFhaX/qyKbbPVoq/hL4llaRzEE+LmwOQXRI4 9tl5OGdiKpk2aSa2470QZ9o2hcFWC8l/sxOsOK8fnzdGYF/YKjKm3ythGkYWduGII5CR +Ieg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xkDN+RyqZKWlaJbkZyWhRScKuosMYLrjjJ5cmmPeDQI=; b=NVQ5s/OX93ItZPYR7NejJ1YaRjx+9vBSpAWXo6r4Qe4DByPnK8+eBg7yVkl9ZCPsU9 Bj++m+0/GnJN4j5nL+67vdh2s67o4ci9Py9fY0P+q2hYPrToleiisJxQIOSUy44WZqhw THjU7gmDN0SrXnSeFUVQ66syDZY5+3ytWXltOneMq8g23ocwItdpM9tpjg2dXo07rrmZ FMqL424DwWK4O7/g5ieiPJSi1MFC7rnh8lLhs7xr9/V4S30NzQkHrlUNkOn3r+GCucZ/ hk2nMJcZg+UTC15kwb0mwfReLjO9dc9SPSmkkZT8BKRIxpV0Vegw2uLuVAW9Yt27lyiq Hrmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=VI2i70dF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y186si3588877oig.241.2019.12.04.10.02.14; Wed, 04 Dec 2019 10:02:15 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=VI2i70dF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729350AbfLDSCN (ORCPT + 27 others); Wed, 4 Dec 2019 13:02:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:43842 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729782AbfLDSCK (ORCPT ); Wed, 4 Dec 2019 13:02:10 -0500 Received: from localhost (unknown [217.68.49.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B1D5B2073B; Wed, 4 Dec 2019 18:02:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482530; bh=JpUGC9nWCZCTQes37a4qys2DDjrsol2d6dZ4/1Ex844=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VI2i70dF85dLMK+jvDnOZ0QQ3k8PXLGJcnUuI30LY8KKqNNaStIE5SuOfexRtNhqj R1cKxDTd3CWXCilxIblj18PBUaYYUOTvsjvD/NnEbZNvE2PF61h8sxTEz/zjE9vqNR vT+ojA3a4pAWZhlhx9kAxi6OUPNNsocgvJ8WUE58= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Linus Walleij , Sasha Levin Subject: [PATCH 4.14 032/209] ARM: dts: Fix up SQ201 flash access Date: Wed, 4 Dec 2019 18:54:04 +0100 Message-Id: <20191204175323.691598376@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204175321.609072813@linuxfoundation.org> References: <20191204175321.609072813@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Linus Walleij [ Upstream commit d88b11ef91b15d0af9c0676cbf4f441a0dff0c56 ] This sets the partition information on the SQ201 to be read out from the RedBoot partition table, removes the static partition table and sets our boot options to mount root from /dev/mtdblock2 where the squashfs+JFFS2 resides. Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- arch/arm/boot/dts/gemini-sq201.dts | 37 ++++-------------------------- 1 file changed, 5 insertions(+), 32 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/gemini-sq201.dts b/arch/arm/boot/dts/gemini-sq201.dts index 63c02ca9513c4..e9e2f6ff0c583 100644 --- a/arch/arm/boot/dts/gemini-sq201.dts +++ b/arch/arm/boot/dts/gemini-sq201.dts @@ -20,7 +20,7 @@ }; chosen { - bootargs = "console=ttyS0,115200n8"; + bootargs = "console=ttyS0,115200n8 root=/dev/mtdblock2 rw rootfstype=squashfs,jffs2 rootwait"; stdout-path = &uart0; }; @@ -71,37 +71,10 @@ /* 16MB of flash */ reg = <0x30000000 0x01000000>; - partition@0 { - label = "RedBoot"; - reg = <0x00000000 0x00120000>; - read-only; - }; - partition@120000 { - label = "Kernel"; - reg = <0x00120000 0x00200000>; - }; - partition@320000 { - label = "Ramdisk"; - reg = <0x00320000 0x00600000>; - }; - partition@920000 { - label = "Application"; - reg = <0x00920000 0x00600000>; - }; - partition@f20000 { - label = "VCTL"; - reg = <0x00f20000 0x00020000>; - read-only; - }; - partition@f40000 { - label = "CurConf"; - reg = <0x00f40000 0x000a0000>; - read-only; - }; - partition@fe0000 { - label = "FIS directory"; - reg = <0x00fe0000 0x00020000>; - read-only; + partitions { + compatible = "redboot-fis"; + /* Eraseblock at 0xfe0000 */ + fis-index-block = <0x1fc>; }; };