Merge branch 'tx53-bugfix'

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

diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index 6f25fdba773344523b3b6e747f0f2c2063d68d0f..4efc9c5f3e6f3d7d7d3a2ece7f8866f717e57b23 100644 (file)
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -19,6 +19,9 @@
 /* Avoid overwriting factory configuration block */
 #define CONFIG_BOARD_SIZE_LIMIT                0x40000
 
+/* We will never enable dcache because we have to setup MMU first */
+#define CONFIG_SYS_DCACHE_OFF
+
 /*
  * Environment settings
  */
@@ -52,15 +55,28 @@
 /*
  * Bootloader Components Configuration
  */
-#include <config_cmd_default.h>
-
-#undef CONFIG_CMD_LOADB                        /* Both together */
-#undef CONFIG_CMD_LOADS                        /* saves 10 KB */
 #define        CONFIG_CMD_ENV
-#undef CONFIG_CMD_IMLS
 #define        CONFIG_CMD_MMC
 #define        CONFIG_CMD_USB
-#define        CONFIG_CMD_FLASH
+
+/* I2C support */
+#ifdef CONFIG_SYS_I2C
+#define CONFIG_CMD_I2C
+#define CONFIG_SYS_I2C_PXA
+#define CONFIG_PXA_STD_I2C
+#define CONFIG_PXA_PWR_I2C
+#define CONFIG_SYS_I2C_SPEED           100000
+#endif
+
+/* LCD support */
+#ifdef CONFIG_LCD
+#define CONFIG_PXA_LCD
+#define CONFIG_PXA_VGA
+#define CONFIG_SYS_WHITE_ON_BLACK
+#define CONFIG_CONSOLE_SCROLL_LINES    10
+#define CONFIG_CMD_BMP
+#define CONFIG_LCD_LOGO
+#endif
 
 /*
  * Networking Configuration
@@ -87,6 +103,7 @@
 #define        CONFIG_SYS_HUSH_PARSER          1
 
 #undef CONFIG_SYS_LONGHELP             /* Saves 10 KB */
+#undef CONFIG_SYS_PROMPT
 #ifdef CONFIG_SYS_HUSH_PARSER
 #define        CONFIG_SYS_PROMPT               "$ "
 #else
@@ -127,16 +144,20 @@
  */
 #ifdef CONFIG_CMD_FLASH
 #define        PHYS_FLASH_1                    0x00000000      /* Flash Bank #1 */
+#define        PHYS_FLASH_SIZE                 0x02000000      /* 32 MB */
 #define        CONFIG_SYS_FLASH_BASE           PHYS_FLASH_1
 
 #define        CONFIG_SYS_FLASH_CFI
 #define        CONFIG_FLASH_CFI_DRIVER         1
+#define        CONFIG_SYS_FLASH_CFI_WIDTH      FLASH_CFI_32BIT
 
 #define        CONFIG_SYS_MAX_FLASH_SECT       (4 + 255)
 #define        CONFIG_SYS_MAX_FLASH_BANKS      1
 
 #define        CONFIG_SYS_FLASH_ERASE_TOUT     (25 * CONFIG_SYS_HZ)
 #define        CONFIG_SYS_FLASH_WRITE_TOUT     (25 * CONFIG_SYS_HZ)
+#define        CONFIG_SYS_FLASH_LOCK_TOUT      (25 * CONFIG_SYS_HZ)
+#define        CONFIG_SYS_FLASH_UNLOCK_TOUT    (25 * CONFIG_SYS_HZ)
 
 #define        CONFIG_SYS_FLASH_USE_BUFFER_WRITE       1
 #define        CONFIG_SYS_FLASH_PROTECTION             1