godotengine/buildroot
1
0
Fork 0
mirror of https://github.com/godotengine/buildroot.git synced 2026-01-05 14:09:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next'

Browse Source 
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2022-06-07 21:09:05 +02:00
parent 5da5a83142 110033aade
commit f657ed3b3e
193 changed files with 2759 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
boot/optee-os/Config.in
View File

@@ -72,6 +72,13 @@ config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY
python-cryptography. Select this option if optee-os needs
python-cryptography to be built.
config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_PILLOW
bool "OP-TEE OS needs host-python-pillow"
help
Some specific OP-TEE OS versions may use python-pillow to
build the Trusted User Interface feature. Select this
option if optee-os need python-pillow to be built.
config BR2_TARGET_OPTEE_OS_CORE
bool "Build core"
default y

4
boot/optee-os/optee-os.mk
View File

@@ -29,6 +29,10 @@ else
OPTEE_OS_DEPENDENCIES += host-python-pycryptodomex
endif
ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_PILLOW),y)
OPTEE_OS_DEPENDENCIES += host-python-pillow
endif
ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y)
OPTEE_OS_DEPENDENCIES += host-dtc
endif

12
boot/uboot/Config.in
View File

@@ -41,7 +41,7 @@ choice
Select the specific U-Boot version you want to use
config BR2_TARGET_UBOOT_LATEST_VERSION
bool "2022.01"
bool "2022.04"
config BR2_TARGET_UBOOT_CUSTOM_VERSION
bool "Custom version"
@@ -85,7 +85,7 @@ endif
config BR2_TARGET_UBOOT_VERSION
string
default "2022.01" if BR2_TARGET_UBOOT_LATEST_VERSION
default "2022.04" if BR2_TARGET_UBOOT_LATEST_VERSION
default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \
if BR2_TARGET_UBOOT_CUSTOM_VERSION
default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL
@@ -182,6 +182,14 @@ config BR2_TARGET_UBOOT_NEEDS_LZOP
the case when the board configuration has CONFIG_SPL_LZO
enabled.
config BR2_TARGET_UBOOT_NEEDS_GNUTLS
bool "U-Boot needs gnutls"
help
Select this option if your U-Boot board configuration
requires gnutls to be available on the host. This is
typically the case when the board configuration has
CONFIG_TOOLS_MKEFICAPSULE enabled.
config BR2_TARGET_UBOOT_NEEDS_ATF_BL31
bool "U-Boot needs ATF BL31"
depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE

2
boot/uboot/uboot.hash
View File

@@ -1,3 +1,3 @@
# Locally computed:
sha256 81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413 u-boot-2022.01.tar.bz2
sha256 68e065413926778e276ec3abd28bb32fa82abaa4a6898d570c1f48fbdb08bcd0 u-boot-2022.04.tar.bz2
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt

4
boot/uboot/uboot.mk
View File

@@ -227,6 +227,10 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_LZOP),y)
UBOOT_DEPENDENCIES += host-lzop
endif
ifeq ($(BR2_TARGET_UBOOT_NEEDS_GNUTLS),y)
UBOOT_DEPENDENCIES += host-gnutls
endif
# prior to u-boot 2013.10 the license info was in COPYING. Copy it so
# legal-info finds it
define UBOOT_COPY_OLD_LICENSE_FILE