From: wdenk <wdenk>
Date: Sun, 19 Oct 2003 22:30:08 +0000 (+0000)
Subject: * Fix PCI problems on PPChameleonEVB
X-Git-Tag: LABEL_2006_03_12_0025~719
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d7281f41094bee59eca958de3c04995a2f79034a;p=u-boot

* Fix PCI problems on PPChameleonEVB

* TRAB auto-update: image type patch by Martin Krause, 17 Oct 2003
---

diff --git a/CHANGELOG b/CHANGELOG
index de790beca6..5790b679e3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,8 +4,11 @@ Changes for U-Boot 1.0.0:
 
 * Add CompactFlash support for NSCU
 
+* Fix PCI problems on PPChameleonEVB
+
 * TRAB auto-update: Base decision if we have to strip the image
   header on image type as encoded in the header
+  (include image type patch by Martin Krause, 17 Oct 2003)
 
 * Patches by Xianghua Xiao, 15 Oct 2003:
 
diff --git a/board/trab/auto_update.c b/board/trab/auto_update.c
index dd62d09483..33dece26e8 100644
--- a/board/trab/auto_update.c
+++ b/board/trab/auto_update.c
@@ -260,7 +260,8 @@ au_check_valid(int idx, long nbytes)
 		printf ("Image %s wrong type\n", aufile[idx]);
 		return -1;
 	}
-	if ((idx == IDX_APP) && (hdr->ih_type != IH_TYPE_RAMDISK)) {
+	if ((idx == IDX_APP) && (hdr->ih_type != IH_TYPE_RAMDISK) 
+            && (hdr->ih_type != IH_TYPE_FILESYSTEM)) {
 		printf ("Image %s wrong type\n", aufile[idx]);
 		return -1;
 	}
diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h
index ca045ad270..52c65e920c 100644
--- a/include/configs/PPChameleonEVB.h
+++ b/include/configs/PPChameleonEVB.h
@@ -282,7 +282,7 @@
 #define PCI_HOST_AUTO   2               /* detected via arbiter enable  */
 
 #define CONFIG_PCI			/* include pci support	        */
-#define CONFIG_PCI_HOST	PCI_HOST_HOST   /* select pci host function     */
+#define CONFIG_PCI_HOST	PCI_HOST_AUTO   /* select pci host function     */
 #undef  CONFIG_PCI_PNP			/* do pci plug-and-play         */
 					/* resource configuration       */