Skip to contentSkip to conversation

boot/boot-wrapper-aarch64: bump version and add gicv3 support

PATCH New Thomas Petazzoni 1 participant 1 message Dec 3, 2019 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH 1/1 boot/boot-wrapper-aarch64: bump version and add gicv3 support

Hello Jan,

Quoted 5 lines · On Tue, 3 Dec 2019 03:49:57 -0500 Jan Kotas <[email protected]> wrote:

This patch bumps the boot wrapper for aarch64 to the latest version. It also adds an option to use GICv3 (such as GIC-500). Handling of the DTB has been also improved.

Thanks a lot for your contribution! However, it should be three separate patches:

- One bumping the version

- One tweaking the DTB handling

- One adding the GICv3 option

Quoted 14 lines
(quoted diff) +1 -6
-BOOT_WRAPPER_AARCH64_VERSION = 4266507a84f8c06452109d38e0350d4759740694
+BOOT_WRAPPER_AARCH64_VERSION = fd74c8cbd0e17483d2299208cad9742bee605ca7
 BOOT_WRAPPER_AARCH64_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git
 BOOT_WRAPPER_AARCH64_LICENSE = BSD-3-Clause
 BOOT_WRAPPER_AARCH64_LICENSE_FILES = LICENSE.txt
@@ -15,19 +15,11 @@ BOOT_WRAPPER_AARCH64_INSTALL_IMAGES = YES
 # Makefile.
 BOOT_WRAPPER_AARCH64_AUTORECONF = YES
 
-BOOT_WRAPPER_AARCH64_DTB = /arch/arm64/boot/dts/$(basename $(call qstrip,$(BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS))).dtb
-
-# Fixup the path to the DTB in configure.ac. In the future, this
-# should hopefully be made more configurable by the
-# boot-wrapper-aarch64 developers.

Review BOOT_WRAPPER_AARCH64_INSTALL_IMAGES = YES · line 22

Quoted 10 lines
(quoted diff) +2 -5
-define BOOT_WRAPPER_AARCH64_FIX_DTB_NAME
-	$(SED) 's%^KERN_DTB=.*%KERN_DTB=$(BOOT_WRAPPER_AARCH64_DTB)%' $(@D)/configure.ac
-endef
-
-BOOT_WRAPPER_AARCH64_PRE_PATCH_HOOKS += BOOT_WRAPPER_AARCH64_FIX_DTB_NAME
+BOOT_WRAPPER_AARCH64_DTB = $(LINUX_DIR)/arch/arm64/boot/dts/$(basename $(call qstrip,$(BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS))).dtb
 
 BOOT_WRAPPER_AARCH64_CONF_OPTS = \
 	--with-kernel-dir=$(LINUX_DIR) \
+	--with-dtb=$(BOOT_WRAPPER_AARCH64_DTB) \

This indeed looks nicer than the patch hook we had.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com