From patchwork Fri Aug 12 17:12:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Baatz X-Patchwork-Id: 9277513 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6F39A60780 for ; Fri, 12 Aug 2016 17:15:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D27D28AA6 for ; Fri, 12 Aug 2016 17:15:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 50C0028ABE; Fri, 12 Aug 2016 17:15:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7AB6C28AA6 for ; Fri, 12 Aug 2016 17:15:58 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bYG2N-0003EW-Ha; Fri, 12 Aug 2016 17:14:27 +0000 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bYG2J-00038Q-AH for linux-arm-kernel@lists.infradead.org; Fri, 12 Aug 2016 17:14:24 +0000 Received: by mail-wm0-x242.google.com with SMTP id i5so4015314wmg.2 for ; Fri, 12 Aug 2016 10:14:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=RzDAsbEFIRuDJN9ImeAVf/1ZfWSzbb2T4zhdDDKCMuA=; b=Osft4y5MQFf1ddU4FMpmjnu4DduVlV1Bk21sCmUIcrvPZFNM2IeIRwsIKHHEis61a6 Ysxqf4Kzk9kqQN9FsrbnFH5Y9R16pS3j586CbjllRrWSp+2K5lSBqVjKofSFGxBOuIkp Km+3z7hH6a5u0+t/G1zdNrDddgbXaSR0MkibtUQWSWXJM8/im8i9/bMYtGpuq0gU1qmF iEo0HQVBTq8M+t9yopRDlX2/+9y/pFxrNIBuc5bu9AoDqT015qoDGELVqqeunYRO3al6 1TodUKnqKJQAk0fb5tDI7EYSASpBZVSeIzm28B1CQrUXUyeoGTh/3nrhIzVfr48ofCTw LVDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=RzDAsbEFIRuDJN9ImeAVf/1ZfWSzbb2T4zhdDDKCMuA=; b=Rvn7eTNjX80NLlsMRcVLShSBVRoPAEkI3p37OI/qlbFt+1wCJmMQVx0GKcZo6zVlTg Ctl9cPWep71WpupYwRy7NlTnKHFK5x2LTwQbruCUmGoUypgoJM+00LoKZ3p6fUzuupkN D/NVnuQnqj9bpUqGqiRS9d2WIlLsR5QF7RiHkRiMefEoU2qigAxW5lrSkWGhSh4Cw6oB kIZ5XZn2UTCt6z6v4W9NAajDmJztWd6S0RNipk/+cUzuQLks/DwEihmosvCEh24CkUWx hyU72z4qnGnXvsfX/r8Dn7VFOehoL54OvCVe6owZXqHTK2osjZkvxYbbUwRA031lO4EJ zZKA== X-Gm-Message-State: AEkoousbLYARuaVNyNuAZFUq4XS/63NAr8IsOOv+i5Ym1ExHlokDxmfCVtkEd1cAxu8VOA== X-Received: by 10.194.222.194 with SMTP id qo2mr19129073wjc.109.1471022040974; Fri, 12 Aug 2016 10:14:00 -0700 (PDT) Received: from gandalf.schnuecks.de (p5DE8EA41.dip0.t-ipconnect.de. [93.232.234.65]) by smtp.gmail.com with ESMTPSA id al10sm8394728wjc.12.2016.08.12.10.13.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Aug 2016 10:14:00 -0700 (PDT) Received: by gandalf.schnuecks.de (Postfix, from userid 500) id 1E9DFF8167; Fri, 12 Aug 2016 19:13:59 +0200 (CEST) From: Simon Baatz To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: kirkwood: ib62x0: fix size of u-boot environment partition Date: Fri, 12 Aug 2016 19:12:50 +0200 Message-Id: <1471021970-21248-1-git-send-email-gmbnomis@gmail.com> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160812_101423_564321_C1B7C28A X-CRM114-Status: UNSURE ( 9.86 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: gregory.clement@free-electrons.com, andrew@lunn.ch, jason@lakedaemon.net, luka@openwrt.org, sebastian.hesselbarth@gmail.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 148c274ea644 ("ARM: kirkwood: ib62x0: add u-boot environment partition") split the "u-boot" partition into "u-boot" and "u-boot environment". However, instead of the size of the environment, an offset was given, resulting in overlapping partitions. Signed-off-by: Simon Baatz Fixes: 148c274ea644 ("ARM: kirkwood: ib62x0: add u-boot environment partition") Cc: Jason Cooper Cc: Andrew Lunn Cc: Gregory Clement Cc: Sebastian Hesselbarth Cc: Luka Perkov Cc: stable@vger.kernel.org # 3.13+ Reviewed-by: Andrew Lunn --- arch/arm/boot/dts/kirkwood-ib62x0.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts index ef84d8699a76..5bf62897014c 100644 --- a/arch/arm/boot/dts/kirkwood-ib62x0.dts +++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts @@ -113,7 +113,7 @@ partition@e0000 { label = "u-boot environment"; - reg = <0xe0000 0x100000>; + reg = <0xe0000 0x20000>; }; partition@100000 {