diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-16 01:09:51 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-16 01:09:51 +0100 |
| commit | ce81a5820f712888529f7814ae11cce4ce3f6bd9 (patch) | |
| tree | c6aa834d51accf4f4182bc0c7bfd93247c12607f /packages/u-boot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch | |
| parent | 61d929464d8d345d5e0a4d6b1a9955c77f708e3c (diff) | |
| parent | e13eb6ed3ee15de931a517361ad80f9248798873 (diff) | |
Merge branch 'holger/openmoko-merges' into org.openembedded.dev
Conflicts:
packages/tasks/task-openmoko-feed.bb
Diffstat (limited to 'packages/u-boot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch')
| -rw-r--r-- | packages/u-boot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch index f85fdea836..676cddbc1e 100644 --- a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch @@ -90,7 +90,7 @@ Index: u-boot/board/hxd8/hxd8.c +++ u-boot/board/hxd8/hxd8.c @@ -0,0 +1,189 @@ +/* -+ * (C) Copyright 2007 by OpenMoko, Inc. ++ * (C) Copyright 2007 by Openmoko, Inc. + * Author: Harald Welte <laforge@openmoko.org> + * + * (C) Copyright 2002 @@ -290,7 +290,7 @@ Index: u-boot/board/hxd8/lowlevel_init.S + * Jan-Derk Bakker (J.D.Bakker@its.tudelft.nl) + * + * Modified for the FIC HXD8 by Harald Welte <laforge@openmoko.org> -+ * (C) Copyright 2007 by OpenMoko, Inc. ++ * (C) Copyright 2007 by Openmoko, Inc. + * + * See file CREDITS for list of people who contributed to this + * project. @@ -460,7 +460,7 @@ Index: u-boot/include/configs/hxd8.h +++ u-boot/include/configs/hxd8.h @@ -0,0 +1,277 @@ +/* -+ * (C) Copyright 2007 OpenMoko, Inc. ++ * (C) Copyright 2007 Openmoko, Inc. + * Author: Harald Welte <laforge@openmoko.org> + * + * Configuation settings for the FIC HXD8 @@ -634,7 +634,7 @@ Index: u-boot/include/configs/hxd8.h +#define CONFIG_USBD_VENDORID 0x1457 /* Linux/NetChip */ +#define CONFIG_USBD_PRODUCTID_GSERIAL 0x5120 /* gserial */ +#define CONFIG_USBD_PRODUCTID_CDCACM 0x511a /* CDC ACM */ -+#define CONFIG_USBD_MANUFACTURER "OpenMoko, Inc" ++#define CONFIG_USBD_MANUFACTURER "Openmoko, Inc" +#define CONFIG_USBD_PRODUCT_NAME "HXD8 Bootloader " U_BOOT_VERSION +#define CONFIG_USBD_DFU 1 +#define CONFIG_USBD_DFU_XFER_SIZE 4096 /* 0x4000 */ |