Merge branch 'master' into next

[platform/kernel/u-boot.git] / include / configs / efi-x86_app.h

diff --git a/include/configs/efi-x86_app.h b/include/configs/efi-x86_app.h
index 33418cf..843ed8b 100644 (file)
--- a/include/configs/efi-x86_app.h
+++ b/include/configs/efi-x86_app.h
@@ -8,10 +8,8 @@
 
 #include <configs/x86-common.h>
 
-#undef CONFIG_TPM_TIS_BASE_ADDRESS
-
-#define CONFIG_STD_DEVICES_SETTINGS     "stdin=usbkbd,vga,serial\0" \
-                                       "stdout=vga,serial\0" \
-                                       "stderr=vga,serial\0"
+#define CFG_STD_DEVICES_SETTINGS       "stdin=serial\0" \
+                                       "stdout=vidconsole\0" \
+                                       "stderr=vidconsole\0"
 
 #endif