Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot

[oweals/u-boot.git] / include / configs / armadillo-800eva.h

diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index e3f4a7b536057a6a699cb89e93c43ca2f403d830..2d24253468cd10cdd7fc6a1f091e1c2fa41c1e4d 100644 (file)
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -27,8 +27,6 @@
 #undef CONFIG_SHOW_BOOT_PROGRESS
 
 #define CONFIG_ARCH_CPU_INIT
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_USE_ARCH_MEMSET
 #define CONFIG_USE_ARCH_MEMCPY
@@ -60,9 +58,6 @@
 #define SCIF2_BASE             0xe6c60000
 #define SCIF4_BASE             0xe6c80000
 #define        CONFIG_SCIF_A
-#undef CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 
 #define CONFIG_SYS_MEMTEST_START       (ARMADILLO_800EVA_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + \