random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 12:56:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch/h3-fit' into allwinner

Browse Source 
# Conflicts:
#	arch/arm/Kconfig
This commit is contained in:
Samuel Holland 2022-10-31 22:44:00 -05:00
commit dab20a30f5
5 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Kconfig
View File

@ -459,7 +459,7 @@ config BUILD_TARGET
default "u-boot-spl.kwb" if ARCH_MVEBU && SPL default "u-boot-spl.kwb" if ARCH_MVEBU && SPL
default "u-boot-elf.srec" if RCAR_GEN3 default "u-boot-elf.srec" if RCAR_GEN3
default "u-boot.itb" if !BINMAN && SPL_LOAD_FIT && (ARCH_ROCKCHIP || \ default "u-boot.itb" if !BINMAN && SPL_LOAD_FIT && (ARCH_ROCKCHIP || \
ARCH_SUNXI || RISCV || ARCH_ZYNQMP) RISCV || ARCH_ZYNQMP)
default "u-boot.kwb" if ARCH_KIRKWOOD default "u-boot.kwb" if ARCH_KIRKWOOD
default "u-boot-with-spl.bin" if ARCH_AT91 && SPL_NAND_SUPPORT default "u-boot-with-spl.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
default "u-boot-with-spl.imx" if ARCH_MX6 && SPL default "u-boot-with-spl.imx" if ARCH_MX6 && SPL

1
arch/arm/Kconfig
View File

@ -1143,6 +1143,7 @@ config ARCH_SUNXI
select SPL_SYS_THUMB_BUILD if !ARM64 select SPL_SYS_THUMB_BUILD if !ARM64
select SYS_THUMB_BUILD if !ARM64 select SYS_THUMB_BUILD if !ARM64
select SPL_USE_TINY_PRINTF select SPL_USE_TINY_PRINTF
imply SPL_LOAD_FIT
config ARCH_U8500 config ARCH_U8500
bool "ST-Ericsson U8500 Series" bool "ST-Ericsson U8500 Series"

44
arch/arm/dts/sunxi-u-boot.dtsi
View File

@ -1,13 +1,19 @@
#include <config.h> #include <config.h>
#ifdef CONFIG_MACH_SUN50I_H6 #ifdef CONFIG_ARM64
#define BL31_ADDR 0x104000 #define ARCH "arm64"
#define SCP_ADDR 0x114000 #else
#define ARCH "arm"
#endif
#if defined(CONFIG_MACH_SUN50I) || defined(CONFIG_MACH_SUN50I_H5)
#define BL31_ADDR 0x00044000
#define SCP_ADDR 0x00050000
#elif defined(CONFIG_MACH_SUN50I_H6)
#define BL31_ADDR 0x00104000
#define SCP_ADDR 0x00114000
#elif defined(CONFIG_MACH_SUN50I_H616) #elif defined(CONFIG_MACH_SUN50I_H616)
#define BL31_ADDR 0x40000000 #define BL31_ADDR 0x40000000
#else
#define BL31_ADDR 0x44000
#define SCP_ADDR 0x50000
#endif #endif
/ { / {
@ -34,30 +40,33 @@
filename = "spl/sunxi-spl.bin"; filename = "spl/sunxi-spl.bin";
}; };
#ifdef CONFIG_ARM64 #ifdef CONFIG_SPL_LOAD_FIT
fit { fit {
description = "Configuration to load ATF before U-Boot"; description = "Configuration to load U-Boot and firmware";
offset = <32768>;
#address-cells = <1>; #address-cells = <1>;
fit,fdt-list = "of-list"; fit,fdt-list = "of-list";
images { images {
uboot { uboot {
description = "U-Boot (64-bit)"; description = "U-Boot";
type = "standalone"; type = "standalone";
os = "u-boot"; os = "u-boot";
arch = "arm64"; arch = ARCH;
compression = "none"; compression = "none";
load = <CONFIG_TEXT_BASE>; load = <CONFIG_TEXT_BASE>;
entry = <CONFIG_TEXT_BASE>;
u-boot-nodtb { u-boot-nodtb {
}; };
}; };
#ifdef BL31_ADDR
atf { atf {
description = "ARM Trusted Firmware"; description = "ARM Trusted Firmware";
type = "firmware"; type = "firmware";
os = "arm-trusted-firmware"; os = "arm-trusted-firmware";
arch = "arm64"; arch = ARCH;
compression = "none"; compression = "none";
load = <BL31_ADDR>; load = <BL31_ADDR>;
entry = <BL31_ADDR>; entry = <BL31_ADDR>;
@ -67,6 +76,7 @@
missing-msg = "atf-bl31-sunxi"; missing-msg = "atf-bl31-sunxi";
}; };
}; };
#endif
#ifdef SCP_ADDR #ifdef SCP_ADDR
scp { scp {
@ -95,19 +105,23 @@
@config-SEQ { @config-SEQ {
description = "NAME"; description = "NAME";
#ifdef BL31_ADDR
firmware = "atf"; firmware = "atf";
#ifndef SCP_ADDR
loadables = "uboot";
#else #else
loadables = "scp", "uboot"; firmware = "uboot";
#endif #endif
loadables =
#ifdef SCP_ADDR
"scp",
#endif
"uboot";
fdt = "fdt-SEQ"; fdt = "fdt-SEQ";
}; };
}; };
}; };
#else #else
u-boot-img { u-boot-img {
offset = <CONFIG_SPL_PAD_TO>; offset = <32768>;
}; };
#endif #endif
}; };

9
common/spl/Kconfig
View File

@ -76,12 +76,12 @@ config SPL_SIZE_LIMIT_PROVIDE_STACK
config SPL_MAX_SIZE config SPL_MAX_SIZE
hex "Maximum size of the SPL image, excluding BSS" hex "Maximum size of the SPL image, excluding BSS"
default 0x37fa0 if MACH_SUN50I_H616
default 0x30000 if ARCH_MX6 && MX6_OCRAM_256KB default 0x30000 if ARCH_MX6 && MX6_OCRAM_256KB
default 0x25fa0 if MACH_SUN50I_H6
default 0x1b000 if AM33XX && !TI_SECURE_DEVICE default 0x1b000 if AM33XX && !TI_SECURE_DEVICE
default 0x10000 if ARCH_MX6 && !MX6_OCRAM_256KB default 0x10000 if ARCH_MX6 && !MX6_OCRAM_256KB
default 0x7fa0 if SUNXI_SRAM_ADDRESS = 0x10000 default 0x7fa0 if SUNXI_SRAM_ADDRESS = 0x10000
default 0x7fa0 if SUNXI_SRAM_ADDRESS = 0x20000 && !MACH_SUN50I_H616
default 0xbfa0 if MACH_SUN50I_H616
default 0x7000 if RCAR_GEN3 default 0x7000 if RCAR_GEN3
default 0x5fa0 if SUNXI_SRAM_ADDRESS = 0x0 default 0x5fa0 if SUNXI_SRAM_ADDRESS = 0x0
default 0x10000 if ASPEED_AST2600 default 0x10000 if ASPEED_AST2600
@ -97,7 +97,7 @@ config SPL_PAD_TO
default 0x31000 if ARCH_MX6 && MX6_OCRAM_256KB default 0x31000 if ARCH_MX6 && MX6_OCRAM_256KB
default 0x11000 if ARCH_MX7 || (ARCH_MX6 && !MX6_OCRAM_256KB) default 0x11000 if ARCH_MX7 || (ARCH_MX6 && !MX6_OCRAM_256KB)
default 0x10000 if ARCH_KEYSTONE default 0x10000 if ARCH_KEYSTONE
default 0x8000 if ARCH_SUNXI && !MACH_SUN50I_H616 default 0x0 if ARCH_SUNXI
default TPL_MAX_SIZE if TPL_MAX_SIZE > SPL_MAX_SIZE default TPL_MAX_SIZE if TPL_MAX_SIZE > SPL_MAX_SIZE
default SPL_MAX_SIZE default SPL_MAX_SIZE
help help
@ -568,8 +568,7 @@ config SPL_MD5
config SPL_FIT_IMAGE_TINY config SPL_FIT_IMAGE_TINY
bool "Remove functionality from SPL FIT loading to reduce size" bool "Remove functionality from SPL FIT loading to reduce size"
depends on SPL_FIT depends on SPL_FIT
default y if MACH_SUN50I || MACH_SUN50I_H5 || SUN50I_GEN_H6 default y if ARCH_IMX8M || ARCH_IMX9 || ARCH_SUNXI
default y if ARCH_IMX8M || ARCH_IMX9
help help
Enable this to reduce the size of the FIT image loading code Enable this to reduce the size of the FIT image loading code
in SPL, if space for the SPL binary is very tight. in SPL, if space for the SPL binary is very tight.

2
tools/binman/entry.py
View File

@ -483,6 +483,8 @@ class Entry(object):
if self.offset_unset: if self.offset_unset:
self.Raise('No offset set with offset-unset: should another ' self.Raise('No offset set with offset-unset: should another '
'entry provide this correct offset?') 'entry provide this correct offset?')
elif self.offset > offset:
offset = self.offset
self.offset = tools.align(offset, self.align) self.offset = tools.align(offset, self.align)
needed = self.pad_before + self.contents_size + self.pad_after needed = self.pad_before + self.contents_size + self.pad_after
needed = tools.align(needed, self.align_size) needed = tools.align(needed, self.align_size)