x86: Move CONFIG_X86_SERIAL to Kconfig

[karo-tx-uboot.git] / include / configs / tricorder.h

diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index b105ffd9f18b13e7564f4320d4140c95a3665df7..23bf599ec5ac39d15a6f62fd172a988156f301ff 100644 (file)
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -19,6 +19,10 @@
 /* High Level Configuration Options */
 #define CONFIG_OMAP                    /* in a TI OMAP core */
 #define CONFIG_OMAP_COMMON
+/* Common ARM Erratas */
+#define CONFIG_ARM_ERRATA_454179
+#define CONFIG_ARM_ERRATA_430973
+#define CONFIG_ARM_ERRATA_621766
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_TRICORDER
 /*
@@ -145,8 +149,6 @@
 #define CONFIG_SYS_NAND_MAX_ECCPOS     56
 
 /* commands to include */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_EXT2                        /* EXT2 Support */
 #define CONFIG_CMD_FAT                 /* FAT support */
 #define CONFIG_CMD_I2C                 /* I2C serial bus support */
@@ -158,10 +160,6 @@
 #define CONFIG_CMD_UBIFS               /* UBIFS commands */
 #define CONFIG_LZO                     /* LZO is needed for UBIFS */
 
-#undef CONFIG_CMD_NET
-#undef CONFIG_CMD_NFS
-#undef CONFIG_CMD_FPGA                 /* FPGA configuration Support */
-#undef CONFIG_CMD_IMI                  /* iminfo */
 #undef CONFIG_CMD_JFFS2                        /* JFFS2 Support */
 
 /* needed for ubi */