Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 11a9662ba9ed40829fd10acb3a0c75d148159921

Authored by Ruchika Gupta
Committed by Simon Glass
1 parent 31d2b4fd90
Exists in v2017.01-smarct4x and in 37 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, 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-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.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, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

configs: Move CONFIG_FIT_SIGNATURE to defconfig 

For the platforms which use,CONFIG_FIT_SIGNATURE, the required configs are
moved to the platform's defconfig file. Selecting CONFIG_FIT_SIGNATURE using
defconfig automatically resolves the dependencies for signature verification.
The RSA library gets automatically selected and user does not have to define
CONFIG_RSA manually.

Signed-off-by: Ruchika Gupta <ruchika.gupta@freescale.com>
CC: Simon Glass <sjg@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>

Showing 13 changed files with 28 additions and 14 deletions Side-by-side Diff

configs/ids8313_defconfig
Diff comments   View file @ 11a9662
1 1 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFFF00000"
2 2 CONFIG_PPC=y
3 3 CONFIG_MPC83xx=y
  4 +CONFIG_FIT=y
  5 +CONFIG_FIT_SIGNATURE=y
4 6 CONFIG_TARGET_IDS8313=y
configs/sandbox_defconfig
Diff comments   View file @ 11a9662
1 1 CONFIG_OF_CONTROL=y
2 2 CONFIG_OF_HOSTFILE=y
  3 +CONFIG_FIT=y
  4 +CONFIG_FIT_VERBOSE=y
  5 +CONFIG_FIT_SIGNATURE=y
3 6 CONFIG_DEFAULT_DEVICE_TREE="sandbox"
configs/zynq_microzed_defconfig
Diff comments   View file @ 11a9662
... ... @@ -3,5 +3,8 @@
3 3 +S:CONFIG_ZYNQ=y
4 4 +S:CONFIG_TARGET_ZYNQ_MICROZED=y
5 5 CONFIG_OF_CONTROL=y
  6 +CONFIG_FIT=y
  7 +CONFIG_FIT_VERBOSE=y
  8 +CONFIG_FIT_SIGNATURE=y
6 9 CONFIG_DEFAULT_DEVICE_TREE="zynq-microzed"
configs/zynq_zc70x_defconfig
Diff comments   View file @ 11a9662
... ... @@ -4,4 +4,7 @@
4 4 +S:CONFIG_TARGET_ZYNQ_ZC70X=y
5 5 CONFIG_OF_CONTROL=y
6 6 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702"
  7 +CONFIG_FIT=y
  8 +CONFIG_FIT_VERBOSE=y
  9 +CONFIG_FIT_SIGNATURE=y
configs/zynq_zc770_xm010_defconfig
Diff comments   View file @ 11a9662
... ... @@ -5,4 +5,7 @@
5 5 +S:CONFIG_TARGET_ZYNQ_ZC770=y
6 6 CONFIG_OF_CONTROL=y
7 7 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm010"
  8 +CONFIG_FIT=y
  9 +CONFIG_FIT_VERBOSE=y
  10 +CONFIG_FIT_SIGNATURE=y
configs/zynq_zc770_xm012_defconfig
Diff comments   View file @ 11a9662
... ... @@ -5,4 +5,7 @@
5 5 +S:CONFIG_TARGET_ZYNQ_ZC770=y
6 6 CONFIG_OF_CONTROL=y
7 7 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012"
  8 +CONFIG_FIT=y
  9 +CONFIG_FIT_VERBOSE=y
  10 +CONFIG_FIT_SIGNATURE=y
configs/zynq_zc770_xm013_defconfig
Diff comments   View file @ 11a9662
... ... @@ -5,4 +5,7 @@
5 5 +S:CONFIG_TARGET_ZYNQ_ZC770=y
6 6 CONFIG_OF_CONTROL=y
7 7 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013"
  8 +CONFIG_FIT=y
  9 +CONFIG_FIT_VERBOSE=y
  10 +CONFIG_FIT_SIGNATURE=y
configs/zynq_zed_defconfig
Diff comments   View file @ 11a9662
... ... @@ -4,4 +4,7 @@
4 4 +S:CONFIG_TARGET_ZYNQ_ZED=y
5 5 CONFIG_OF_CONTROL=y
6 6 CONFIG_DEFAULT_DEVICE_TREE="zynq-zed"
  7 +CONFIG_FIT=y
  8 +CONFIG_FIT_VERBOSE=y
  9 +CONFIG_FIT_SIGNATURE=y
configs/zynq_zybo_defconfig
Diff comments   View file @ 11a9662
... ... @@ -4,4 +4,7 @@
4 4 +S:CONFIG_TARGET_ZYNQ_ZYBO=y
5 5 CONFIG_OF_CONTROL=y
6 6 CONFIG_DEFAULT_DEVICE_TREE="zynq-zybo"
  7 +CONFIG_FIT=y
  8 +CONFIG_FIT_VERBOSE=y
  9 +CONFIG_FIT_SIGNATURE=y
include/configs/am335x_evm.h
Diff comments   View file @ 11a9662
... ... @@ -23,8 +23,8 @@
23 23 # define CONFIG_TIMESTAMP
24 24 # define CONFIG_LZO
25 25 # ifdef CONFIG_ENABLE_VBOOT
26   -# define CONFIG_FIT_SIGNATURE
27   -# define CONFIG_RSA
  26 +# define CONFIG_FIT_SIGNATURE
  27 +# define CONFIG_RSA
28 28 # endif
29 29 #endif
30 30  
include/configs/ids8313.h
Diff comments   View file @ 11a9662
... ... @@ -575,12 +575,9 @@
575 575  
576 576 #define CONFIG_VERSION_VARIABLE
577 577  
578   -#define CONFIG_FIT
579   -#define CONFIG_FIT_SIGNATURE
580 578 #define CONFIG_IMAGE_FORMAT_LEGACY
581 579 #define CONFIG_CMD_FDT
582 580 #define CONFIG_CMD_HASH
583   -#define CONFIG_RSA
584 581 #define CONFIG_SHA1
585 582 #define CONFIG_SHA256
586 583  
include/configs/sandbox.h
Diff comments   View file @ 11a9662
... ... @@ -41,9 +41,6 @@
41 41  
42 42 #define CONFIG_OF_LIBFDT
43 43 #define CONFIG_LMB
44   -#define CONFIG_FIT
45   -#define CONFIG_FIT_SIGNATURE
46   -#define CONFIG_RSA
47 44 #define CONFIG_CMD_FDT
48 45 #define CONFIG_ANDROID_BOOT_IMAGE
49 46  
include/configs/zynq-common.h
Diff comments   View file @ 11a9662
... ... @@ -276,16 +276,10 @@
276 276 #define CONFIG_OF_LIBFDT
277 277  
278 278 /* FIT support */
279   -#define CONFIG_FIT
280   -#define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */
281 279 #define CONFIG_IMAGE_FORMAT_LEGACY /* enable also legacy image format */
282 280  
283 281 /* FDT support */
284 282 #define CONFIG_DISPLAY_BOARDINFO_LATE
285   -
286   -/* RSA support */
287   -#define CONFIG_FIT_SIGNATURE
288   -#define CONFIG_RSA
289 283  
290 284 /* Extend size of kernel image for uncompression */
291 285 #define CONFIG_SYS_BOOTM_LEN (60 * 1024 * 1024)