Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 855F2C87FCA for ; Thu, 7 Aug 2025 10:25:20 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DC691844C7; Thu, 7 Aug 2025 12:25:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1754562318; bh=0Mo1bWy5rccDbXuDT4BOq5WjggaFed9rzCVWMaZ+Axo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=cvXpfgFCcoB8oIX3X29krl+H0tuhFNAclpiwaGK+dO75Bv5oR+sNqcowMgSDUpvnQ x5FV/YqLl79xJC4Ac6b2rcO12uMl9ZTLaoLiq/UUYaLtCLD2lHQvQKQ7aKl2c901GH 8ShOeIpHEmzluWBYzQUC/QSubMsRRYagjsT/VEje/O0B5EjqH1pjCNT6l2AsxheOKB DCsltBGsX9mG3J+wb2X/6O36pXIXKhbyTWf7z4B/jQ1u7KhMaNGlu+3c0oE01vQ2wj Uo6dslEowUcW9cFox0vZwa0J/b/a27wXCT0O8tdHJte12SkWWetPSW3f/5zxikQyv9 szZRMsv7DtPpw== Received: by phobos.denx.de (Postfix, from userid 109) id 1CC38843E2; Thu, 7 Aug 2025 12:25:17 +0200 (CEST) Received: from mx.denx.de (mx.denx.de [89.58.32.78]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9E1FE83C61 for ; Thu, 7 Aug 2025 12:25:12 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pro@denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.b="L/0/QQe0"; dkim-atps=neutral Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 497871038C12C; Thu, 7 Aug 2025 12:25:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=mx-20241105; t=1754562311; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=0Mo1bWy5rccDbXuDT4BOq5WjggaFed9rzCVWMaZ+Axo=; b=L/0/QQe0oTyI2KU/M7oZjssxdhxK1Pk8fZ69YwEVEn0jYO/PrnPnvxu7NCFNv+1/RR9fJD s0VzmXIRE9osKxREu4fgziLBEtWI3GQBydLxSYskU1eI85lQGiunAa0G4tQT/hTr6qeReB 7VTRHmbMV+oRlsj6NPgCRMfF0Uz3F7JAXQo7QnQH+BbPOGbeA+pM6ZuBar33IZqa36sRJy 6VdA6Cqllk2NmUQCoGUczw1O2K17ZEfUFx+Eks4Rm3l2uUADCAhCVmeWzq1IyEwGkscsiC CGIpOiLcY5R9m9pRqGNORWxd9pBrMKf+zL2TIngxWegstomhYXAq6lFCM4yKSg== From: Philip Oberfichtner To: u-boot@lists.denx.de Cc: Philip Oberfichtner , Andre Przywara , Anshul Dalal , Dario Binacchi , Gary Bisson , Greg Malysa , Heinrich Schuchardt , Ilias Apalodimas , Jerome Forissier , Marek Vasut , Nathan Barrett-Morrison , Oliver Gaskell , Paul Barker , Paul Kocialkowski , Peng Fan , Quentin Schulz , Simon Glass , Tom Rini , Trevor Woerner , Ye Li Subject: [PATCH v2 2/3] Image size checks: Move all configs in one place Date: Thu, 7 Aug 2025 12:24:35 +0200 Message-Id: <20250807102436.452691-3-pro@denx.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250807102436.452691-1-pro@denx.de> References: <20250807102436.452691-1-pro@denx.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Last-TLS-Session-Version: TLSv1.3 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean How image size limiting works in U-Boot should be easier to grasp if we have all related options in one place. Signed-off-by: Philip Oberfichtner --- Notes: Changes in v2: - Rebase on current master - Rebase on my pending mips patch series: https://patchwork.ozlabs.org/project/uboot/list/?series=468232 Kconfig | 66 ++++++++++++++++++++++++++++++++++++++++++ common/spl/Kconfig | 45 ---------------------------- common/spl/Kconfig.tpl | 7 ----- common/spl/Kconfig.vpl | 7 ----- 4 files changed, 66 insertions(+), 59 deletions(-) diff --git a/Kconfig b/Kconfig index 99f7bb563df..ec20603883b 100644 --- a/Kconfig +++ b/Kconfig @@ -535,6 +535,8 @@ config BUILD_TARGET special image will be automatically built upon calling make / buildman. +menu "Image size limits" + config BOARD_SIZE_LIMIT int "Maximum size of the U-Boot image in bytes" default 524288 if RCAR_32 @@ -546,6 +548,70 @@ config BOARD_SIZE_LIMIT include SPL nor TPL, on platforms that use that functionality, they have separate options to restrict size. +config UBOOT_WITH_SPL_SIZE_LIMIT + hex "Maximum size of u-boot-with-spl.bin" + default 0x0 + help + Specifies the maximum length of the u-boot-with-spl.bin image. + If this value is zero, it is ignored. + +config SPL_SIZE_LIMIT + depends on SPL + hex "Maximum size of SPL image" + default 0x11000 if ARCH_MX6 && !MX6_OCRAM_256KB + default 0x31000 if ARCH_MX6 && MX6_OCRAM_256KB + default 0x30000 if ARCH_MVEBU && ARMADA_32BIT + default 0x0 + help + Specifies the maximum length of the U-Boot SPL image. + If this value is zero, it is ignored. + +config SPL_SIZE_LIMIT_SUBTRACT_GD + bool "SPL image size check: provide space for global data" + depends on SPL_SIZE_LIMIT > 0 + help + If enabled, aligned size of global data is reserved in + SPL_SIZE_LIMIT check to ensure such an image does not overflow SRAM + if SPL_SIZE_LIMIT describes the size of SRAM available for SPL when + pre-reloc global data is put into this SRAM, too. + +config SPL_SIZE_LIMIT_SUBTRACT_MALLOC + bool "SPL image size check: provide space for malloc() pool before relocation" + depends on SPL_SIZE_LIMIT > 0 + help + If enabled, SPL_SYS_MALLOC_F_LEN is reserved in SPL_SIZE_LIMIT check + to ensure such an image does not overflow SRAM if SPL_SIZE_LIMIT + describes the size of SRAM available for SPL when pre-reloc malloc + pool is put into this SRAM, too. + +config SPL_SIZE_LIMIT_PROVIDE_STACK + hex "SPL image size check: provide stack space before relocation" + depends on SPL_SIZE_LIMIT > 0 + default 0x0 + help + If set, this size is reserved in SPL_SIZE_LIMIT check to ensure such + an image does not overflow SRAM if SPL_SIZE_LIMIT describes the size + of SRAM available for SPL when the stack required before reolcation + uses this SRAM, too. + +config TPL_SIZE_LIMIT + depends on TPL + hex "Maximum size of TPL image" + default 0x0 + help + Specifies the maximum length of the U-Boot TPL image. + If this value is zero, it is ignored. + +config VPL_SIZE_LIMIT + depends on VPL + hex "Maximum size of VPL image" + default 0x0 + help + Specifies the maximum length of the U-Boot VPL image. + If this value is zero, it is ignored. + +endmenu + config SYS_CUSTOM_LDSCRIPT bool "Use a custom location for the U-Boot linker script" depends on !COMPILE_TEST diff --git a/common/spl/Kconfig b/common/spl/Kconfig index b5c0c60ff6b..87a56bd8f8a 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -36,51 +36,6 @@ config SPL_FRAMEWORK_BOARD_INIT_F - initialize the serial (preloader_console_init) Unless you want to provide your own board_init_f, you should say Y. -config UBOOT_WITH_SPL_SIZE_LIMIT - hex "Maximum size of u-boot-with-spl.bin" - default 0x0 - help - Specifies the maximum length of the u-boot-with-spl.bin image. - If this value is zero, it is ignored. - -config SPL_SIZE_LIMIT - hex "Maximum size of SPL image" - default 0x11000 if ARCH_MX6 && !MX6_OCRAM_256KB - default 0x31000 if ARCH_MX6 && MX6_OCRAM_256KB - default 0x30000 if ARCH_MVEBU && ARMADA_32BIT - default 0x0 - help - Specifies the maximum length of the U-Boot SPL image. - If this value is zero, it is ignored. - -config SPL_SIZE_LIMIT_SUBTRACT_GD - bool "SPL image size check: provide space for global data" - depends on SPL_SIZE_LIMIT > 0 - help - If enabled, aligned size of global data is reserved in - SPL_SIZE_LIMIT check to ensure such an image does not overflow SRAM - if SPL_SIZE_LIMIT describes the size of SRAM available for SPL when - pre-reloc global data is put into this SRAM, too. - -config SPL_SIZE_LIMIT_SUBTRACT_MALLOC - bool "SPL image size check: provide space for malloc() pool before relocation" - depends on SPL_SIZE_LIMIT > 0 - help - If enabled, SPL_SYS_MALLOC_F_LEN is reserved in SPL_SIZE_LIMIT check - to ensure such an image does not overflow SRAM if SPL_SIZE_LIMIT - describes the size of SRAM available for SPL when pre-reloc malloc - pool is put into this SRAM, too. - -config SPL_SIZE_LIMIT_PROVIDE_STACK - hex "SPL image size check: provide stack space before relocation" - depends on SPL_SIZE_LIMIT > 0 - default 0x0 - help - If set, this size is reserved in SPL_SIZE_LIMIT check to ensure such - an image does not overflow SRAM if SPL_SIZE_LIMIT describes the size - of SRAM available for SPL when the stack required before reolcation - uses this SRAM, too. - config SPL_MAX_SIZE hex "Maximum size of the SPL image, excluding BSS" default 0x30000 if ARCH_MX6 && MX6_OCRAM_256KB diff --git a/common/spl/Kconfig.tpl b/common/spl/Kconfig.tpl index a535b61ecd3..515bbeec685 100644 --- a/common/spl/Kconfig.tpl +++ b/common/spl/Kconfig.tpl @@ -1,13 +1,6 @@ menu "TPL configuration options" depends on TPL -config TPL_SIZE_LIMIT - hex "Maximum size of TPL image" - default 0x0 - help - Specifies the maximum length of the U-Boot TPL image. - If this value is zero, it is ignored. - config TPL_BINMAN_SYMBOLS bool "Support binman symbols in TPL" depends on TPL_FRAMEWORK && BINMAN diff --git a/common/spl/Kconfig.vpl b/common/spl/Kconfig.vpl index 434562443ac..739f2805315 100644 --- a/common/spl/Kconfig.vpl +++ b/common/spl/Kconfig.vpl @@ -220,13 +220,6 @@ config VPL_SERIAL Enable support for serial in VPL. See SPL_SERIAL for details. -config VPL_SIZE_LIMIT - hex "Maximum size of VPL image" - default 0x0 - help - Specifies the maximum length of the U-Boot VPL image. - If this value is zero, it is ignored. - config VPL_SPI bool "Support SPI drivers" help -- 2.39.5