projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2020-04-25-master-imports'
[oweals/u-boot.git]
/
Kconfig
diff --git
a/Kconfig
b/Kconfig
index d9be0daf23a19ff60d141d656e332fc17808a5ff..9a5e60075389a5dc9ee2d53a72ede1b6b17c056b 100644
(file)
--- a/
Kconfig
+++ b/
Kconfig
@@
-3,11
+3,7
@@
# see the file Documentation/kbuild/kconfig-language.txt in the
# Linux kernel source tree.
#
# see the file Documentation/kbuild/kconfig-language.txt in the
# Linux kernel source tree.
#
-mainmenu "U-Boot $UBOOTVERSION Configuration"
-
-config UBOOTVERSION
- string
- option env="UBOOTVERSION"
+mainmenu "U-Boot $(UBOOTVERSION) Configuration"
# Allow defaults in arch-specific code to override any given here
source "arch/Kconfig"
# Allow defaults in arch-specific code to override any given here
source "arch/Kconfig"
@@
-115,6
+111,7
@@
config ENV_VARS_UBOOT_CONFIG
config NR_DRAM_BANKS
int "Number of DRAM banks"
config NR_DRAM_BANKS
int "Number of DRAM banks"
+ default 1 if ARCH_SUNXI || ARCH_OWL
default 4
help
This defines the number of DRAM banks.
default 4
help
This defines the number of DRAM banks.
@@
-147,7
+144,9
@@
config SYS_MALLOC_F_LEN
default 0x1000 if AM33XX
default 0x2800 if SANDBOX
default 0x2000 if (ARCH_IMX8 || ARCH_IMX8M || ARCH_MX7 || \
default 0x1000 if AM33XX
default 0x2800 if SANDBOX
default 0x2000 if (ARCH_IMX8 || ARCH_IMX8M || ARCH_MX7 || \
- ARCH_MX7ULP || ARCH_MX6 || ARCH_MX5)
+ ARCH_MX7ULP || ARCH_MX6 || ARCH_MX5 || \
+ ARCH_LS1012A || ARCH_LS1021A || ARCH_LS1043A || \
+ ARCH_LS1046A)
default 0x400
help
Before relocation, memory is very limited on many platforms. Still,
default 0x400
help
Before relocation, memory is very limited on many platforms. Still,
@@
-234,7
+233,7
@@
config BUILD_ROM
This option allows to build a ROM version of U-Boot.
The build process generally requires several binary blobs
which are not shipped in the U-Boot source tree.
This option allows to build a ROM version of U-Boot.
The build process generally requires several binary blobs
which are not shipped in the U-Boot source tree.
- Please, see doc/
README.x86
for details.
+ Please, see doc/
arch/x86.rst
for details.
config SPL_IMAGE
string "SPL image used in the combined SPL+U-Boot image"
config SPL_IMAGE
string "SPL image used in the combined SPL+U-Boot image"
@@
-296,6
+295,11
@@
config ERR_PTR_OFFSET
pointer values - up to 'MAX_ERRNO' bytes below this value must be
unused/invalid addresses.
pointer values - up to 'MAX_ERRNO' bytes below this value must be
unused/invalid addresses.
+config PLATFORM_ELFENTRY
+ string
+ default "__start" if MIPS
+ default "_start"
+
endmenu # General setup
menu "Boot images"
endmenu # General setup
menu "Boot images"
@@
-352,6
+356,8
@@
config FIT_SIGNATURE
depends on DM
select HASH
select RSA
depends on DM
select HASH
select RSA
+ select RSA_VERIFY
+ select IMAGE_SIGN_INFO
help
This option enables signature verification of FIT uImages,
using a hash signed and verified using RSA. If
help
This option enables signature verification of FIT uImages,
using a hash signed and verified using RSA. If
@@
-383,6
+389,14
@@
config FIT_ENABLE_RSASSA_PSS_SUPPORT
Enable this to support the pss padding algorithm as described
in the rfc8017 (https://tools.ietf.org/html/rfc8017).
Enable this to support the pss padding algorithm as described
in the rfc8017 (https://tools.ietf.org/html/rfc8017).
+config FIT_CIPHER
+ bool "Enable ciphering data in a FIT uImages"
+ depends on DM
+ select AES
+ help
+ Enable the feature of data ciphering/unciphering in the tool mkimage
+ and in the u-boot support of the FIT image.
+
config FIT_VERBOSE
bool "Show verbose messages when FIT images fail"
help
config FIT_VERBOSE
bool "Show verbose messages when FIT images fail"
help
@@
-432,6
+446,8
@@
config SPL_FIT_SIGNATURE
depends on SPL_DM
select SPL_FIT
select SPL_RSA
depends on SPL_DM
select SPL_FIT
select SPL_RSA
+ select SPL_RSA_VERIFY
+ select SPL_IMAGE_SIGN_INFO
config SPL_LOAD_FIT
bool "Enable SPL loading U-Boot as a FIT (basic fitImage features)"
config SPL_LOAD_FIT
bool "Enable SPL loading U-Boot as a FIT (basic fitImage features)"