* Fix PCI problems on PPChameleonEVB

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

diff --git a/CHANGELOG b/CHANGELOG
index de790beca6639852ac3b125a9432acb0656d40ed..5790b679e37929912941907474a260e876e6e259 100644 (file)
--- 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 dd62d0948372d36983bfbbc35d9239727dd963af..33dece26e809ca0639fe82c2450fca049107564c 100644 (file)
--- 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 ca045ad27022bee9b8044994b6fd5a8b284ccc93..52c65e920cb448688bbbb30f693ff8842bb571cd 100644 (file)
--- 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       */