buildroot/boot/uboot, branch 2018.02.1

uboot: fix build for older uboot source trees

2018-03-30T21:19:30+00:00

The change in commit bf733342324b414a1142b57781504111f81c97ea only works for newer uboot source trees. Add a check that scripts/dtc/libfdt directory exists before making this change. [Peter: add comment explaining why] Signed-off-by: Stefan Becker Signed-off-by: Peter Korsgaard (cherry picked from commit f437bf547ca44849db4578c31707afdd96b85018) Signed-off-by: Peter Korsgaard

uboot: fix build when libfdt-devel is installed system-wide

2018-03-30T21:15:50+00:00

When libfdt-devel is installed system-wide, the build of U-Boot host programs currently fails with lots of: HOSTCC tools/aisimage.o In file included from tools/../include/../lib/libfdt/libfdt.h:10:0, from tools/../include/libfdt.h:1, from tools/fdt_host.h:11, from tools/imagetool.h:24, from tools/aisimage.c:8: /usr/include/libfdt_env.h:70:30: error: conflicting types for ‘fdt64_t’ typedef uint64_t FDT_BITWISE fdt64_t; ^~~~~~~ In file included from :0:0: ././include/libfdt_env.h:19:16: note: previous declaration of ‘fdt64_t’ was here typedef __be64 fdt64_t; ^~~~~~~ In file included from ././include/libfdt_env.h:12:0, from :0: /usr/include/libfdt_env.h:90:24: error: expected ‘)’ before ‘x’ static inline uint32_t fdt32_to_cpu(fdt32_t x) ^ This commit adds a fixup in the U-Boot code to fix this problem. The fixup is equivalent to applying upstream commit http://git.denx.de/?p=u-boot.git;a=commitdiff;h=e0d20dc1521e74b82dbd69be53a048847798a90a, but we can't use a patch for the uboot package, since people are using arbitrary versions. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard (cherry picked from commit bf733342324b414a1142b57781504111f81c97ea) Signed-off-by: Peter Korsgaard

uboot: ensure host includes are searched before system default includes

2018-03-01T23:12:43+00:00

Commit baae5156ce37e (uboot: use local fdt headers) changed the uboot logic to pass the host include directories with -idirafter instead of -I, so include files local to u-boot would be preferred over host includes. This unfortunately breaks configurations using BR2_TARGET_UBOOT_NEEDS_OPENSSL on hosts with incompatible openssl headers installed in the system default include directories as explained here: http://lists.busybox.net/pipermail/buildroot/2018-March/214651.html The problem is that -idirafter directories gets added to the very end of the search order, AFTER the system default directories. Instead use -isystem which causes the directories to be added after -I but before the system default directories. With this in place, the include directories of u-boot will first be scanned, followed by the host includes and finally the system default include directories. Signed-off-by: Peter Korsgaard

uboot: revert "uboot: use local libfdt.h"

2018-02-25T21:40:22+00:00

This reverts commit 3a6573ccee2624de0c604abf2c7df6704a4cf566. It is no longer necessary after solving the problem differently. Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni

uboot: use local fdt headers

2018-02-25T21:40:17+00:00

After commit b8c3e941731d ("package/dtc: qemu system build need libfdt") changed the dtc install target from 'install-bin' to 'install', uboot compilation failures occurred because libfdt related headers were now suddenly taken from output/host/include rather than from the uboot sources itself. Commit 3a6573ccee26 ("uboot: use local libfdt.h") solved this by patching one specific uboot source file, tools/fdtgrep.c, to replace '<...>'-style includes by '"..."'-style includes. However, depending on the uboot version, this may not be enough: there may be other references to fdt header files. In particular taking into account that it is not uncommon to have vendor-provided uboot trees which have custom changes. The root of the problem is that the uboot.mk file passes the host compiler as follows: UBOOT_MAKE_OPTS += \ ... HOSTCC="$(HOSTCC) $(HOST_CFLAGS)" \ ... where HOST_CFLAGS contains the string '-I$(HOST_DIR)/include' The uboot makefiles then use constructs of the form: $(CC) $(CPPFLAGS) $(CFLAGS) ..... where CPPFLAGS may contain -I references pointing to local directories. On the expanded compiler command-line, Buildroot's '-I$(HOST_DIR)/include' is thus present _before_ any -I to local directories, and thus takes precedence. And that becomes a problem for header files present both locally as in the Buildroot host directory, which is the case for libfdt. To fix this problem without having to patch u-boot sources, use '-idirafter' rather than '-I' to pass the Buildroot host include directory. '-idirafter' is basically the same thing, but adds the specified directory at the end of the include precedence chain, rather than at the beginning. Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni

uboot: bump to version 2018.01

2018-01-12T21:45:24+00:00

Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni

package/uboot: detect missing user-supplied environment source files

2017-12-14T05:37:13+00:00

Since 0542bb79e8 (uboot: Support multiple environment source files), missing user-supplied environment source files is no longer detected. This is because we cat them all, and feed the concatenation to the stdin of mkenvimage. So, if one source file is missing, the cat exits in error, but the compound command exits with the exit code of the last command, which is that of mkenvimage, which happens to be happy with whatever it is fed on its stdin, even is empty. We fix that by creating a temporary file, that we even leave afterward for the user to inspect. We also move it out of the _CMDS block and into a macro of its own, so that it is easier to write and maintain. Signed-off-by: "Yann E. MORIN" Cc: Cam Hutchison Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni

boot: uboot: fix typo

2017-12-08T13:32:02+00:00

Replace "depend" with "depends". Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard

uboot: add support for bundling ATF BL31 into U-Boot

2017-12-08T12:37:49+00:00

Some ARM64 platforms (such as Allwinner A64/H5) have a boot process where U-Boot encapsulates the BL31 part of the ARM trusted firmware. For such platforms, we need to build ATF before U-Boot, and pass a BL31 variable pointing to ATF bl31.bin to the U-Boot build process. This commit introduces a BR2_TARGET_UBOOT_NEEDS_ATF_BL31 variable to achieve this. Signed-off-by: Jagan Teki [Thomas: - Rename option to BR2_TARGET_UBOOT_NEEDS_ATF_BL31 - Drop changes to arm-trusted-firmware.mk, they are taken care of by previous commits. - Improve Config.in help text - Add missing dependency on arm-trusted-firmware when BR2_TARGET_UBOOT_NEEDS_ATF_BL31 is enabled. - Use bl31.bin from $(BINARIES_DIR) instead of taking it from ATF's build dir.] [Peter: depend on toplevel atf option and select bl31 option. Ensure it cannot be enabled together with ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 as that would cause circular dependencies] Signed-off-by: Thomas Petazzoni Tested-by: Jagan Teki Signed-off-by: Peter Korsgaard

uboot: Use BR2_TARGET_UBOOT_SPL_NAME for TPL name

2017-11-23T21:39:55+00:00

Since the BR2_TARGET_UBOOT_SPL_NAME option accepts a space-separated list of binaries, the same option can be reuses for TPL binaries as well. This commit updates the string and help text to indicate that the same option can be used for SPL and TPL. Signed-off-by: Jagan Teki Signed-off-by: Thomas Petazzoni