godotengine/buildroot
1
0
Fork 0
mirror of https://github.com/godotengine/buildroot.git synced 2025-12-31 09:48:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next'

Browse Source
This commit is contained in:
Peter Korsgaard
2023-03-12 22:45:36 +01:00
parent f90fd1b8f4 acfe5c70b2
commit df48bcd151
145 changed files with 1644 additions and 1421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
boot/arm-trusted-firmware/Config.in
View File

@@ -129,6 +129,27 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE
endchoice
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33
bool "Use Barebox as BL33"
depends on BR2_TARGET_BAREBOX
help
This option allows to embed the Barebox generic BL33 image in
the ARM Trusted Firmware. It ensures that the Barebox package
gets built before ATF, and that the appropriate BL33
variable pointing to the generic bl33 image is passed
when building ATF.
if BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE
string "Barebox BL33 image name"
default "*-generic-bl33.img"
help
Name of the Barebox BL33 image to include in ATF, it must
have been installed to BINARIES_DIR by the Barebox package.
endif
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33
bool "Use U-Boot as BL33"
depends on BR2_TARGET_UBOOT

6
boot/arm-trusted-firmware/arm-trusted-firmware.mk
View File

@@ -105,6 +105,12 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += AARCH32_SP=optee
endif
endif # BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE
ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33),y)
ARM_TRUSTED_FIRMWARE_BAREBOX_BIN = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE))
ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL33=$(BINARIES_DIR)/$(ARM_TRUSTED_FIRMWARE_BAREBOX_BIN)
ARM_TRUSTED_FIRMWARE_DEPENDENCIES += barebox
endif
ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33),y)
ARM_TRUSTED_FIRMWARE_DEPENDENCIES += edk2
# Since the flash device name vary between platforms, we use the variable

2
boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
BOOT_WRAPPER_AARCH64_VERSION = 8d5a765251d9113c3c0f9fa14de42a9e7486fe8a
BOOT_WRAPPER_AARCH64_VERSION = 9f26a1c1f27bd6b5b66c265114848007fc22e4aa
BOOT_WRAPPER_AARCH64_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git
BOOT_WRAPPER_AARCH64_SITE_METHOD = git
BOOT_WRAPPER_AARCH64_LICENSE = BSD-3-Clause

4
boot/grub2/Config.in
View File

@@ -27,6 +27,10 @@ config BR2_TARGET_GRUB2
Amongst others, GRUB2 offers EFI support, which GRUB Legacy
doesn't provide.
The file boot/grub2/grub.cfg is used by default as the Grub
configuration file. It can be overridden using a rootfs
overlay or post-build script.
For additional notes on using Grub 2 with Buildroot, see
boot/grub2/readme.txt