From: Tom Rini Date: Fri, 27 Mar 2020 15:47:04 +0000 (-0400) Subject: Revert "vexpress_ca9x4: Enable use of correct DTB file and restore EFI loader." X-Git-Tag: v2020.04-rc4~4 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=39984d22138339fb2b14b21de635ef177cce0c7a;p=oweals%2Fu-boot.git Revert "vexpress_ca9x4: Enable use of correct DTB file and restore EFI loader." Currently this causes failures of the platform when running the EFI loader tests, so disable it for now. This reverts commit af827140e5965e5bb2bcad1c53ca8419b428ff6d. Signed-off-by: Tom Rini --- diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig index 6bd1f253b6..2119df6b10 100644 --- a/configs/vexpress_ca9x4_defconfig +++ b/configs/vexpress_ca9x4_defconfig @@ -34,4 +34,4 @@ CONFIG_SMC911X_32_BIT=y CONFIG_BAUDRATE=38400 CONFIG_CONS_INDEX=0 CONFIG_OF_LIBFDT=y -CONFIG_DEFAULT_FDT_FILE="vexpress-v2p-ca9.dtb" +# CONFIG_EFI_LOADER is not set diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index e73658a9e6..7f215a6707 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -207,8 +207,7 @@ "devtmpfs.mount=0 vmalloc=256M\0" \ "bootflash=run flashargs; " \ "cp ${ramdisk_addr} ${ramdisk_addr_r} ${maxramdisk}; " \ - "bootm ${kernel_addr} ${ramdisk_addr_r}\0" \ - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" + "bootm ${kernel_addr} ${ramdisk_addr_r}\0" /* FLASH and environment organization */ #define PHYS_FLASH_SIZE 0x04000000 /* 64MB */