NAND finally working. Two bugs fixed:

[oweals/u-boot.git] / include / configs / CPCI750.h

diff --git a/include/configs/CPCI750.h b/include/configs/CPCI750.h
index 45fcee00f55b339be9539a3daa4d6844af63df70..1632f374c3c76a3fb86ba24b5ffa1e40a97639df 100644 (file)
--- a/include/configs/CPCI750.h
+++ b/include/configs/CPCI750.h
@@ -38,8 +38,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/processor.h>
-
 /* This define must be before the core.h include */
 #define CONFIG_CPCI750         1       /* this is an CPCI750 board     */
 
@@ -72,10 +70,12 @@
 #define CONFIG_IDENT_STRING    "Marvell 64360 + IBM750FX"
 
 /*#define CFG_HUSH_PARSER*/
-#undef CFG_HUSH_PARSER
+#define CFG_HUSH_PARSER
 
 #define CFG_PROMPT_HUSH_PS2    "> "
 
+#define CFG_AUTO_COMPLETE 1
+
 /* Define which ETH port will be used for connecting the network */
 #define CFG_ETH_PORT           ETH_0
 
@@ -145,11 +145,11 @@
                         | CFG_CMD_PCI     \
                         | CFG_CMD_ELF     \
                         | CFG_CMD_DATE    \
-                         | CFG_CMD_NET     \
-                         | CFG_CMD_PING    \
-                         | CFG_CMD_IDE     \
-                         | CFG_CMD_FAT     \
-                         | CFG_CMD_EXT2    \
+                        | CFG_CMD_NET     \
+                        | CFG_CMD_PING    \
+                        | CFG_CMD_IDE     \
+                        | CFG_CMD_FAT     \
+                        | CFG_CMD_EXT2    \
                                        )
 
 #define CONFIG_DOS_PARTITION
@@ -157,6 +157,18 @@
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>
 
+#define CONFIG_USE_CPCIDVI
+
+#ifdef  CONFIG_USE_CPCIDVI
+#define CONFIG_VIDEO
+#define CONFIG_VIDEO_CT69000
+#define CONFIG_CFB_CONSOLE
+#define CONFIG_VIDEO_SW_CURSOR
+#define CONFIG_VIDEO_LOGO
+#define CONFIG_I8042_KBD
+#define CFG_ISA_IO 0
+#endif
+
 /*
  * Miscellaneous configurable options
  */
@@ -273,13 +285,19 @@
  * FLASH related
  *----------------------------------------------------------------------*/
 
+#define CFG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI          1          /* Flash is CFI conformant           */
-#define CFG_MAX_FLASH_SECT     128        /* max number of sectors on one chip */
-#define CFG_MAX_FLASH_BANKS    4          /* max number of memory banks        */
-#define CFG_FLASH_INCREMENT    0x01000000 /* there is only one bank            */
 #define CFG_FLASH_PROTECTION   1          /* use hardware protection           */
 #define CFG_FLASH_USE_BUFFER_WRITE 1      /* use buffered writes (20x faster)  */
 #define CFG_FLASH_BASE         0xfc000000 /* start of flash banks              */
+#define CFG_MAX_FLASH_BANKS    4          /* max number of memory banks        */
+#define CFG_FLASH_INCREMENT     0x01000000 /* size of  flash bank               */
+#define CFG_MAX_FLASH_SECT     128        /* max number of sectors on one chip */
+#define CFG_FLASH_BANKS_LIST  { CFG_FLASH_BASE,                            \
+                                CFG_FLASH_BASE + 1*CFG_FLASH_INCREMENT,    \
+                                CFG_FLASH_BASE + 2*CFG_FLASH_INCREMENT,    \
+                                CFG_FLASH_BASE + 3*CFG_FLASH_INCREMENT }
+#define CFG_FLASH_EMPTY_INFO    1          /* show if bank is empty             */
 
 /* areas to map different things with the GT in physical space */
 #define CFG_DRAM_BANKS         4
@@ -331,11 +349,11 @@
 #define CFG_DEV3_PAR           0x8FCFFFFF                              /* nvram/can    */
 #define CFG_BOOT_PAR           0x8FDFFFFF                              /* 16 bit flash */
 
-        /*   c    4    a      8     2     4    1      c                */
-        /* 33 22|2222|22 22|111 1|11 11|1 1  |    |            */
-        /* 10 98|7654|32 10|987 6|54 32|1 098|7 654|3 210      */
-        /* 11|00|0100|10 10|100|0 00|10 0|100 0|001 1|100      */
-        /*  3| 0|.... ..| 2| 4 |  0 |  4 |  8  |  3  | 4       */
+       /*   c    4    a      8     2     4    1      c         */
+       /* 33 22|2222|22 22|111 1|11 11|1 1  |    |             */
+       /* 10 98|7654|32 10|987 6|54 32|1 098|7 654|3 210       */
+       /* 11|00|0100|10 10|100|0 00|10 0|100 0|001 1|100       */
+       /*  3| 0|.... ..| 2| 4 |  0 |  4 |  8  |  3  | 4        */
 
 
 /* MPP Control MV64360 Appendix P P. 632*/
@@ -392,8 +410,6 @@
 #define CFG_PCI0_0_MEM_SPACE   (CFG_PCI0_MEM_BASE)
 #define CFG_PCI1_0_MEM_SPACE   (CFG_PCI1_MEM_BASE)
 
-
-
 /* PCI I/O MAP section */
 #define CFG_PCI0_IO_BASE       0xfa000000
 #define CFG_PCI0_IO_SIZE       _16M
@@ -405,6 +421,8 @@
 #define CFG_PCI1_IO_SPACE      (CFG_PCI1_IO_BASE)
 #define CFG_PCI1_IO_SPACE_PCI  0x00000000
 
+#define CFG_ISA_IO_BASE_ADDRESS (CFG_PCI0_IO_BASE)
+
 #if defined (CONFIG_750CX)
 #define CFG_PCI_IDSEL 0x0
 #else