Merge branch 'master' of /home/wd/git/u-boot/custodians

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

diff --git a/include/configs/eNET.h b/include/configs/eNET.h
index 84e1aefe1f873f53b8a5fda54e9ff403601f80d2..243a55417859da26d07bd785ac533c41239a751f 100644 (file)
--- a/include/configs/eNET.h
+++ b/include/configs/eNET.h
@@ -70,16 +70,15 @@
  */
 #include <config_cmd_default.h>
 
-#define CONFIG_CMD_AUTOSCRIPT  /* Autoscript Support           */
 #define CONFIG_CMD_BDI         /* bdinfo                       */
 #define CONFIG_CMD_BOOTD       /* bootd                        */
 #define CONFIG_CMD_CONSOLE     /* coninfo                      */
 #define CONFIG_CMD_ECHO                /* echo arguments               */
-#define CONFIG_CMD_SAVEENV     /* saveenv                      */
 #define CONFIG_CMD_FLASH       /* flinfo, erase, protect       */
 #define CONFIG_CMD_FPGA                /* FPGA configuration Support   */
 #define CONFIG_CMD_IMI         /* iminfo                       */
 #define CONFIG_CMD_IMLS                /* List all found images        */
+#define CONFIG_CMD_IRQ         /* IRQ Information              */
 #define CONFIG_CMD_ITEST       /* Integer (and string) test    */
 #define CONFIG_CMD_LOADB       /* loadb                        */
 #define CONFIG_CMD_LOADS       /* loads                        */
@@ -87,10 +86,12 @@
 #define CONFIG_CMD_MISC                /* Misc functions like sleep etc*/
 #undef CONFIG_CMD_NET          /* bootp, tftpboot, rarpboot    */
 #undef CONFIG_CMD_NFS          /* NFS support                  */
+#define CONFIG_CMD_PCI         /* PCI support                  */
 #define CONFIG_CMD_RUN         /* run command in env variable  */
+#define CONFIG_CMD_SAVEENV     /* saveenv                      */
 #define CONFIG_CMD_SETGETDCR   /* DCR support on 4xx           */
+#define CONFIG_CMD_SOURCE      /* "source" command Support     */
 #define CONFIG_CMD_XIMG                /* Load part of Multi Image     */
-#define CONFIG_CMD_IRQ         /* IRQ Information              */
 
 #define CONFIG_BOOTDELAY               15
 #define CONFIG_BOOTARGS                        "root=/dev/mtdblock0 console=ttyS0,9600"
@@ -116,8 +117,6 @@
 #define CONFIG_SYS_MEMTEST_START       0x00100000      /* memtest works on     */
 #define CONFIG_SYS_MEMTEST_END         0x01000000      /* 1 ... 16 MB in DRAM  */
 
-#undef  CONFIG_SYS_CLKS_IN_HZ          /* everything, incl board info, in Hz */
-
 #define        CONFIG_SYS_LOAD_ADDR            0x100000        /* default load address */
 
 #define        CONFIG_SYS_HZ                   1024            /* incrementer freq: 1kHz */
@@ -190,26 +189,24 @@
   * Environment configuration
   */
 #define CONFIG_ENV_IS_IN_FLASH         1
-#define CONFIG_ENV_OFFSET              0x20000 /*   Offset   of Environment Sector */
-#define CONFIG_ENV_SIZE                        0x08000 /* Total Size of Environment Sector */
 #define CONFIG_ENV_SECT_SIZE           0x20000 /* Total Size of Environment Sector */
-#define CONFIG_ENV_ADDR                        (CONFIG_SYS_FLASH_BASE_1 + \
-                                        CONFIG_ENV_OFFSET)
-#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + \
+#define CONFIG_ENV_SIZE                        CONFIG_ENV_SECT_SIZE
+#define CONFIG_ENV_ADDR                        CONFIG_SYS_FLASH_BASE_1
+/* Redundant Copy */
+#define CONFIG_ENV_ADDR_REDUND         (CONFIG_SYS_FLASH_BASE_1 + \
                                         CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND         (CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SECT_SIZE
 
 
  /*-----------------------------------------------------------------------
   * PCI configuration
   */
-#undef CONFIG_PCI                                /* include pci support */
-#undef CONFIG_PCI_PNP                            /* pci plug-and-play */
-#undef CONFIG_PCI_SCAN_SHOW
-#undef CONFIG_SYS_FIRST_PCI_IRQ
-#undef CONFIG_SYS_SECOND_PCI_IRQ
-#undef CONFIG_SYS_THIRD_PCI_IRQ
-#undef CONFIG_SYS_FORTH_PCI_IRQ
+#define CONFIG_PCI                                /* include pci support */
+#define CONFIG_PCI_PNP                            /* pci plug-and-play */
+#define CONFIG_SYS_FIRST_PCI_IRQ   10
+#define CONFIG_SYS_SECOND_PCI_IRQ  9
+#define CONFIG_SYS_THIRD_PCI_IRQ   11
+#define CONFIG_SYS_FORTH_PCI_IRQ   15
 
 /*-----------------------------------------------------------------------
  * Hardware watchdog configuration