From patchwork Wed Jul 28 23:37:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tao Ren X-Patchwork-Id: 12407047 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 11AFFC432BE for ; Wed, 28 Jul 2021 23:41:11 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id D4A35603E9 for ; Wed, 28 Jul 2021 23:41:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D4A35603E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: 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: List-Owner; bh=L7yzvOman60d2CrtwTNGykrlJgDLQpqK3eCf1vqA5+w=; b=crj3jdrCrD5VVl yTBupYpyT9R5MheDdQTIXyITGh4YZfaAKKCVn+90BtKh4/kFn/oUAenwPyfT8uDd06S8UMWmhq1l9 RtJIAvAIwjIFQdH/iP439vvs7dAR03EwBtV8bGr5+NJSXvEOFCPVqbDBkMfQFKGb3kDSArmsluePa 2grAb9rs/vMDB6Y7bwagvbr8MCtx799emdljZp7/OqDzNLpG+IlzB4QLRyZq93QkLCLOItHj72brE KIfW8M+W7YQy2CJfK4xwxdfpg8rk5QrMnt9EszhEAiSRK9KiwrSFZc1XxBk18eTo7IRBZJ4wKNvCI 6XwXAGrXN+1stJNgUR3A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m8t8F-002Z36-GE; Wed, 28 Jul 2021 23:38:35 +0000 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m8t7p-002Ywk-0k for linux-arm-kernel@lists.infradead.org; Wed, 28 Jul 2021 23:38:10 +0000 Received: by mail-pj1-x1035.google.com with SMTP id b1-20020a17090a8001b029017700de3903so7378762pjn.1 for ; Wed, 28 Jul 2021 16:38:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BFHHs7fv3jc5YudTzgw5MtexrsriZl7knh1DB5cRAes=; b=L3XkxYlsyD9aFePA5FTxjxIxslqcS0nAZPewYHSE3yXv3njr4Q0WGYVoFzfoLjnIdy JzD6jWxJ9mVOn7G2drqpJdBgy1QDVkwOTO6dcs6l7Yk1FZYgR9qTm0d5KziCoTdBeyXE yDtM+lkOOKxKPzMR3etzoHJgcXjPuQrr9N3YvZpUBUo/vMV7x4Uc+XyzznJqiV/xU23p Ke+nVhfGmDxMjgDriBvBRsngyPW2PTzu8CnyzfSBwVXKZPwbad55gzWPd1YU+G2pqiYS sX0hKtjuHfAbpMwzEgLX6dNi48Qb5hKLhaokkNids73NJsKzKZ4906qI9Ot6ZFHBC2JH v2kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BFHHs7fv3jc5YudTzgw5MtexrsriZl7knh1DB5cRAes=; b=HX0MiwyFE/QJLxR8ws8FaWz4nvNtS+d073L4XD0M6qt4ho4fWN64DFY/KnW6zY2ZrE w02EI7t3CHPr0daxLmxatpmg23ZjdWqjhryPGSru3aplV0DFo+7swK2+mQ4zaY8WLAgn 2c25lV8EeH8K7ZtDG5H/L9mZJW2Xe3e9RazYEO7KuM6M02b6tex73KCPJHQk2IXjZKzO eD9d+zQQvJW6kaI3stBFsBIQbFaMJFhluH65Ops5Kcq5Phd30EgrgCbe1X4xDRm6UMeI ShUxQ3PP8GgKWi86dQbSuP0t+TqJ+Wx98Ml+f6O+pRPUo5m2XAIHFDve2+Gj3m6saiju mCKw== X-Gm-Message-State: AOAM530HRzhMeogbjSIudgMv5FyWvn3e9Ul/84yFO81PSr9GVSSRmc7d bntUdunYdQVWtE2B8KqPWF4= X-Google-Smtp-Source: ABdhPJzMdHRqs88mpqu1mG+TTxmvFqc63yR50LFdh3E0MRQmKTa48ri7hpO06GmpQSA3zkuvyc6lOg== X-Received: by 2002:a17:902:7884:b029:12a:efa7:18d8 with SMTP id q4-20020a1709027884b029012aefa718d8mr1997882pll.85.1627515488270; Wed, 28 Jul 2021 16:38:08 -0700 (PDT) Received: from taoren-ubuntu-R90MNF91.thefacebook.com (c-73-252-146-110.hsd1.ca.comcast.net. [73.252.146.110]) by smtp.gmail.com with ESMTPSA id k37sm1038671pgm.84.2021.07.28.16.38.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jul 2021 16:38:07 -0700 (PDT) From: rentao.bupt@gmail.com To: Rob Herring , Joel Stanley , Andrew Jeffery , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org, openbmc@lists.ozlabs.org, taoren@fb.com Cc: Tao Ren Subject: [PATCH 2/6] ARM: dts: aspeed: wedge400: Use common flash layout Date: Wed, 28 Jul 2021 16:37:51 -0700 Message-Id: <20210728233755.17963-3-rentao.bupt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210728233755.17963-1-rentao.bupt@gmail.com> References: <20210728233755.17963-1-rentao.bupt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210728_163809_102658_F9220FAD X-CRM114-Status: GOOD ( 12.69 ) 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Tao Ren Simplify wedge400 flash layout by using the common layout defined in "facebook-bmc-flash-layout-128.dtsi". Signed-off-by: Tao Ren --- .../boot/dts/aspeed-bmc-facebook-wedge400.dts | 48 +------------------ 1 file changed, 1 insertion(+), 47 deletions(-) diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-wedge400.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-wedge400.dts index 63a3dd548f30..a901c8be49b9 100644 --- a/arch/arm/boot/dts/aspeed-bmc-facebook-wedge400.dts +++ b/arch/arm/boot/dts/aspeed-bmc-facebook-wedge400.dts @@ -91,53 +91,7 @@ * Both firmware flashes are 128MB on Wedge400 BMC. */ &fmc_flash0 { - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* - * u-boot partition: 384KB. - */ - u-boot@0 { - reg = <0x0 0x60000>; - label = "u-boot"; - }; - - /* - * u-boot environment variables: 128KB. - */ - u-boot-env@60000 { - reg = <0x60000 0x20000>; - label = "env"; - }; - - /* - * FIT image: 123.5 MB. - */ - fit@80000 { - reg = <0x80000 0x7b80000>; - label = "fit"; - }; - - /* - * "data0" partition (4MB) is reserved for persistent - * data store. - */ - data0@7c00000 { - reg = <0x7c00000 0x400000>; - label = "data0"; - }; - - /* - * "flash0" partition (covering the entire flash) is - * explicitly created to avoid breaking legacy applications. - */ - flash0@0 { - reg = <0x0 0x8000000>; - label = "flash0"; - }; - }; +#include "facebook-bmc-flash-layout-128.dtsi" }; &fmc_flash1 {