From patchwork Thu Apr 25 19:22:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Goldschmidt X-Patchwork-Id: 1091054 X-Patchwork-Delegate: trini@ti.com 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="bH5n0tUv"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44qnC54kt0z9s3q for ; Fri, 26 Apr 2019 05:22:55 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 07C62C21E49; Thu, 25 Apr 2019 19:22:51 +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, 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 8D60AC21C2C; Thu, 25 Apr 2019 19:22:48 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 40B5AC21C2C; Thu, 25 Apr 2019 19:22:47 +0000 (UTC) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by lists.denx.de (Postfix) with ESMTPS id E8B9FC21BE5 for ; Thu, 25 Apr 2019 19:22:46 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id f7so964667wrs.2 for ; Thu, 25 Apr 2019 12:22:46 -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=B5mG8isOkGBr+G58nH0v6NEJu2AgMLIkQl3k3Qnoexc=; b=bH5n0tUvEEDwN2wPUXHcl1CTEDNPkwXLrTWII71QcXs1s6AZaOMsj/aNeMXtt6bpWe 0SYSDVHvibJPUHMPDl4l0WuUQab8zcykR7uRd0yTV+OLrpbX03zvxAdODnrpms0B+r9B 6NKkGfp9sbVKs0q0VVoDZ5tQud4xreQjUhUvant2Z5SjjcXY7TNzD3GKWAACwPBmUIRx Diu8x1kbKv3N8Lzwm2ix53vZ4jSFT4+6aewx+Nj4tXAIf1eOp76MvaUqfaBX/O8z9A2S /FDxF6CI6AnWSxCJyIbyuKVpmISJKHbb/iqmqoT0gpdwYdaTrieApmFVnnQpDgro1kg8 aNkA== 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=B5mG8isOkGBr+G58nH0v6NEJu2AgMLIkQl3k3Qnoexc=; b=Gbz2dIw6pDg2eGrZOBu6xXpmMowFEY7rL8fK1/vrJZBJG5K4osaagLUlgIOnq0a2yt lDZTiulBW3rYWFYaq8bLGHN8YQnmVBDfBJGO2ITADVs2Q5tHb9KkwOvcHxjjpbA1k2dt FshxNJXVsIKe3UFBq3MCPPl0LYjwmdydyk+onJ9wmr03T468CxLUL4tvbjvF7uhPVrb7 +eCaLM5hlRb+3ipHQt/aFr+xqkN5J4LGiF8kkt1xOG0+QmIyL3PNpe8rt1WvDmEWFc4w Nv7rp4NJ1FcNTXpIZl8fjI4R19xCLPV78eurLp+S40Tz1f3D698WW+H31ZsUc9xRbNBy 4osg== X-Gm-Message-State: APjAAAWSo99pUW8U2yLJUYlFc0f7Z3bGKtxlEj3mT7Y1Y7BfzeYvaGdx qjmFW4FnUhytB2/RY9cgat4= X-Google-Smtp-Source: APXvYqwRwv9sQC2CvCDhuP3g/TK280cN9hRwLFPn8k0zchWIvZehF+mkej0uOnfrwDrtW5yPtdV3pg== X-Received: by 2002:adf:e407:: with SMTP id g7mr26479415wrm.47.1556220166595; Thu, 25 Apr 2019 12:22:46 -0700 (PDT) Received: from ubuntu.home ([2a02:8071:6a3:700:1caf:b95c:3a06:5af0]) by smtp.gmail.com with ESMTPSA id 17sm18644406wrk.91.2019.04.25.12.22.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Apr 2019 12:22:45 -0700 (PDT) From: Simon Goldschmidt To: Tom Rini Date: Thu, 25 Apr 2019 21:22:39 +0200 Message-Id: <20190425192240.5925-1-simon.k.r.goldschmidt@gmail.com> X-Mailer: git-send-email 2.17.1 Cc: Stefan Roese , u-boot@lists.denx.de, Mans Rullgard Subject: [U-Boot] [PATCH v5 1/2] spl: fix linker size check off-by-one errors 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" This fixes SPL linker script size checks for 3 lds files where the size checks were implemented as "x < YYY_MAX_SIZE". Fix the size checks to be "x <= YYY_MAX_SIZE" instead. Signed-off-by: Simon Goldschmidt --- Changes in v5: - added patch to fix linker size checks off-by-one error arch/arm/cpu/u-boot-spl.lds | 6 +++--- arch/arm/mach-at91/arm926ejs/u-boot-spl.lds | 4 ++-- arch/microblaze/cpu/u-boot-spl.lds | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/cpu/u-boot-spl.lds b/arch/arm/cpu/u-boot-spl.lds index a2aa93a735..97899a567f 100644 --- a/arch/arm/cpu/u-boot-spl.lds +++ b/arch/arm/cpu/u-boot-spl.lds @@ -79,16 +79,16 @@ SECTIONS } #if defined(IMAGE_MAX_SIZE) -ASSERT(__image_copy_end - __image_copy_start < (IMAGE_MAX_SIZE), \ +ASSERT(__image_copy_end - __image_copy_start <= (IMAGE_MAX_SIZE), \ "SPL image too big"); #endif #if defined(CONFIG_SPL_BSS_MAX_SIZE) -ASSERT(__bss_end - __bss_start < (CONFIG_SPL_BSS_MAX_SIZE), \ +ASSERT(__bss_end - __bss_start <= (CONFIG_SPL_BSS_MAX_SIZE), \ "SPL image BSS too big"); #endif #if defined(CONFIG_SPL_MAX_FOOTPRINT) -ASSERT(__bss_end - _start < (CONFIG_SPL_MAX_FOOTPRINT), \ +ASSERT(__bss_end - _start <= (CONFIG_SPL_MAX_FOOTPRINT), \ "SPL image plus BSS too big"); #endif diff --git a/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds b/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds index 3955bea23a..74f6355229 100644 --- a/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds +++ b/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds @@ -52,11 +52,11 @@ SECTIONS } #if defined(IMAGE_MAX_SIZE) -ASSERT(__image_copy_end - __start < (IMAGE_MAX_SIZE), \ +ASSERT(__image_copy_end - __start <= (IMAGE_MAX_SIZE), \ "SPL image too big"); #endif #if defined(CONFIG_SPL_BSS_MAX_SIZE) -ASSERT(__bss_end - __bss_start < (CONFIG_SPL_BSS_MAX_SIZE), \ +ASSERT(__bss_end - __bss_start <= (CONFIG_SPL_BSS_MAX_SIZE), \ "SPL image BSS too big"); #endif diff --git a/arch/microblaze/cpu/u-boot-spl.lds b/arch/microblaze/cpu/u-boot-spl.lds index 99c62b51a1..3387eb7189 100644 --- a/arch/microblaze/cpu/u-boot-spl.lds +++ b/arch/microblaze/cpu/u-boot-spl.lds @@ -57,6 +57,6 @@ SECTIONS } #if defined(CONFIG_SPL_MAX_FOOTPRINT) -ASSERT(__end - _start < (CONFIG_SPL_MAX_FOOTPRINT), \ +ASSERT(__end - _start <= (CONFIG_SPL_MAX_FOOTPRINT), \ "SPL image plus BSS too big"); #endif