From patchwork Mon Jun 4 07:51:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 924875 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lDcJKbc/"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40znG65Rdwz9ryk for ; Mon, 4 Jun 2018 17:52:13 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id D9BF9C21EFB; Mon, 4 Jun 2018 07:52:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id DE573C21E31; Mon, 4 Jun 2018 07:52:04 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id F19B6C21E31; Mon, 4 Jun 2018 07:52:02 +0000 (UTC) Received: from mail-pl0-f66.google.com (mail-pl0-f66.google.com [209.85.160.66]) by lists.denx.de (Postfix) with ESMTPS id 5ACAEC21C8B for ; Mon, 4 Jun 2018 07:52:02 +0000 (UTC) Received: by mail-pl0-f66.google.com with SMTP id w17-v6so3342912pll.9 for ; Mon, 04 Jun 2018 00:52:02 -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; bh=v6SJR1uydMOdBhsXoWFqJmgf6Fk3BzvqamqDaKLKEcE=; b=lDcJKbc/WT101QByIxNWMEHiDrxVoxWnCQPGtVLbBBt5vYXz9OZ+r/Bc14SsDT/bop sfd007RmoEl8/Kf1PJXabw64zz/lcuqjfxrrnH4EeVFNAPJFCxIPxyhb+CH3OVpBYqWN NchAHJ1pdtf0Pt4qRFr9FuIadCyWwUEHhQYP1sc/cprDsVEW+VwvW36L1OAmCpu9I1by pBTK6OniXTDLs7e+iEgdL7ZZd9dJ3z7a67/q8Im5s549kSManp3oasU4RaaDNISWhlBV 36hvoVv7R/obahDN1mtVFZjFyW6IqqzqCXHS8WNVLkDy0nwt6nJvl+up2eSXLB6UFef7 VSTQ== 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; bh=v6SJR1uydMOdBhsXoWFqJmgf6Fk3BzvqamqDaKLKEcE=; b=JR7397BZtqwSE+PwEG0vIruri3CNJaGCTwePLFLJpgKkaLh32YCMcrPSv8IXmFmJpQ i7GJWi2uUxlFo2v0EAwGendqLWJ1UPY3JfEeqgNRB1qJ6YYqX0wWjkDVJgUIy3bsKKgV o/6FdMzwHW/VSnAeohc0+a1dXdPYrCTCxwrSK67s0LUfMedphcGZOGf8w5lLemCUa/m9 yQkE/9Zcv+6ZuJoH5t/37aJwOYp8T8IYkRVzlsRDyzWfuij7BjN+JmlbZMGVGqkDWS1C GDALsxs+LlHzsYNHod+YHsEdWVscf5yR4aoydGiJVS9Y+RoL4pCzXmsFmEeI6ygfKANZ G98Q== X-Gm-Message-State: APt69E2/kspQAJtULSwx36cb3Q+EM7/i3mHx2cyhGbv+qU3Yf2oZtB99 PjtTWlRhjiY+h5PyA8mEsbXA10Lh X-Google-Smtp-Source: ADUXVKJgBn9XTHuqcfRZWDlS1w5BXENTzqcxznBaYIhq/O1gPjKX0MfhZfhem5fqIIRn5IWyFvVUBQ== X-Received: by 2002:a17:902:7293:: with SMTP id d19-v6mr3446948pll.142.1528098720571; Mon, 04 Jun 2018 00:52:00 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id 68-v6sm79384009pfk.46.2018.06.04.00.51.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Jun 2018 00:51:59 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Mon, 4 Jun 2018 19:51:49 +1200 Message-Id: <20180604075150.7973-1-judge.packham@gmail.com> X-Mailer: git-send-email 2.17.0 Cc: Tom Rini , Prafulla Wadaskar , Luka Perkov , Vagrant Cascadian , Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH 1/2] ARM: kirkwood: Enforce size limit for sheevaplug X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The u-boot binary sits in flash immediately before the environment. Don't allow the binary size to grow into the environment space. Signed-off-by: Chris Packham Reviewed-by: Stefan Roese --- This will actually result in a build failure. Which is what we want, at least until https://lists.denx.de/pipermail/u-boot/2018-June/330467.html is merged. include/configs/sheevaplug.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 23dd5ceb7cb9..dc6375841ed8 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -44,6 +44,11 @@ #define CONFIG_ENV_SIZE 0x20000 /* 128k */ #define CONFIG_ENV_ADDR 0x80000 #define CONFIG_ENV_OFFSET 0x80000 /* env starts here */ +/* + * Environment is right behind U-Boot in flash. Make sure U-Boot + * doesn't grow into the environment area. + */ +#define CONFIG_BOARD_SIZE_LIMIT CONFIG_ENV_OFFSET /* * Default environment variables From patchwork Mon Jun 4 07:51:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 924876 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="e8Ds5nRH"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40znGj6YCqz9ryk for ; Mon, 4 Jun 2018 17:52:45 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 91849C21F06; Mon, 4 Jun 2018 07:52:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 7B8ADC21E89; Mon, 4 Jun 2018 07:52:16 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1A169C21F06; Mon, 4 Jun 2018 07:52:10 +0000 (UTC) Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by lists.denx.de (Postfix) with ESMTPS id 98E71C21EEF for ; Mon, 4 Jun 2018 07:52:06 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id h12-v6so5626304pfk.11 for ; Mon, 04 Jun 2018 00:52:06 -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=cKynpYkygDxFaYq4HD2OJ+TDLkzPOsqOdC3e2P6vEO4=; b=e8Ds5nRHIDT7v/O5UWCEuL50lvr/3c/XPgKTELq7LhgLfTSSZ6R3Wz5DSJOYLbSiOs k5ZH2b4dTVwLN+okkUBqsfwmSAguZpALVtPyn7pBJV0h+D/udspdfEeZeBj7rm0ryE0U jI5FQuvlWgunXHOM11GdlrweyFvdk9a3YVf2+SlarGo6cRCr0B8TtzMfeZCWC5yK3DSq GvgvmTLGLSBEf7Ksc5Imn82mbMO5g0062QkeaGLxKbaNTKOkAbo+BuMfJCAvmAXpr/Om A1JwY1u1pnxLPPckN0Ui670na5H4kLwukOirO9VKJQ7PsSusMSaYBOxU/4YXhtGDU6fk Ry6Q== 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=cKynpYkygDxFaYq4HD2OJ+TDLkzPOsqOdC3e2P6vEO4=; b=hQnliJAcYqebt4cO+XpqTFsuNSJEWdSjGTqb4edflQ0gosW3EWaeR/4lI+VlIi7tfe hEaOgbWcA7dNiNxbdCwPZgtMyolktsNHdk/k1i/HW+ytMZpQppQ1dPDYQS2q7PgAq1xw iV9b49zI1zVlxnonzwdy5uwXAoVImzrCIkUGIb88Ql23dWtG5rchAGEc5/fGkSdBgtvR 3PhCHdPvluE9ByZ2lKJqkpFKqMW/hZ7UDv/VYA4SH19KQXZiDJ2M04ZJiT+3uiZ66D9O bExlNw1OUhhuFln7F2SlVZKueHH0wWpxGHRLJ4nwJ7i9rq1wRuoz2uf5wSmPIk5qVAYw uYrg== X-Gm-Message-State: ALKqPwegKvgE1vhpnyf8/lp7SxDAU1JmBcEBQDxCaqjnJi9KZsb1DTeX ht650lrvemXchKR3IhdJI9DtOaF+ X-Google-Smtp-Source: ADUXVKJvnwMRMzqn2D7h1oO7PK+dSBehyNIZ1Ykbbrb/G5A8bYKUUDWxQdA+n6bRJ+pp3JNImx5lcQ== X-Received: by 2002:a62:d9c5:: with SMTP id b66-v6mr20473160pfl.41.1528098724891; Mon, 04 Jun 2018 00:52:04 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id 68-v6sm79384009pfk.46.2018.06.04.00.52.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Jun 2018 00:52:04 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Mon, 4 Jun 2018 19:51:50 +1200 Message-Id: <20180604075150.7973-2-judge.packham@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180604075150.7973-1-judge.packham@gmail.com> References: <20180604075150.7973-1-judge.packham@gmail.com> Cc: Tom Rini , Prafulla Wadaskar , Luka Perkov , Vagrant Cascadian , Siddarth Gore , Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH 2/2] ARM: kirkwood: Enforce size limit for guruplug X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The u-boot binary sits in flash immediately before the environment. Don't allow the binary size to grow into the environment space. Signed-off-by: Chris Packham Reviewed-by: Stefan Roese --- include/configs/guruplug.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index 9e7ca60f112f..04b7e944a461 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -39,6 +39,11 @@ */ #define CONFIG_ENV_SIZE 0x20000 /* 128k */ #define CONFIG_ENV_OFFSET 0xE0000 /* env starts here */ +/* + * Environment is right behind U-Boot in flash. Make sure U-Boot + * doesn't grow into the environment area. + */ +#define CONFIG_BOARD_SIZE_LIMIT CONFIG_ENV_OFFSET /* * Default environment variables