Commit 3a89b061 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

boot-wrapper-aarch64: bump version and switch to autotools-package 



This commit updates boot-wrapper-aarch64 to the latest version. As it
now uses the autotools, we switch the package to the autotools-package
infrastructure.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent f4642eea

boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk

+28 −10
Original line number Diff line number Diff line
@@ -4,26 +4,44 @@ 
#

################################################################################



BOOT_WRAPPER_AARCH64_VERSION        = 26b62f586020fd998c6efd43db657eaafeec14da

BOOT_WRAPPER_AARCH64_VERSION        = 4266507a84f8c06452109d38e0350d4759740694

BOOT_WRAPPER_AARCH64_SITE           = git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/boot-wrapper-aarch64.git

BOOT_WRAPPER_AARCH64_LICENSE        = BSD3c

BOOT_WRAPPER_AARCH64_LICENSE_FILES  = LICENSE.txt

BOOT_WRAPPER_AARCH64_DEPENDENCIES   = linux

BOOT_WRAPPER_AARCH64_INSTALL_IMAGES = YES



BOOT_WRAPPER_AARCH64_DTS = $(call qstrip,$(BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS))

# The Git repository does not have the generated configure script and

# Makefile.

BOOT_WRAPPER_AARCH64_AUTORECONF = YES



define BOOT_WRAPPER_AARCH64_BUILD_CMDS

	$(MAKE) \

		KERNEL=$(BINARIES_DIR)/Image \

		DTC=$(LINUX_DIR)/scripts/dtc/dtc \

		FDT_SRC=$(LINUX_DIR)/arch/arm64/boot/dts/$(BOOT_WRAPPER_AARCH64_DTS).dts \

		CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \

		BOOTARGS='$(BR2_TARGET_BOOT_WRAPPER_AARCH64_BOOTARGS)' -C $(@D)

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_CONF_OPT = \

	--with-kernel-dir=$(LINUX_DIR) \

	--with-cmdline=$(BR2_TARGET_BOOT_WRAPPER_AARCH64_BOOTARGS)



# 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

# AC_CHECK_FILE tests, which are always disabled in cross-compilation

# situations.

BOOT_WRAPPER_AARCH64_CONF_ENV = \

	$(call AUTOCONF_AC_CHECK_FILE_VAL,$(LINUX_DIR))=yes \

	$(call AUTOCONF_AC_CHECK_FILE_VAL,$(LINUX_DIR)$(BOOT_WRAPPER_AARCH64_DTB))=yes \

	$(call AUTOCONF_AC_CHECK_FILE_VAL,$(LINUX_DIR)/arch/arm64/boot/Image)=yes



define BOOT_WRAPPER_AARCH64_INSTALL_IMAGES_CMDS

	cp $(@D)/linux-system.axf $(BINARIES_DIR)

endef



$(eval $(generic-package))
 
$(eval $(autotools-package))