diff mbox series

[v3,1/4] sunxi: spl: Disable padding from SPL_PAD_TO

Message ID 20231031051805.62430-2-samuel@sholland.org
State Accepted
Commit d72494a06443061f150742910e9441fe9c9e14f3
Delegated to: Andre Przywara
Headers show
Series sunxi: SPL FIT support for 32-bit sunxi SoCs | expand

Commit Message

Samuel Holland Oct. 31, 2023, 5:17 a.m. UTC
Starting with H6, Allwinner removed the artificial 32 KiB SPL size limit
from the boot ROM. Now SPL size is only limited by the available SRAM.
This limit ranges from 152 KiB on H6 to a whopping 2052 KiB on R329. To
take advantage of this additional space, we must increase SPL_MAX_SIZE.
Since we do not want to unnecessarily pad SPL out to these giant sizes,
we must set SPL_PAD_TO to zero. This causes no problems because binman
already takes care of appending the SPL payload at the right offset.

Signed-off-by: Samuel Holland <samuel@sholland.org>
---

(no changes since v2)

Changes in v2:
 - New patch for v2

 common/spl/Kconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Andre Przywara Dec. 8, 2023, 12:25 a.m. UTC | #1
On Tue, 31 Oct 2023 00:17:38 -0500
Samuel Holland <samuel@sholland.org> wrote:

Hi Samuel,

> Starting with H6, Allwinner removed the artificial 32 KiB SPL size limit
> from the boot ROM. Now SPL size is only limited by the available SRAM.
> This limit ranges from 152 KiB on H6 to a whopping 2052 KiB on R329. To
> take advantage of this additional space, we must increase SPL_MAX_SIZE.
> Since we do not want to unnecessarily pad SPL out to these giant sizes,
> we must set SPL_PAD_TO to zero. This causes no problems because binman
> already takes care of appending the SPL payload at the right offset.

That looks alright now, back in v2023.04 (at time of v2) this still
broke compilation, but this was fixed with your patch 9a4aa31ad514. I
actually cannot see any effect on sunxi builds anymore, apart from the
check in config_fallbacks.h, which is appeased with the value being set
to 0 here. So:

> Signed-off-by: Samuel Holland <samuel@sholland.org>

Reviewed-by: Andre Przywara <andre.przywara@arm.com>

Cheers,
Andre

> ---
> 
> (no changes since v2)
> 
> Changes in v2:
>  - New patch for v2
> 
>  common/spl/Kconfig | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/common/spl/Kconfig b/common/spl/Kconfig
> index 25cd18afda7..a0968ff1065 100644
> --- a/common/spl/Kconfig
> +++ b/common/spl/Kconfig
> @@ -97,8 +97,7 @@ config SPL_PAD_TO
>  	default 0x31000 if ARCH_MX6 && MX6_OCRAM_256KB
>  	default 0x11000 if ARCH_MX7 || (ARCH_MX6 && !MX6_OCRAM_256KB)
>  	default 0x10000 if ARCH_KEYSTONE
> -	default 0x8000 if ARCH_SUNXI && !MACH_SUN50I_H616
> -	default 0x0 if ARCH_MTMIPS
> +	default 0x0 if ARCH_MTMIPS || ARCH_SUNXI
>  	default TPL_MAX_SIZE if TPL_MAX_SIZE > SPL_MAX_SIZE
>  	default SPL_MAX_SIZE
>  	help
diff mbox series

Patch

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 25cd18afda7..a0968ff1065 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -97,8 +97,7 @@  config SPL_PAD_TO
 	default 0x31000 if ARCH_MX6 && MX6_OCRAM_256KB
 	default 0x11000 if ARCH_MX7 || (ARCH_MX6 && !MX6_OCRAM_256KB)
 	default 0x10000 if ARCH_KEYSTONE
-	default 0x8000 if ARCH_SUNXI && !MACH_SUN50I_H616
-	default 0x0 if ARCH_MTMIPS
+	default 0x0 if ARCH_MTMIPS || ARCH_SUNXI
 	default TPL_MAX_SIZE if TPL_MAX_SIZE > SPL_MAX_SIZE
 	default SPL_MAX_SIZE
 	help