* Update CPC45 board configuration.LABEL_2005_01_31_2245

* Add USB and PCI support for INKA4x0 board

5 files changed, 60 insertions, 3 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 825a1cd3082..5c261e5488b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,10 @@
 Changes for U-Boot 1.1.3:
 ======================================================================
 
+* Update CPC45 board configuration.
+
+* Add USB and PCI support for INKA4x0 board
+
 * Fix IDE stability problems on CPC45 board (needs 2 x EIEIO).
 
 * Code cleanup
diff --git a/board/inka4x0/inka4x0.c b/board/inka4x0/inka4x0.c
index 72293ecf7eb..a33251021f5 100644
--- a/board/inka4x0/inka4x0.c
+++ b/board/inka4x0/inka4x0.c
@@ -176,3 +176,16 @@ void flash_preinit(void)
 	 */
 	*(vu_long *)MPC5XXX_BOOTCS_CFG &= ~0x1; /* clear RO */
 }
+
+#ifdef  CONFIG_PCI
+static struct pci_controller hose;
+
+extern void pci_mpc5xxx_init(struct pci_controller *);
+
+void pci_init_board(void)
+{
+        pci_mpc5xxx_init(&hose);
+}
+#endif
+
+
diff --git a/drivers/i82365.c b/drivers/i82365.c
index c37383d481d..e20fd33e897 100644
--- a/drivers/i82365.c
+++ b/drivers/i82365.c
@@ -479,7 +479,6 @@ static int cb_set_power (socket_info_t * s, socket_state_t * state)
 			puts (" 12V card found: ");
 		} else if (state->Vpp == state->Vcc) {
 			reg |= I365_VPP1_5V;
-			puts (" 5V card found: ");
 		} else {
 			puts (" power not found: ");
 			return -1;
@@ -870,6 +869,10 @@ int i82365_init (void)
 		printf ("i82365: Controller not found.\n");
 		return 1;
 	}
+	if((val & SS_DETECT) != SS_DETECT){
+		puts ("No card\n");
+		return 1;
+	}
 #else	/* !CONFIG_CPC45 */
 	if (val & SS_DETECT) {
 		if (val & SS_3VCARD) {
diff --git a/include/configs/CPC45.h b/include/configs/CPC45.h
index 8de981981dc..6fb8003cd4e 100644
--- a/include/configs/CPC45.h
+++ b/include/configs/CPC45.h
@@ -61,11 +61,14 @@
 				CFG_CMD_DATE	| \
 				CFG_CMD_DHCP	| \
 				CFG_CMD_EEPROM	| \
+				CFG_CMD_EXT2	| \
 				CFG_CMD_FAT	| \
 				CFG_CMD_FLASH	| \
 				CFG_CMD_I2C	| \
 				CFG_CMD_IDE	| \
+				CFG_CMD_NFS	| \
 				CFG_CMD_PCI	| \
+				CFG_CMD_PING	| \
 				CFG_CMD_SDRAM	)
 
 /* This must be included AFTER the definition of CONFIG_COMMANDS (if any)
diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index c824b2dee30..eb1256a5d87 100644
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -51,9 +51,35 @@
 #define CFG_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
+ * PCI Mapping:
+ * 0x40000000 - 0x4fffffff - PCI Memory
+ * 0x50000000 - 0x50ffffff - PCI IO Space
+ */
+#define CONFIG_PCI		1
+#define CONFIG_PCI_PNP		1
+#define CONFIG_PCI_SCAN_SHOW	1
+
+#define CONFIG_PCI_MEM_BUS	0x40000000
+#define CONFIG_PCI_MEM_PHYS	CONFIG_PCI_MEM_BUS
+#define CONFIG_PCI_MEM_SIZE	0x10000000
+
+#define CONFIG_PCI_IO_BUS	0x50000000
+#define CONFIG_PCI_IO_PHYS	CONFIG_PCI_IO_BUS
+#define CONFIG_PCI_IO_SIZE	0x01000000
+
+#define CFG_XLB_PIPELINING	1
+
+/* Partitions */
+#define CONFIG_MAC_PARTITION
+#define CONFIG_DOS_PARTITION
+#define CONFIG_ISO_PARTITION
+
+/*
  * Supported commands
  */
-#define CONFIG_COMMANDS	       (CONFIG_CMD_DFL | CFG_CMD_DHCP)
+#define CONFIG_COMMANDS	       (CONFIG_CMD_DFL	| \
+				CFG_CMD_PCI	| \
+				CFG_CMD_USB	)
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>
@@ -176,7 +202,7 @@
 #if defined (CONFIG_MINIFAP)
 #define CFG_GPS_PORT_CONFIG	0x93000004
 #else
-#define CFG_GPS_PORT_CONFIG	0x83000004
+#define CFG_GPS_PORT_CONFIG	0x81001004
 #endif
 
 /*
@@ -234,4 +260,12 @@
 #define CFG_CS_BURST		0x00000000
 #define CFG_CS_DEADCYCLE	0x33333333
 
+/*-----------------------------------------------------------------------
+ * USB stuff
+ *-----------------------------------------------------------------------
+ */
+#define CONFIG_USB_OHCI
+#define CONFIG_USB_CLOCK        0x00015555
+#define CONFIG_USB_CONFIG       0x00001000
+
 #endif /* __CONFIG_H */