r2040 - trunk/src/target/u-boot/patches

[laforge at sita.openmoko.org]

Author: laforge
Date: 2007-05-19 07:55:47 +0200 (Sat, 19 May 2007)
New Revision: 2040

Modified:
   trunk/src/target/u-boot/patches/uboot-dfu.patch
Log:
get_board_rev() is not universally present, this patch fixes the dfu dependency on it


Modified: trunk/src/target/u-boot/patches/uboot-dfu.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-dfu.patch	2007-05-19 05:32:29 UTC (rev 2039)
+++ trunk/src/target/u-boot/patches/uboot-dfu.patch	2007-05-19 05:55:47 UTC (rev 2040)
@@ -99,7 +99,7 @@
 ===================================================================
 --- /dev/null
 +++ u-boot/drivers/usbdfu.c
-@@ -0,0 +1,1066 @@
+@@ -0,0 +1,1069 @@
 +/*
 + * (C) 2007 by OpenMoko, Inc.
 + * Author: Harald Welte <laforge at openmoko.org>
@@ -196,15 +196,18 @@
 +
 +static int dfu_trailer_matching(const struct uboot_dfu_trailer *trailer)
 +{
-+	if (trailer->magic == UBOOT_DFU_TRAILER_MAGIC &&
-+	    trailer->version == UBOOT_DFU_TRAILER_V1 &&
-+	    trailer->vendor == CONFIG_USBD_VENDORID &&
-+	    (trailer->product == CONFIG_USBD_PRODUCTID_CDCACM ||
-+	     trailer->product == CONFIG_USBD_PRODUCTID_GSERIAL) &&
-+	    trailer->revision == get_board_rev())
-+		return 1;
++	if (trailer->magic != UBOOT_DFU_TRAILER_MAGIC ||
++	    trailer->version != UBOOT_DFU_TRAILER_V1 ||
++	    trailer->vendor != CONFIG_USBD_VENDORID ||
++	    (trailer->product != CONFIG_USBD_PRODUCTID_CDCACM &&
++	     trailer->product != CONFIG_USBD_PRODUCTID_GSERIAL))
++		return 0;
++#ifdef CONFIG_REVISION_TAG
++	if (trailer->revision != get_board_rev())
++		return 0;
++#endif
 +
-+	return 0;
++	return 1;
 +}
 +
 +static struct part_info *get_partition_nand(int idx)