diff options
| author | Neal Ostrem <nealo@google.com> | 2017-12-07 21:00:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-07 21:00:04 +0000 |
| commit | 78dca2e8201cbea976ec3b1932f3f52ea47f4966 (patch) | |
| tree | c8eba26b19054a9f61c3564b94db8a410e6ad646 | |
| parent | ce440928abb9feac10c7e73bcfbad7e9a23387e6 (diff) | |
| parent | c8078a18347d68d2bf6543eec33ddf2b27df5c71 (diff) | |
| download | uboot-imx-78dca2e8201cbea976ec3b1932f3f52ea47f4966.tar.gz | |
Eliminate random build failures due to race condition..
am: c8078a1834
Change-Id: Ifcaeb5c483aec78b3c2d5731d598e8140d9344b5
| -rw-r--r-- | configs/pico-imx7d_defconfig | 1 | ||||
| -rw-r--r-- | lib/efi_loader/Makefile | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig index 70e61f8d76..b5b185b982 100644 --- a/configs/pico-imx7d_defconfig +++ b/configs/pico-imx7d_defconfig @@ -38,3 +38,4 @@ CONFIG_DM=y CONFIG_DM_THERMAL=y CONFIG_IMX_BOOTAUX=y CONFIG_AVB_ATX=y +# CONFIG_EFI_LOADER is not set diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile index fa8b91a526..b5a7e964cd 100644 --- a/lib/efi_loader/Makefile +++ b/lib/efi_loader/Makefile @@ -10,8 +10,9 @@ CFLAGS_helloworld.o := $(CFLAGS_EFI) CFLAGS_REMOVE_helloworld.o := $(CFLAGS_NON_EFI) -efiprogs-$(CONFIG_CMD_BOOTEFI_HELLO_COMPILE) += helloworld.efi -always := $(efiprogs-y) +ifneq ($(CONFIG_CMD_BOOTEFI_HELLO_COMPILE),) +always += helloworld.efi +endif obj-$(CONFIG_CMD_BOOTEFI_HELLO) += helloworld_efi.o obj-y += efi_image_loader.o efi_boottime.o efi_runtime.o efi_console.o |