GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-04-08 07:21:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Kconfig: Migrate CONFIG_CSF_SIZE to Kconfig

Browse source 
Move CONFIG_CSF_SIZE to Kconfig and define default value as 0x4000.

mx8mqevk requires 0x2000 add this configuration in imx8mq_evk_defconfig
file.

Signed-off-by: Breno Lima <breno.lima@nxp.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
This commit is contained in:
Breno Matheus Lima 2019-07-18 12:34:08 +00:00 • committed by Stefano Babic
parent 91457597e3
commit 5f2fe3b93a
10 changed files with 8 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/arm/mach-imx/Kconfig
View file

@ -43,6 +43,13 @@ config SECURE_BOOT
This option enables the support for secure boot (HAB). This option enables the support for secure boot (HAB).
See doc/README.mxc_hab for more details. See doc/README.mxc_hab for more details.
config CSF_SIZE
hex "Maximum size for Command Sequence File (CSF) binary"
default 0x4000
help
Define the maximum size for Command Sequence File (CSF) binary
this information is used to define the image boot data.
config CMD_BMODE config CMD_BMODE
bool "Support the 'bmode' command" bool "Support the 'bmode' command"
default y default y

1
configs/imx8mq_evk_defconfig
View file

@ -7,6 +7,7 @@ CONFIG_TARGET_IMX8MQ_EVK=y
CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_TEXT_BASE=0x7E1000 CONFIG_SPL_TEXT_BASE=0x7E1000
CONFIG_CSF_SIZE=0x2000
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_FIT_EXTERNAL_OFFSET=0x3000
CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_LOAD_FIT=y

1
include/configs/cl-som-imx7.h
View file

@ -19,7 +19,6 @@
/* Uncomment to enable secure boot support */ /* Uncomment to enable secure boot support */
/* #define CONFIG_SECURE_BOOT */ /* #define CONFIG_SECURE_BOOT */
#define CONFIG_CSF_SIZE 0x4000
/* Network */ /* Network */
#define CONFIG_FEC_MXC #define CONFIG_FEC_MXC

4
include/configs/imx8mq_evk.h
View file

@ -9,10 +9,6 @@
#include <linux/sizes.h> #include <linux/sizes.h>
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#ifdef CONFIG_SECURE_BOOT
#define CONFIG_CSF_SIZE 0x2000 /* 8K region */
#endif
#define CONFIG_SPL_MAX_SIZE (124 * 1024) #define CONFIG_SPL_MAX_SIZE (124 * 1024)
#define CONFIG_SYS_MONITOR_LEN (512 * 1024) #define CONFIG_SYS_MONITOR_LEN (512 * 1024)
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR

4
include/configs/mx6_common.h
View file

@ -56,12 +56,8 @@
/* MMC */ /* MMC */
/* Secure boot (HAB) support */
#ifdef CONFIG_SECURE_BOOT
#define CONFIG_CSF_SIZE 0x4000
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
#define CONFIG_SPL_DRIVERS_MISC_SUPPORT #define CONFIG_SPL_DRIVERS_MISC_SUPPORT
#endif #endif
#endif
#endif #endif

6
include/configs/mx6sllevk.h
View file

@ -10,12 +10,6 @@
#include "mx6_common.h" #include "mx6_common.h"
#ifdef CONFIG_SECURE_BOOT
#ifndef CONFIG_CSF_SIZE
#define CONFIG_CSF_SIZE 0x4000
#endif
#endif
/* Size of malloc() pool */ /* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M) #define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M)

6
include/configs/mx6ullevk.h
View file

@ -13,12 +13,6 @@
#include "mx6_common.h" #include "mx6_common.h"
#include <asm/mach-imx/gpio.h> #include <asm/mach-imx/gpio.h>
#ifdef CONFIG_SECURE_BOOT
#ifndef CONFIG_CSF_SIZE
#define CONFIG_CSF_SIZE 0x4000
#endif
#endif
#define PHYS_SDRAM_SIZE SZ_512M #define PHYS_SDRAM_SIZE SZ_512M
/* Size of malloc() pool */ /* Size of malloc() pool */

4
include/configs/mx7_common.h
View file

@ -45,13 +45,9 @@
#define CONFIG_ARMV7_PSCI_1_0 #define CONFIG_ARMV7_PSCI_1_0
/* Secure boot (HAB) support */
#ifdef CONFIG_SECURE_BOOT
#define CONFIG_CSF_SIZE 0x4000
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
#define CONFIG_SPL_DRIVERS_MISC_SUPPORT #define CONFIG_SPL_DRIVERS_MISC_SUPPORT
#endif #endif
#endif
/* /*
* If we have defined the OPTEE ram size and not OPTEE it means that we were * If we have defined the OPTEE ram size and not OPTEE it means that we were

6
include/configs/mx7ulp_evk.h
View file

@ -14,12 +14,6 @@
/*Uncomment it to use secure boot*/ /*Uncomment it to use secure boot*/
/*#define CONFIG_SECURE_BOOT*/ /*#define CONFIG_SECURE_BOOT*/
#ifdef CONFIG_SECURE_BOOT
#ifndef CONFIG_CSF_SIZE
#define CONFIG_CSF_SIZE 0x4000
#endif
#endif
#define CONFIG_BOARD_POSTCLK_INIT #define CONFIG_BOARD_POSTCLK_INIT
#define CONFIG_SYS_BOOTM_LEN 0x1000000 #define CONFIG_SYS_BOOTM_LEN 0x1000000

1
scripts/config_whitelist.txt
View file

@ -266,7 +266,6 @@ CONFIG_CPU_VR41XX
CONFIG_CQSPI_REF_CLK CONFIG_CQSPI_REF_CLK
CONFIG_CS8900_BUS16 CONFIG_CS8900_BUS16
CONFIG_CS8900_BUS32 CONFIG_CS8900_BUS32
CONFIG_CSF_SIZE
CONFIG_CTL_JTAG CONFIG_CTL_JTAG
CONFIG_CTL_TBE CONFIG_CTL_TBE
CONFIG_CUSTOMER_BOARD_SUPPORT CONFIG_CUSTOMER_BOARD_SUPPORT