Merge branch 'master' of git://git.denx.de/u-boot

[u-boot] / include / configs / tegra-common.h

diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 1385d316d3424eb7b6851ed01175fa60b88e8c5f..63b711be0f683b700ebf51bd9e1769c72e314705 100644 (file)
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -24,12 +24,6 @@
 #define CONFIG_SYS_TIMER_COUNTER       NV_PA_TMRUS_BASE
 #endif
 
-/*
- * Display CPU and Board information
- */
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define CONFIG_CMDLINE_TAG             /* enable passing of ATAGs */
 
 /* Environment */
@@ -66,12 +60,6 @@
 
 #define CONFIG_SYS_NO_FLASH
 
-#define CONFIG_CONSOLE_MUX
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_SYS_STDIO_DEREGISTER
-#endif
-
 /*
  * Increasing the size of the IO buffer as default nfsargs size is more
  *  than 256 and so it is not possible to edit it