diff --git a/layers/meta-balena-allwinner/recipes-bsp/u-boot/u-boot_2017.11.bb b/layers/meta-balena-allwinner/recipes-bsp/u-boot/u-boot_2017.11.bb index 50b4d97..6ded447 100644 --- a/layers/meta-balena-allwinner/recipes-bsp/u-boot/u-boot_2017.11.bb +++ b/layers/meta-balena-allwinner/recipes-bsp/u-boot/u-boot_2017.11.bb @@ -63,6 +63,7 @@ SRC_URI = "git://git.denx.de/u-boot.git;branch=master \ file://boot.cmd \ file://0001-Increase-size-of-memory-available-to-bootm.patch \ file://0002-Add-Resin-specific-boot-command.patch \ + file://0003-libftd_fix.patch \ " SRCREV = "v2017.11" diff --git a/layers/meta-balena-allwinner/recipes-bsp/u-boot/u-boot_2017.11/0003-libftd_fix.patch b/layers/meta-balena-allwinner/recipes-bsp/u-boot/u-boot_2017.11/0003-libftd_fix.patch new file mode 100644 index 0000000..3c3d0d2 --- /dev/null +++ b/layers/meta-balena-allwinner/recipes-bsp/u-boot/u-boot_2017.11/0003-libftd_fix.patch @@ -0,0 +1,35 @@ +From 6eecc74a9178ddd29375a6c3ee354f2e8b989c45 Mon Sep 17 00:00:00 2001 +From: Vicentiu Galanopulo +Date: Thu, 26 Sep 2019 16:19:02 +0200 +Subject: [PATCH] Include U-Boot libfdt headers from their actual path + +There are no headers for libfdt in lib/libfdt, as they are instead +located in scripts/dtc/libfdt. Specifying lib/libfdt for headers +inclusion in host tools results in using the system libfdt headers, +which is not what we want. Change this to the proper path. + +Signed-off-by:Paul Kocialkowski + +Upstream-Status: Inappropriate [Backport] + +Signed-off-by: Vicentiu Galanopulo +--- + tools/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/Makefile b/tools/Makefile +index 54bd22406a..39ccbaa881 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -266,7 +266,7 @@ endif # !LOGO_BMP + # + HOST_EXTRACFLAGS += -include $(srctree)/include/libfdt_env.h \ + $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \ +- -I$(srctree)/lib/libfdt \ ++ -I$(srctree)/scripts/dtc/libfdt \ + -I$(srctree)/tools \ + -DUSE_HOSTCC \ + -D__KERNEL_STRICT_NAMES \ +-- +2.17.1 +