diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/am64x_evm.h | 2 | ||||
-rw-r--r-- | include/spl.h | 15 | ||||
-rw-r--r-- | include/u-boot/rsa.h | 1 |
3 files changed, 16 insertions, 2 deletions
diff --git a/include/configs/am64x_evm.h b/include/configs/am64x_evm.h index 99624081c3e..135cb3c2ee2 100644 --- a/include/configs/am64x_evm.h +++ b/include/configs/am64x_evm.h @@ -33,7 +33,7 @@ * our memory footprint. The less we use for BSS the more we have available * for everything else. */ -#define CONFIG_SPL_BSS_MAX_SIZE 0x1000 +#define CONFIG_SPL_BSS_MAX_SIZE 0x4000 /* * Link BSS to be within SPL in a dedicated region located near the top of * the MCU SRAM, this way making it available also before relocation. Note diff --git a/include/spl.h b/include/spl.h index 8748497bc1f..bb92bc6ec6c 100644 --- a/include/spl.h +++ b/include/spl.h @@ -463,6 +463,17 @@ int spl_board_ubi_load_image(u32 boot_device); int spl_board_boot_device(u32 boot_device); /** + * spl_board_loader_name() - Return a name for the loader + * + * This is a weak function which might be overridden by the board code. With + * that a board specific value for the device where the U-Boot will be loaded + * from can be set. By default it returns NULL. + * + * @boot_device: ID of the device which SPL wants to load U-Boot from. + */ +const char *spl_board_loader_name(u32 boot_device); + +/** * jump_to_image_linux() - Jump to a Linux kernel from SPL * * This jumps into a Linux kernel using the information in @spl_image. @@ -544,7 +555,9 @@ struct spl_image_loader { static inline const char *spl_loader_name(const struct spl_image_loader *loader) { #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT - return loader->name; + const char *name; + name = spl_board_loader_name(loader->boot_device); + return name ?: loader->name; #else return NULL; #endif diff --git a/include/u-boot/rsa.h b/include/u-boot/rsa.h index 01b480d0f3e..b9634e38d9a 100644 --- a/include/u-boot/rsa.h +++ b/include/u-boot/rsa.h @@ -111,6 +111,7 @@ int padding_pss_verify(struct image_sign_info *info, #define RSA_DEFAULT_PADDING_NAME "pkcs-1.5" #define RSA2048_BYTES (2048 / 8) +#define RSA3072_BYTES (3072 / 8) #define RSA4096_BYTES (4096 / 8) /* This is the minimum/maximum key size we support, in bits */ |