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

[u-boot] / include / configs / enbw_cmc.h

diff --git a/include/configs/enbw_cmc.h b/include/configs/enbw_cmc.h
index c427dc7c692be5de02e4d81c2c6f92d6686a0d6b..e2e0d5c2d04a8efc5acb715016d31f7a826ea0ce 100644 (file)
--- a/include/configs/enbw_cmc.h
+++ b/include/configs/enbw_cmc.h
@@ -40,17 +40,18 @@
 #define CONFIG_ARM926EJS               /* arm926ejs CPU core */
 #define CONFIG_SOC_DA8XX               /* TI DA8xx SoC */
 #define CONFIG_SOC_DA850               /* TI DA850 SoC */
+#define CONFIG_SYS_EXCEPTION_VECTORS_HIGH
 #define CONFIG_SYS_CLK_FREQ            clk_get(DAVINCI_ARM_CLKID)
 #define CONFIG_SYS_OSCIN_FREQ          24000000
 #define CONFIG_SYS_TIMERBASE           DAVINCI_TIMER0_BASE
 #define CONFIG_SYS_HZ_CLOCK            clk_get(DAVINCI_AUXCLK_CLKID)
 #define CONFIG_SYS_HZ                  1000
-#define CONFIG_SKIP_LOWLEVEL_INIT
 #define CONFIG_DA850_LOWLEVEL
 #define CONFIG_ARCH_CPU_INIT
+#define CONFIG_SYS_DA850_PLL_INIT
+#define CONFIG_SYS_DA850_DDR_INIT
 #define CONFIG_DA8XX_GPIO
 #define CONFIG_HOSTNAME                enbw_cmc
-#define CONFIG_DISPLAY_CPUINFO
 
 #define MACH_TYPE_ENBW_CMC     3585
 #define CONFIG_MACH_TYPE       MACH_TYPE_ENBW_CMC
@@ -70,7 +71,6 @@
 #define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + 0x2000000 + 16*1024*1024)
 
 #define CONFIG_NR_DRAM_BANKS   1 /* we have 1 bank of DRAM */
-#define CONFIG_STACKSIZE       (256*1024) /* regular stack */
 
 /*
  * Serial Driver info
@@ -82,8 +82,7 @@
 #define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID)
 #define CONFIG_CONS_INDEX      1               /* use UART0 for console */
 #define CONFIG_BAUDRATE                115200          /* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
-#define CONFIG_SYS_DA850_LPSC_UART     DAVINCI_LPSC_UART2
+
 /*
  * I2C Configuration
  */
@@ -101,6 +100,14 @@
 #define CONFIG_SYS_DTT_LOW_TEMP        -30
 #define CONFIG_SYS_DTT_HYSTERESIS      3
 
+/*
+ * SPI Configuration
+ */
+#define CONFIG_DAVINCI_SPI
+#define CONFIG_SYS_SPI_BASE            DAVINCI_SPI1_BASE
+#define CONFIG_SYS_SPI_CLK             clk_get(DAVINCI_SPI1_CLKID)
+#define CONFIG_CMD_SPI
+
 /*
  * Flash & Environment
  */
@@ -115,7 +122,6 @@
 #define CONFIG_SYS_ALE_MASK            0x8
 #undef CONFIG_SYS_NAND_HW_ECC
 #define CONFIG_SYS_MAX_NAND_DEVICE     1 /* Max number of NAND devices */
-#define NAND_MAX_CHIPS                 1
 
 #define MTDIDS_DEFAULT         "nor0=physmap-flash.0,nand0=davinci_nand.1"
 #define MTDPARTS_DEFAULT                       \
@@ -146,7 +152,6 @@
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT 10
-#define CONFIG_NET_MULTI
 #endif
 
 /*
@@ -227,9 +232,9 @@
        "key_magic_2=2\0"                                               \
        "key_magic_3=3\0"                                               \
        "magic_keys=0123\0"                                             \
-       "hwconfig=switch:lan=on,pwl=off\0"                              \
+       "hwconfig=switch:lan=on,pwl=off,config=0x60100000\0"            \
        "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0"              \
-       "addmisc=setenv bootargs ${bootargs} davinci_mmc.use_dma=0\0"   \
+       "addmisc=setenv bootargs ${bootargs}\0"                         \
        "mtdids=" MTDIDS_DEFAULT "\0"                                   \
        "mtdparts=" MTDPARTS_DEFAULT "\0"                               \
        "logversion=2\0"                                                \
@@ -248,7 +253,6 @@
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
@@ -272,6 +276,10 @@
 #define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_CACHE
 
+#ifdef CONFIG_CMD_BDI
+#define CONFIG_CLOCKS
+#endif
+
 #ifndef CONFIG_DRIVER_TI_EMAC
 #undef CONFIG_CMD_NET
 #undef CONFIG_CMD_DHCP
@@ -335,6 +343,11 @@
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_MMC
 
+/* GPIO */
+#define CONFIG_ENBW_CMC_BOARD_TYPE     57
+#define CONFIG_ENBW_CMC_HW_ID_BIT0     39
+#define CONFIG_ENBW_CMC_HW_ID_BIT1     38
+#define CONFIG_ENBW_CMC_HW_ID_BIT2     35
 
 /* FDT support */
 #define CONFIG_OF_LIBFDT
@@ -437,12 +450,14 @@
 #define CONFIG_SYS_DV_NOR_BOOT_CFG     (0x11)
 
 #define CONFIG_POST    (CONFIG_SYS_POST_MEMORY)
-#define CONFIG_SYS_POST_WORD_ADDR 0x8001FFF0
+#define CONFIG_POST_EXTERNAL_WORD_FUNCS
+#define CONFIG_SYS_POST_WORD_ADDR DAVINCI_RTC_BASE
 #define CONFIG_LOGBUFFER
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 
 #define CONFIG_BOOTCOUNT_LIMIT
 #define CONFIG_SYS_BOOTCOUNT_ADDR      DAVINCI_RTC_BASE
+#define CONFIG_SYS_BOOTCOUNT_BE
 
 #define CONFIG_SYS_NAND_U_BOOT_DST     0xc0080000
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x60004000