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 7dc6cca6cc194c2367f29dd314f0f1e45e4b0160..e2e0d5c2d04a8efc5acb715016d31f7a826ea0ce 100644 (file)
--- a/include/configs/enbw_cmc.h
+++ b/include/configs/enbw_cmc.h
@@ -71,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
@@ -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
  */
@@ -225,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"                                                \
@@ -246,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
@@ -337,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
@@ -439,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