* Patch by Dave Ellis, 22 May 2003:

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

diff --git a/include/configs/PM826.h b/include/configs/PM826.h
index b56da695e82496940a2b8a573122e2715cddb5be..018865e88e69d2af5f8c8d0af4fbc9774ec7b08d 100644 (file)
--- a/include/configs/PM826.h
+++ b/include/configs/PM826.h
@@ -155,12 +155,22 @@
 
 #define CONFIG_BOOTP_MASK      (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE)
 
+#ifdef CONFIG_PCI
 #define CONFIG_COMMANDS                (CONFIG_CMD_DFL | \
                                 CFG_CMD_BEDBUG | \
                                 CFG_CMD_DATE   | \
+                                CFG_CMD_DOC    | \
                                 CFG_CMD_EEPROM | \
                                 CFG_CMD_I2C    | \
-                                CFG_CMD_DOC)
+                                CFG_CMD_PCI)
+#else  /* ! PCI */
+#define CONFIG_COMMANDS                (CONFIG_CMD_DFL | \
+                                CFG_CMD_BEDBUG | \
+                                CFG_CMD_DATE   | \
+                                CFG_CMD_DOC    | \
+                                CFG_CMD_EEPROM | \
+                                CFG_CMD_I2C    )
+#endif /* CONFIG_PCI */
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>
@@ -198,7 +208,7 @@
 
 #define CFG_BAUDRATE_TABLE     { 9600, 19200, 38400, 57600, 115200 }
 
-#define        CFG_RESET_ADDRESS 0xFFFFFFFC    /* "bad" address                */
+#define        CFG_RESET_ADDRESS 0xFDFFFFFC    /* "bad" address                */
 
 /*
  * For booting Linux, the board info and command line data
@@ -211,11 +221,11 @@
  * Flash and Boot ROM mapping
  */
 
-#define        CFG_BOOTROM_BASE        0x60000000
+#define        CFG_BOOTROM_BASE        0xFF800000
 #define        CFG_BOOTROM_SIZE        0x00080000
-#define        CFG_FLASH0_BASE         0x40000000
+#define        CFG_FLASH0_BASE         0xFF000000
 #define        CFG_FLASH0_SIZE         0x02000000
-#define CFG_DOC_BASE           0x60000000
+#define CFG_DOC_BASE           0xFF800000
 #define CFG_DOC_SIZE           0x00100000
 
 
@@ -245,8 +255,8 @@
 #define CFG_I2C_EEPROM_ADDR_LEN        1
 #define CFG_EEPROM_PAGE_WRITE_BITS     4
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10      /* and takes up to 10 msec */
-#define CFG_ENV_OFFSET         0
-#define CFG_ENV_SIZE           2048
+#define CFG_ENV_OFFSET         512
+#define CFG_ENV_SIZE           (2048 - 512)
 #endif
 
 /*-----------------------------------------------------------------------
@@ -303,6 +313,11 @@
 # define CFG_RAMBOOT
 #endif
 
+#ifdef CONFIG_PCI
+#define CONFIG_PCI_PNP
+#define CONFIG_EEPRO100
+#endif
+
 /*
  * Internal Definitions
  *