Browse Source

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 <trini@konsulko.com>
Tom Rini 4 years ago
parent
commit
39984d2213
2 changed files with 2 additions and 3 deletions
  1. 1 1
      configs/vexpress_ca9x4_defconfig
  2. 1 2
      include/configs/vexpress_common.h

+ 1 - 1
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

+ 1 - 2
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 */