ARM: Move SYS_CACHELINE_SIZE over to Kconfig

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

diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 10ac4a4..ae0e89c 100644 (file)
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -17,8 +17,13 @@
 #define __CONFIG_H
 
 /* High Level Configuration Options */
+#define CONFIG_SYS_THUMB_BUILD
 #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
 /*
@@ -32,16 +37,13 @@
 #define CONFIG_SDRC                    /* The chip has SDRC controller */
 
 #include <asm/arch/cpu.h>              /* get chip and board defs */
-#include <asm/arch/omap3.h>
-
-#define CONFIG_SYS_GENERIC_BOARD
+#include <asm/arch/omap.h>
 
 /* Display CPU and Board information */
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 
 #define CONFIG_SILENT_CONSOLE
-#define CONFIG_ZERO_BOOTDELAY_CHECK
 
 /* Clock Defines */
 #define V_OSCK                         26000000 /* Clock output from T2 */
@@ -54,8 +56,6 @@
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
 
-#define CONFIG_OF_LIBFDT
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (1024*1024)
 
@@ -82,7 +82,6 @@
 #define STATUS_LED_PERIOD2             (CONFIG_SYS_HZ / 2)
 
 /* NS16550 Configuration */
-#define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    (-4)
 #define CONFIG_SYS_NS16550_CLK         48000000 /* 48MHz (APLL96/2) */
@@ -109,7 +108,6 @@
  
 
 /* EEPROM */
-#define CONFIG_SYS_I2C_MULTI_EEPROMS
 #define CONFIG_CMD_EEPROM
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
 #define CONFIG_SYS_EEPROM_BUS_NUM      1
@@ -145,12 +143,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 */
-#define CONFIG_CMD_MMC                 /* MMC support */
 #define CONFIG_CMD_MTDPARTS            /* Enable MTD parts commands */
 #define CONFIG_CMD_NAND                        /* NAND support */
 #define CONFIG_CMD_NAND_LOCK_UNLOCK    /* nand (un)lock commands */
@@ -158,10 +150,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 */
@@ -171,7 +159,6 @@
 
 /* Environment information (this is the common part) */
 
-#define CONFIG_BOOTDELAY               0
 
 /* hang() the board on panic() */
 #define CONFIG_PANIC_HANG
@@ -283,10 +270,8 @@
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP            /* undef to save memory */
-#define CONFIG_SYS_HUSH_PARSER         /* use "hush" command parser */
 #define CONFIG_CMDLINE_EDITING         /* enable cmdline history */
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_PROMPT              "OMAP3 Tricorder # "
 #define CONFIG_SYS_CBSIZE              512     /* Console I/O Buffer Size */
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \