Changeset 2040

Timestamp:

05/19/07 07:55:47 (6 years ago)

Author:

laforge

Message:

get_board_rev() is not universally present, this patch fixes the dfu dependency on it

File:

• trunk/src/target/u-boot/patches/uboot-dfu.patch (modified) (2 diffs)

trunk/src/target/u-boot/patches/uboot-dfu.patch

@@ -100 +100 @@
 --- /dev/null
 +++ u-boot/drivers/usbdfu.c
-@@ -0,0 +1,1066 @@
+@@ -0,0 +1,1069 @@
 +/*
 + * (C) 2007 by OpenMoko, Inc.
@@ -197 +197 @@
 +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;
-+
-+       return 0;
++       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 1;
 +}
 +