[Buildroot] [PATCH v2 0/3] boot/boot-wrapper-aarch64: bump and upgrade

[Buildroot] [PATCH v2 0/3] boot/boot-wrapper-aarch64: bump and upgrade

[Jan Kotas]

This patch series 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.

Jan Kotas (3):
  boot/boot-wrapper-aarch64: bump version
  boot/boot-wrapper-aarch64: improve dtb handling
  boot/boot-wrapper-aarch64: add gicv3 support

 boot/boot-wrapper-aarch64/Config.in            |  5 +++++
 .../boot-wrapper-aarch64.mk                    | 18 +++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)

-- 
2.18.0

[Buildroot] [PATCH v2 1/3] boot/boot-wrapper-aarch64: bump version

[Jan Kotas]

This patch bumps the bootwrapper version to the latest.

Signed-off-by: Jan Kotas <jank@cadence.com>
---
 boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
index cd6e1b7b7..3383cb58a 100644
--- a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
+++ b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-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
-- 
2.18.0

[Buildroot] [PATCH v2 2/3] boot/boot-wrapper-aarch64: improve dtb handling

[Jan Kotas]

This patch improves the DTB handling, using a parameter
in more recent versions of the bootwrapper.

Signed-off-by: Jan Kotas <jank@cadence.com>
---
 boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
index 3383cb58a..b0bba7a4d 100644
--- a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
+++ b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
@@ -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.
-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) \
 	--with-cmdline=$(BR2_TARGET_BOOT_WRAPPER_AARCH64_BOOTARGS)
 
 ifeq ($(BR2_TARGET_BOOT_WRAPPER_AARCH64_PSCI),y)
-- 
2.18.0

[Buildroot] [PATCH v2 3/3] boot/boot-wrapper-aarch64: add gicv3 support

[Jan Kotas]

This patch adds support for GICv3 (such as GIC-500).

Signed-off-by: Jan Kotas <jank@cadence.com>
---
 boot/boot-wrapper-aarch64/Config.in               | 5 +++++
 boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/boot/boot-wrapper-aarch64/Config.in b/boot/boot-wrapper-aarch64/Config.in
index efb70dcdf..cf7389282 100644
--- a/boot/boot-wrapper-aarch64/Config.in
+++ b/boot/boot-wrapper-aarch64/Config.in
@@ -38,4 +38,9 @@ config BR2_TARGET_BOOT_WRAPPER_AARCH64_PSCI
 	  Boot secondary SMP cores using PSCI firmware calls. If
 	  disabled, the spin-table method is used instead.
 
+config BR2_TARGET_BOOT_WRAPPER_AARCH64_GICV3
+	bool "Enable GICv3 instead of GICv2"
+	help
+	  Boot using GICv3 instead of GICv2.
+
 endif
diff --git a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
index b0bba7a4d..117e11398 100644
--- a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
+++ b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
@@ -28,6 +28,10 @@ else
 BOOT_WRAPPER_AARCH64_CONF_OPTS += --disable-psci
 endif
 
+ifeq ($(BR2_TARGET_BOOT_WRAPPER_AARCH64_GICV3),y)
+BOOT_WRAPPER_AARCH64_CONF_OPTS += --enable-gicv3
+endif
+
 # We need to convince the configure script that the Linux kernel tree
 # exists, as well as the DTB and the kernel Image. Even though those
 # are available on the build machine, the configure script uses
-- 
2.18.0

[Buildroot] [PATCH v2 0/3] boot/boot-wrapper-aarch64: bump and upgrade

[Thomas Petazzoni]

On Tue, 3 Dec 2019 04:18:12 -0500
Jan Kotas <jank@cadence.com> wrote:

> Jan Kotas (3):
>   boot/boot-wrapper-aarch64: bump version
>   boot/boot-wrapper-aarch64: improve dtb handling
>   boot/boot-wrapper-aarch64: add gicv3 support

Thanks, series applied to master!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com