Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 5f2fe3b93a2583c266c67ea10ce454fc02bbd94e

Authored by Breno Matheus Lima
Committed by Stefano Babic
1 parent 91457597e3
Exists in smarc_8mq_lf_v2020.04 and in 9 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

Kconfig: Migrate CONFIG_CSF_SIZE to Kconfig 

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>

Showing 10 changed files with 8 additions and 32 deletions Side-by-side Diff

arch/arm/mach-imx/Kconfig
Diff comments   View file @ 5f2fe3b
... ... @@ -43,6 +43,13 @@
43 43 This option enables the support for secure boot (HAB).
44 44 See doc/README.mxc_hab for more details.
45 45  
  46 +config CSF_SIZE
  47 + hex "Maximum size for Command Sequence File (CSF) binary"
  48 + default 0x4000
  49 + help
  50 + Define the maximum size for Command Sequence File (CSF) binary
  51 + this information is used to define the image boot data.
  52 +
46 53 config CMD_BMODE
47 54 bool "Support the 'bmode' command"
48 55 default y
configs/imx8mq_evk_defconfig
Diff comments   View file @ 5f2fe3b
... ... @@ -7,6 +7,7 @@
7 7 CONFIG_SPL_SERIAL_SUPPORT=y
8 8 CONFIG_SPL=y
9 9 CONFIG_SPL_TEXT_BASE=0x7E1000
  10 +CONFIG_CSF_SIZE=0x2000
10 11 CONFIG_FIT=y
11 12 CONFIG_FIT_EXTERNAL_OFFSET=0x3000
12 13 CONFIG_SPL_LOAD_FIT=y
include/configs/cl-som-imx7.h
Diff comments   View file @ 5f2fe3b
... ... @@ -19,7 +19,6 @@
19 19  
20 20 /* Uncomment to enable secure boot support */
21 21 /* #define CONFIG_SECURE_BOOT */
22   -#define CONFIG_CSF_SIZE 0x4000
23 22  
24 23 /* Network */
25 24 #define CONFIG_FEC_MXC
include/configs/imx8mq_evk.h
Diff comments   View file @ 5f2fe3b
... ... @@ -9,10 +9,6 @@
9 9 #include <linux/sizes.h>
10 10 #include <asm/arch/imx-regs.h>
11 11  
12   -#ifdef CONFIG_SECURE_BOOT
13   -#define CONFIG_CSF_SIZE 0x2000 /* 8K region */
14   -#endif
15   -
16 12 #define CONFIG_SPL_MAX_SIZE (124 * 1024)
17 13 #define CONFIG_SYS_MONITOR_LEN (512 * 1024)
18 14 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
include/configs/mx6_common.h
Diff comments   View file @ 5f2fe3b
... ... @@ -56,12 +56,8 @@
56 56  
57 57 /* MMC */
58 58  
59   -/* Secure boot (HAB) support */
60   -#ifdef CONFIG_SECURE_BOOT
61   -#define CONFIG_CSF_SIZE 0x4000
62 59 #ifdef CONFIG_SPL_BUILD
63 60 #define CONFIG_SPL_DRIVERS_MISC_SUPPORT
64   -#endif
65 61 #endif
66 62  
67 63 #endif
include/configs/mx6sllevk.h
Diff comments   View file @ 5f2fe3b
... ... @@ -10,12 +10,6 @@
10 10  
11 11 #include "mx6_common.h"
12 12  
13   -#ifdef CONFIG_SECURE_BOOT
14   -#ifndef CONFIG_CSF_SIZE
15   -#define CONFIG_CSF_SIZE 0x4000
16   -#endif
17   -#endif
18   -
19 13 /* Size of malloc() pool */
20 14 #define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M)
21 15  
include/configs/mx6ullevk.h
Diff comments   View file @ 5f2fe3b
... ... @@ -13,12 +13,6 @@
13 13 #include "mx6_common.h"
14 14 #include <asm/mach-imx/gpio.h>
15 15  
16   -#ifdef CONFIG_SECURE_BOOT
17   -#ifndef CONFIG_CSF_SIZE
18   -#define CONFIG_CSF_SIZE 0x4000
19   -#endif
20   -#endif
21   -
22 16 #define PHYS_SDRAM_SIZE SZ_512M
23 17  
24 18 /* Size of malloc() pool */
include/configs/mx7_common.h
Diff comments   View file @ 5f2fe3b
... ... @@ -45,12 +45,8 @@
45 45  
46 46 #define CONFIG_ARMV7_PSCI_1_0
47 47  
48   -/* Secure boot (HAB) support */
49   -#ifdef CONFIG_SECURE_BOOT
50   -#define CONFIG_CSF_SIZE 0x4000
51 48 #ifdef CONFIG_SPL_BUILD
52 49 #define CONFIG_SPL_DRIVERS_MISC_SUPPORT
53   -#endif
54 50 #endif
55 51  
56 52 /*
include/configs/mx7ulp_evk.h
Diff comments   View file @ 5f2fe3b
... ... @@ -14,12 +14,6 @@
14 14 /*Uncomment it to use secure boot*/
15 15 /*#define CONFIG_SECURE_BOOT*/
16 16  
17   -#ifdef CONFIG_SECURE_BOOT
18   -#ifndef CONFIG_CSF_SIZE
19   -#define CONFIG_CSF_SIZE 0x4000
20   -#endif
21   -#endif
22   -
23 17 #define CONFIG_BOARD_POSTCLK_INIT
24 18 #define CONFIG_SYS_BOOTM_LEN 0x1000000
25 19  
scripts/config_whitelist.txt
Diff comments   View file @ 5f2fe3b
... ... @@ -266,7 +266,6 @@
266 266 CONFIG_CQSPI_REF_CLK
267 267 CONFIG_CS8900_BUS16
268 268 CONFIG_CS8900_BUS32
269   -CONFIG_CSF_SIZE
270 269 CONFIG_CTL_JTAG
271 270 CONFIG_CTL_TBE
272 271 CONFIG_CUSTOMER_BOARD_SUPPORT