From f95b8a4b5f64fd43e88c756662e77330dce8c007 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Mon, 22 Apr 2019 00:06:20 +0200 Subject: [PATCH] efi_loader: disable EFI_LOADER on vexpress_ca15_tc2 and ca9x4 vexpress_ca15_tc2_defconfig and vexpress_ca9x4_defconfig do not provide device trees (as $fdtcontroladdr) as needed to pass our Travis CI tests. As we are on the move to requiring block devices to be based on the driver model these boards either will have to be converted to use device trees or will be kicked out of U-Boot. So let's disable CONFIG_EFI_LOADER on these boards until the device tree issue is resolved. Signed-off-by: Heinrich Schuchardt --- configs/vexpress_ca15_tc2_defconfig | 1 + configs/vexpress_ca9x4_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/vexpress_ca15_tc2_defconfig b/configs/vexpress_ca15_tc2_defconfig index cabc0c4577..9bcbca5f24 100644 --- a/configs/vexpress_ca15_tc2_defconfig +++ b/configs/vexpress_ca15_tc2_defconfig @@ -32,3 +32,4 @@ CONFIG_SMC911X_32_BIT=y CONFIG_BAUDRATE=38400 CONFIG_CONS_INDEX=0 CONFIG_OF_LIBFDT=y +# CONFIG_EFI_LOADER is not set diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig index 9390cf61d1..3350c88b20 100644 --- a/configs/vexpress_ca9x4_defconfig +++ b/configs/vexpress_ca9x4_defconfig @@ -31,3 +31,4 @@ CONFIG_SMC911X_32_BIT=y CONFIG_BAUDRATE=38400 CONFIG_CONS_INDEX=0 CONFIG_OF_LIBFDT=y +# CONFIG_EFI_LOADER is not set -- 2.25.1